MIGP v 0.1

meldata.cc

@@ -402,7 +402,7 @@ namespace Melodic{
 		opts.varnorm.set_T(false);
 	}
 		
-	for(int ctr = 1; ctr < numfiles; ctr++){
+	for(int ctr = 0; ctr < numfiles; ctr++){
 		tmpData = process_file(opts.inputfname.value().at(ctr), numfiles) / numfiles;
 		if(opts.debug.value())
 			save4D(tmpData,string("preproc_dat") + num2str(ctr+1));

melodic.h

@@ -17,17 +17,24 @@
 #ifdef __APPLE__
 #include <mach/mach.h>
 #define memmsg(msg) { \
+  MelodicOptions&opt = MelodicOptions::getInstance(); \
   struct task_basic_info t_info; \
   mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT; \
   if (KERN_SUCCESS == task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t) &t_info, &t_info_count)) \
 	{ \
-		cout << " MEM: " << msg << " res: " << t_info.resident_size/1000000 << " virt: " << t_info.virtual_size/1000000 << "\n"; \
-		cout.flush(); \
+		if(opt.debug.value()) {\
+		    cout << " MEM: " << msg << " res: " << t_info.resident_size/1000000 << " virt: " << t_info.virtual_size/1000000 << "\n"; \
+		    cout.flush(); \
+		 } \
 	} \
 }
 #else
 #define memmsg(msg) { \
-   cout << msg; \
+  MelodicOptions&opt = MelodicOptions::getInstance(); \
+  if(opt.debug.value()) {\
+		cout << msg; \
+		cout.flush(); \
+  } \
 }
 #endif
 

meloptions.h

@@ -54,7 +54,9 @@ class MelodicOptions {
   	Option<bool>   joined_whiten;
   	Option<bool>   joined_vn;
 	Option<bool>   dr_pca;
-	Option<float>	 vn_level;
+	Option<bool>   migp;
+	Option<int>    migpN;
+	Option<float>  vn_level;
   	Option<int>    numICs;
   	Option<string> approach;
   	Option<string> nonlinearity;
@@ -78,21 +80,21 @@ class MelodicOptions {
   	Option<string> filter; 
 
   	Option<bool>   genreport;
-		Option<string> guireport;
-		Option<string> bgimage;
+	Option<string> guireport;
+	Option<string> bgimage;
   	Option<float>  tr;
   	Option<bool>   logPower;
-		Option<bool>   addsigchng;
-		Option<bool>   allPPCA;
-		Option<bool>   varplots;
-		Option<bool>   varvals;
+	Option<bool>   addsigchng;
+	Option<bool>   allPPCA;
+	Option<bool>   varplots;
+	Option<bool>   varvals;
 
-		Option<string> fn_Tdesign;
-		Option<string> fn_Tcon;
-		Option<string> fn_TconF;
-		Option<string> fn_Sdesign;
-		Option<string> fn_Scon;	
-		Option<string> fn_SconF;	
+	Option<string> fn_Tdesign;
+	Option<string> fn_Tcon;
+	Option<string> fn_TconF;
+	Option<string> fn_Sdesign;
+	Option<string> fn_Scon;	
+	Option<string> fn_SconF;	
 	
   	Option<bool>   output_all;
   	Option<bool>   output_unmix;
@@ -188,12 +190,18 @@ class MelodicOptions {
    joined_whiten(string("--sep_whiten"), false,
 	   string("switch on separate whitening"), 
 	   false, no_argument, false),
-   joined_vn(string("--sep_vn"), true,
-   	   string("switch on separate variance nomalisation"), 
+   joined_vn(string("--group_vn"), false,
+   	   string("switch on group variance nomalisation (as opposed to separate VN)"), 
        false, no_argument, false),
    dr_pca(string("--mod_pca"), true,
 	   string("switch off modified PCA for concat ICA"),
 	   false, no_argument, false),
+   migp(string("--migp"), false,
+	   string("switch on MIGP data reduction"),
+	   false, no_argument, false),	
+   migpN(string("--migpN"), 1000,
+		string("Number of internal Eigenmaps"),
+		false, requires_argument, false),
    vn_level(string("--vn_level"), float(2.3),
 	   string("variance nomalisation threshold level (Z> value is ignored)"), 
 	   false, requires_argument, false),
@@ -201,7 +209,7 @@ class MelodicOptions {
 	   string("numer of IC's to extract (for deflation approach)"), 
 	   false, requires_argument),
    approach(string("-a,--approach"),  string("symm"),
-	   string("approach for decomposition, 2D: defl, symm (default), 3D: tica (default), concat"),
+	   string("approach for decomposition, 2D: defl, symm (default), 3D: tica, concat (default)"),
 	   false, requires_argument),
    nonlinearity(string("--nl"), string("tanh"),
 	   string("\tnonlinearity: gauss, tanh, pow3, pow4"), 
@@ -398,6 +406,8 @@ class MelodicOptions {
 	    options.add(joined_whiten);
 	    options.add(joined_vn);
 		options.add(dr_pca);
+		options.add(migp);
+		options.add(migpN);
 	    options.add(vn_level);
 	    options.add(numICs);
 	    options.add(approach);