mh fix

Author: Remi-Gau

src/readAndFilterLogfile.m

@@ -1,3 +1,5 @@
+% (C) Copyright 2020 CPP_BIDS developers
+
 function outputFiltered = readAndFilterLogfile(columnName, filterBy, saveOutputTsv, varargin)
     % outputFiltered = readAndFilterLogfile(columnName, filterBy, saveOutputTsv, varargin)
     %
@@ -18,31 +20,31 @@
     %
     %  - outputFiltered: dataset with only the specified content, to see it in the command window
     %    use display(outputFiltered)
-    
+
     % Create tag to add to output file in case you want to save it
     outputFilterTag = ['_filteredBy-' columnName '_' filterBy '.tsv'];
-    
+
     % Checke if input is cfg or the file path and assign the output filename for later saving
     if ischar(varargin{1})
-        
+
         tsvFile = varargin{1};
-        
+
     elseif isstruct(varargin{1})
-        
+
         tsvFile = fullfile(varargin{1}.dir.outputSubject, ...
-            varargin{1}.fileName.modality, ...
-            varargin{1}.fileName.events);
-        
+                           varargin{1}.fileName.modality, ...
+                           varargin{1}.fileName.events);
+
     end
-    
+
     % Create output file name
     outputFileName = strrep(tsvFile, '.tsv', outputFilterTag);
-    
+
     % Check if the file exists
     if ~exist(tsvFile, 'file')
         error([newline 'Input file does not exist: %s'], tsvFile);
     end
-    
+
     try
         % Read the the tsv file and store each column in a field of `output` structure
         output = bids.util.tsvread(tsvFile);
@@ -52,25 +54,23 @@
         % Read the the tsv file and store each column in a field of `output` structure
         output = bids.util.tsvread(tsvFile);
     end
-    
+
     % Get the index of the target contentent to filter and display
     filterIdx = strncmp(output.(columnName), filterBy, length(filterBy));
-    
+
     % apply the filter
-    listFields = fieldnames(output);      
+    listFields = fieldnames(output);
     for iField = 1:numel(listFields)
         output.(listFields{iField})(~filterIdx) = [];
     end
-    
+
     % Convert the structure to dataset
     outputFiltered = struct2dataset(output);
-    
+
     if saveOutputTsv
 
         bids.util.tsvwrite(outputFileName, output);
-        
-    end
-    
-end
 
+    end
 
+end

tests/setUp.m

@@ -19,4 +19,4 @@
     logFile.extraColumns.LHL24.length = 12;
     logFile.extraColumns.is_Fixation.length = 1;
 
-end
+end

tests/test_readAndFilterLogfile.m

@@ -22,7 +22,7 @@ function test_readAndFilterLogfileBasic()
     logFile(end, 1).Speed = 2;
     logFile(end, 1).is_Fixation = true;
     logFile(end, 1).LHL24 = 1:12;
-    
+
     logFile(2, 1).onset = 2;
     logFile(end, 1).trial_type = 'motion_down';
     logFile(end, 1).duration = 3;
@@ -34,44 +34,43 @@ function test_readAndFilterLogfileBasic()
 
     % close the file
     saveEventsFile('close', cfg, logFile);
-    
+
     % filter file
     outputFiltered = readAndFilterLogfile('trial_type', 'motion_down', true, cfg);
 
     %% test
     expectedFilename = strrep(cfg.fileName.events, '.tsv', ...
-                           ['_filteredBy-' 'trial_type' '_' 'motion_down' '.tsv']);
+                              ['_filteredBy-' 'trial_type' '_' 'motion_down' '.tsv']);
     expectedFile = fullfile(cfg.dir.outputSubject, ...
-                           cfg.fileName.modality, ...
-                           expectedFilename);
+                            cfg.fileName.modality, ...
+                            expectedFilename);
+
+    assertEqual(exist(expectedFile, 'file'), 2);
 
-    assertEqual(exist(expectedFile, 'file'), 2)
-    
     content = bids.util.tsvread(expectedFile);
-    
-    assertEqual(content.trial_type{1}, 'motion_down')
-    
-end
 
+    assertEqual(content.trial_type{1}, 'motion_down');
+
+end
 
 function test_readAndFilterLogfileFromFile()
 
     %% set up
-    
+
     inputFile = fullfile(fileparts(mfilename('fullpath')), 'dummyData', ...
-        'sub-blind01_ses-01_task-vislocalizer_events.tsv');
-    
+                         'sub-blind01_ses-01_task-vislocalizer_events.tsv');
+
     % filter file
     outputFiltered = readAndFilterLogfile('trial_type', 'VisStat', true, inputFile);
 
     %% test
     expectedFile = strrep(inputFile, '.tsv', ...
-                           ['_filteredBy-' 'trial_type' '_' 'VisStat' '.tsv']);
+                          ['_filteredBy-' 'trial_type' '_' 'VisStat' '.tsv']);
+
+    assertEqual(exist(expectedFile, 'file'), 2);
 
-    assertEqual(exist(expectedFile, 'file'), 2)
-    
     content = bids.util.tsvread(expectedFile);
-    
-    assertEqual(content.trial_type{1}, 'VisStat')
-    
+
+    assertEqual(content.trial_type{1}, 'VisStat');
+
 end

tests/test_saveEventsFileSave.m

@@ -207,7 +207,6 @@ function test_saveEventsFileSaveErrors()
 
 end
 
-
 function content = getFileContent(cfg, logFile)
 
     % check the extra columns of the header and some of the content