demo Brain Source Localization marche

CMakeLists.txt

@@ -135,10 +135,13 @@ set(FAUST_CMDLINE_TYPE_FORMAT_DIR ${FAUST_CMDLINE_SRC_DIR}/type_format CACHE INT
 set(FAUST_CMDLINE_TYPE_FORMAT_XML_SRC_DIR ${FAUST_CMDLINE_TYPE_FORMAT_DIR}/xml CACHE INTERNAL "")
 set(FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR ${FAUST_CMDLINE_TYPE_FORMAT_DIR}/mat CACHE INTERNAL "")
 
+
+
+
 ###### WRAPPER CMDLINE BUILD DIRECTORIES ######
-set(FAUST_DEMO_BIN_DIR ${PROJECT_BINARY_DIR}/demo)
-set(FAUST_CMDLINE_BIN_SRC_DIR ${FAUST_DEMO_BIN_DIR}/cmd_line/src CACHE INTERNAL "")
-set(FAUST_CMDLINE_BIN_DIR ${FAUST_DEMO_BIN_DIR}/cmd_line/bin CACHE INTERNAL "")
+set(FAUST_CMDLINE_BIN_DIR  ${FAUST_WRAPPER_BIN_DIR}/cmd_line CACHE INTERNAL "")
+set(FAUST_CMDLINE_BIN_SRC_DIR ${FAUST_WRAPPER_BIN_DIR}/cmd_line/src CACHE INTERNAL "")
+set(FAUST_CMDLINE_BIN_DIR ${FAUST_WRAPPER_BIN_DIR}/cmd_line/bin CACHE INTERNAL "")
 ##################################################################
 
 ## fichier d'entrée doivent être renseigné dans l'executable
@@ -160,7 +163,20 @@ set(FAUST_TEST_SRC_TOOL_DIR ${FAUST_TEST_SRC_DIR}/tools CACHE INTERNAL "")
 set(FAUST_TESTSRC_SRC_DIR ${FAUST_TEST_SRC_DIR}/src CACHE INTERNAL "")
 set(FAUST_TESTDATA_SRC_DIR ${FAUST_MISC_DIR}/data/mat CACHE INTERNAL "")
 
+
+
+###### DEMO DIRECTORIES ######
+set(FAUST_DEMO_BIN_DIR ${PROJECT_BINARY_DIR}/demo)
+set(FAUST_DEMO_SRC_DIR ${FAUST_MISC_DIR}/demo CACHE INTERNAL "")
+set(FAUST_DEMOTOOLS_SRC_DIR ${FAUST_DEMO_SRC_DIR}/tools CACHE INTERNAL "")
+#set(FAUST_DEMO_BIN_DIR ${FAUST_DEMO_SRC_DIR} CACHE INTERNAL "")
+
+set(FAUST_DEMOTOOLS_BIN_DIR ${PROJECT_BINARY_DIR}/tools CACHE INTERNAL "")
+#set(FAUST_DEMODATA_SRC_DIR ${FAUST_DEMO_SRC_DIR}/data CACHE INTERNAL "")
+set(FAUST_DEMODATA_SRC_DIR ${FAUST_MISC_DIR}/data/mat/demoLuc CACHE INTERNAL "")
+
 ## examples directories including some examples of the use of the library FAuST
+
 set(FAUST_TEST_DIR ${FAUST_DEMO_BIN_DIR}/run_test CACHE INTERNAL "")
 set(FAUST_TEST_BIN_DIR ${FAUST_TEST_DIR}/bin CACHE INTERNAL "")
 set(FAUST_TESTSRC_BIN_DIR ${FAUST_TEST_DIR}/src CACHE INTERNAL "")
@@ -170,13 +186,7 @@ set(FAUST_TESTFIG_BIN_DIR ${FAUST_TEST_DIR}/fig CACHE INTERNAL "")
 set(FAUST_TESTRUNCOMP_BIN_DIR ${FAUST_TEST_DIR}/runtime_comparison CACHE INTERNAL "")
 set(FAUST_TESTTOOLS_BIN_DIR ${FAUST_TEST_DIR}/tools CACHE INTERNAL "")
 
-###### DEMO DIRECTORIES ######
-set(FAUST_DEMO_SRC_DIR ${FAUST_MISC_DIR}/demo CACHE INTERNAL "")
-set(FAUST_DEMOTOOLS_SRC_DIR ${FAUST_DEMO_SRC_DIR}/tools CACHE INTERNAL "")
-set(FAUST_DEMO_BIN_DIR ${FAUST_DEMO_SRC_DIR} CACHE INTERNAL "")
-set(FAUST_DEMOTOOLS_BIN_DIR ${PROJECT_BINARY_DIR}/tools CACHE INTERNAL "")
-#set(FAUST_DEMODATA_SRC_DIR ${FAUST_DEMO_SRC_DIR}/data CACHE INTERNAL "")
-set(FAUST_DEMODATA_SRC_DIR ${FAUST_MISC_DIR}/data/mat/demoLuc CACHE INTERNAL "")
+
 ##################################################################
 
 
@@ -229,8 +239,9 @@ if (FAUST_GEN_DOC)
 endif()
 ##################################################################
 
-
+message(STATUS "FAUST_TESTOUTPUT_BIN_DIR : ${FAUST_TESTOUTPUT_BIN_DIR}")
 file(MAKE_DIRECTORY ${FAUST_TESTOUTPUT_BIN_DIR})
+
 file(MAKE_DIRECTORY ${FAUST_TESTFIG_BIN_DIR})
 file(MAKE_DIRECTORY ${FAUST_TESTTMP_BIN_DIR})
 

README.txt

 ##########################################################################
-####################		FAuST Toolbox			######################
+####################		FAuST Toolbox			##########
 ##########################################################################
 
 
 ##########################################################################
 General purpose:
 
-The FAuST toolbox contains code implementing a general framework designed 
-to factorize matrices of interest into multiple sparse factors. 
+The FAuST toolbox contains a C++ code implementing a general framework 
+designed to factorize matrices of interest into multiple sparse factors. 
+It contains a template CPU/GPU C++ code and a Matlab wrapper.
 The algorithms implemented here are described in details in [1]- Le Magoarou
 
+
+
 For more information on the FAuST Project, please visit the website of the 
 project: <http://faust.gforge.inria.fr>
 ##########################################################################
@@ -50,6 +53,10 @@ Install:
 
 
 ##########################################################################
+
+
+
+
 Main tools :
 
 The main functions offered by the FAuST toolbox are implemented in two files

misc/demo/CMakeLists.txt

@@ -8,7 +8,7 @@ file(GLOB MATLAB_SCRIPTS "*.m")
 
 
 if(FAUST_USE_MEX)
-	foreach(matlab_script localize_src.m figure_localize_src.m)
+	foreach(matlab_script Brain_source_localization.m figure_localize_src.m)
       configure_file(${FAUST_DEMO_SRC_DIR}/${matlab_script} ${FAUST_DEMO_BIN_DIR}/${matlab_script} COPYONLY)
    endforeach()
 	configure_file(${FAUST_DEMO_SRC_DIR}/set_path.m.in ${FAUST_DEMO_BIN_DIR}/set_path.m @ONLY)

misc/demo/set_path.m

-addpath('');%% access to the mexfunction
-addpath('/home/aleman/WORK/FAUST/faust/trunk/devcpp/misc/demo/tools');%% access to the tools.m function (sparsify toolbox, figure toolbox ...)
-addpath('/home/aleman/WORK/FAUST/faust/trunk/devcpp/misc/data/mat/demoLuc');%% access to the data
-addpath('');%% access to matlab_faust.m (interface betwwen faust_core C++ class and matlab class)

misc/demo/set_path.m.in

-addpath('@FAUST_MEXINTERFACE_BIN_DIR@');%% access to the mexfunction
+addpath('@FAUST_MATLABMEX_BIN_DIR@');%% access to the mexfunction
 addpath('@FAUST_DEMOTOOLS_SRC_DIR@');%% access to the tools.m function (sparsify toolbox, figure toolbox ...)
 addpath('@FAUST_DEMODATA_SRC_DIR@');%% access to the data
-addpath('@FAUST_MEXINTERFACETOOLS_BIN_DIR@');%% access to matlab_faust.m (interface betwwen faust_core C++ class and matlab class)
+addpath('@FAUST_MATLABTOOLS_BIN_DIR@');%% access to matlab_faust.m (interface betwwen faust_core C++ class and matlab class)