tmp remove recreate all dummy data

Author: Remi-Gau

demos/MoAE/test_moae.m

@@ -27,6 +27,7 @@
   download_moae_ds(download_data, clean);
 end
 
+warning('off', 'SPM:noDisplay');
 if isOctave
   warning('off', 'setGraphicWindow:noGraphicWindow');
 end

demos/face_repetition/test_face_rep.m

@@ -21,6 +21,7 @@
   download_face_rep_ds(download_data);
 end
 
+warning('off', 'SPM:noDisplay');
 if isOctave
   warning('off', 'setGraphicWindow:noGraphicWindow');
 end

src/IO/unzipAndReturnsFullpathName.m

@@ -27,7 +27,7 @@
     errorHandling(mfilename(), 'emptyInput', msg, false, true);
   end
 
-  for iFile = 1:size(fullpathName)
+  for iFile = 1:size(fullpathName, 1)
 
     [directory, filename, ext] = spm_fileparts(fullpathName(iFile, :));
 

src/messages/createUnorderedList.m

@@ -21,18 +21,30 @@
   end
 
   if iscell(list)
+
+    for i = 1:numel(list)
+      if isnumeric(list{i})
+        list{i} = num2str(list{i});
+      end
+    end
+
     list = sprintf([prefix, strjoin(list, prefix), '\n']);
 
   elseif isstruct(list)
+
     output = [];
     fields = fieldnames(list);
+
     for i = 1:numel(fields)
       content = list.(fields{i});
       if ~iscell(content)
         content = {content};
       end
       output = [output prefix fields{i} ': {' strjoin(content, ', ') '}'];
     end
+
     list = sprintf(output);
+
   end
+
 end

src/subject_level/getConfoundsRegressorFilename.m

@@ -1,4 +1,4 @@
-function filename = getConfoundsRegressorFilename(BIDS, opt, subLabel, session, run)
+function filenames = getConfoundsRegressorFilename(BIDS, opt, subLabel, session, run)
   %
   % Gets the potential confounds files for a given subject, session, run
   %
@@ -33,19 +33,20 @@
   filter = fileFilterForBold(opt, subLabel, 'confounds');
   filter.ses = session;
   filter.run = run;
-  filename = bids.query(BIDS, 'data', filter);
+  filenames = bids.query(BIDS, 'data', filter);
 
-  if numel(filename) > 1
-    disp(filename);
-    errorHandling(mfilename(), 'tooManyFiles', 'This should only get one file.', false, true);
+  if numel(filenames) > 1
+    msg = ['Found several confounds files:' createUnorderedList(filenames)];
+    errorHandling(mfilename(), 'tooManyFiles', msg, true, true);
 
-  elseif isempty(filename)
+  elseif isempty(filenames)
     msg = sprintf('No TSV file found in:\n\t%s\nfor query:%s\n', ...
                   BIDS.pth, ...
                   createUnorderedList(opt.query));
     errorHandling(mfilename(), 'noFileFound', msg, true, true);
+
   end
 
-  filename = filename{1};
+  filenames = filenames{1};
 
 end

tests/Makefile

@@ -1,11 +1,13 @@
-clean:
+clean: clean_local
+	rm -rf bids-examples
+	mkdir bids-examples && touch bids-examples/.gitkeep
+
+clean_local:
 	rm -rf dummyData/derivatives/bidspm-preproc/sub-*
 	rm -rf dummyData/derivatives/bidspm-stats/sub-*
 	rm -rf dummyData/bidspm-raw/sub-*
 	rm -rf dummyData/derivatives/bidspm-stats/group
 	rm -rf dummyData/derivatives/bidspm-*/jobs
-	rm -rf bids-examples
-	mkdir bids-examples && touch bids-examples/.gitkeep
 
 data: clean
 	sh createDummyDataSet.sh

tests/tests_batches/preproc/test_setBatchSmoothConImages.m

@@ -10,7 +10,7 @@
 
 function test_setBatchSmoothConImages_basic()
 
-  createDummyData();
+  % createDummyData();
 
   opt = setOptions('vismotion', {'01', 'blind01'}, 'pipelineType', 'stats');
 

tests/tests_batches/stats/test_setBatchFactorialDesign.m

@@ -10,7 +10,7 @@
 
 function test_setBatchFactorialDesign_within_group()
 
-  createDummyData();
+  % createDummyData();
 
   opt = setOptions('vislocalizer', '', 'pipelineType', 'stats');
 
@@ -33,7 +33,7 @@ function test_setBatchFactorialDesign_within_group()
 
 function test_setBatchFactorialDesign_complex()
 
-  createDummyData();
+  % createDummyData();
 
   opt = setOptions('vismotion', {'01' 'ctrl01'}, 'pipelineType', 'stats');
 
@@ -79,7 +79,7 @@ function test_setBatchFactorialDesign_complex()
 
 function test_setBatchFactorialDesign_basic()
 
-  createDummyData();
+  % createDummyData();
 
   opt = setOptions('vismotion', {'01' 'ctrl01'}, 'pipelineType', 'stats');
 

tests/tests_batches/stats/test_setBatchSubjectLevelResults.m

@@ -10,7 +10,7 @@
 
 function test_setBatchSubjectLevelResults_basic()
 
-  createDummyData();
+  % createDummyData();
 
   % IF
   contrast_name = 'VisMot';
@@ -91,7 +91,7 @@ function test_setBatchSubjectLevelResults_error_no_matching_contrast()
 
 function [subLabel, opt, result] = setUp(task, contrastName)
 
-  createDummyData();
+  % createDummyData();
 
   iCon = 1;
 

tests/tests_batches/test_setBatchMeanAnatAndMask.m

@@ -10,7 +10,7 @@
 
 function test_setBatchMeanAnatAndMask_basic()
 
-  createDummyData();
+  % createDummyData();
 
   opt = setOptions('vismotion', {'01', 'ctrl01'}, 'pipelinetype', 'stats');