Skip to content

Commit 9793199

Browse files
committed
add comments
1 parent 91fae27 commit 9793199

File tree

3 files changed

+45
-25
lines changed

3 files changed

+45
-25
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
*.tsv
99
*.mat
1010

11+
check_my_code_report.txt

tests/test_createFilename.m

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
function test_createFilename()
2-
32
% test for filename creation and their directories
43

54
%% check directory and filename creation (PC)
65

6+
%%% set up part
7+
78
expParameters.subjectGrp = '';
89
expParameters.subjectNb = 1;
910
expParameters.sessionNb = 1;
@@ -14,32 +15,40 @@ function test_createFilename()
1415
cfg.eyeTracker = false;
1516
cfg.device = 'PC';
1617

18+
% set up the output directories
1719
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
20+
expParameters.outputDir = outputDir;
1821

1922
behDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'beh');
2023
eyetrackerDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'eyetracker');
2124

22-
expParameters.outputDir = outputDir;
2325
expParameters = checkCFG(cfg,expParameters);
24-
2526
expParameters = createFilename(cfg,expParameters);
2627

28+
%%% test part
29+
30+
% make sure the beh dir is created
2731
assert(exist(behDir, 'dir')==7)
2832

2933
% make sure the eyetracker dir is not created
30-
assert(exist(eyetrackerDir, 'dir')==0)
34+
assert(exist(eyetrackerDir, 'dir')==0)
3135

36+
% make sure the events filename is created
3237
assert(strcmp(...
33-
expParameters.fileName.events, ...
34-
['sub-001_ses-001_task-testtask_run-001_events_date-' expParameters.date '.tsv']));
38+
expParameters.fileName.events, ...
39+
['sub-001_ses-001_task-testtask_run-001_events_date-' expParameters.date '.tsv']));
40+
41+
% make sure the stim filename is created
3542
assert(strcmp(...
36-
expParameters.fileName.stim, ...
37-
['sub-001_ses-001_task-testtask_run-001_stim_date-' expParameters.date '.tsv']));
38-
43+
expParameters.fileName.stim, ...
44+
['sub-001_ses-001_task-testtask_run-001_stim_date-' expParameters.date '.tsv']));
45+
3946
%% check directory and filename creation (fMRI and eye tracker)
4047

4148
clear
4249

50+
%%% set up part
51+
4352
expParameters.subjectGrp = 'ctrl';
4453
expParameters.subjectNb = 2;
4554
expParameters.sessionNb = 2;
@@ -58,13 +67,21 @@ function test_createFilename()
5867
expParameters = checkCFG(cfg,expParameters);
5968
expParameters = createFilename(cfg,expParameters);
6069

70+
%%% test part
71+
72+
% make sure the func dir is created
6173
assert(exist(funcDir, 'dir')==7)
74+
75+
% make sure the eyetracker dir is created
6276
assert(exist(eyetrackerDir, 'dir')==7)
77+
78+
% make sure the events filename is created
6379
assert(strcmp(expParameters.fileName.base, 'sub-ctrl002_ses-002_task-testtask'))
6480
assert(strcmp(...
65-
expParameters.fileName.events, ...
66-
['sub-ctrl002_ses-002_task-testtask_run-002_events_date-' expParameters.date '.tsv']));
67-
81+
expParameters.fileName.events, ...
82+
['sub-ctrl002_ses-002_task-testtask_run-002_events_date-' expParameters.date '.tsv']));
83+
84+
% make sure the eyetracker filename is created
6885
assert(strcmp(...
69-
expParameters.fileName.eyetracker, ...
70-
['sub-ctrl002_ses-002_task-testtask_run-002_eyetrack_date-' expParameters.date '.edf']));
86+
expParameters.fileName.eyetracker, ...
87+
['sub-ctrl002_ses-002_task-testtask_run-002_eyetrack_date-' expParameters.date '.edf']));

tests/test_saveEventsFile.m

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ function test_saveEventsFile()
1919
expParameters = checkCFG(cfg,expParameters);
2020
expParameters = createFilename(cfg,expParameters);
2121

22-
23-
2422
%% create the events and stim files
2523

2624
logFile = saveEventsFile('open', expParameters, [], 'Speed', 'is_Fixation');
2725

2826
stimFile = saveEventsFile('open_stim', expParameters, []);
2927

30-
% ---- test section
28+
%%% test section
3129

3230
fileName = fullfile(expParameters.outputDir, expParameters.modality, expParameters.fileName.events);
3331
stimFileName = fullfile(expParameters.outputDir, expParameters.modality, expParameters.fileName.stim);
@@ -60,23 +58,27 @@ function test_saveEventsFile()
6058

6159
saveEventsFile('save', expParameters, logFile, 'speed', 'is_fixation');
6260

63-
6461
% close the file
6562
saveEventsFile('close', expParameters, logFile);
6663

67-
68-
% ---- test section
64+
%%% test section
6965

7066
% check the extra columns of the header and some of the content
7167

7268
FID = fopen(fileName, 'r');
7369
C = textscan(FID,'%s%s%s%s%s','Delimiter', '\t', 'EndOfLine', '\n');
7470

75-
assert(isequal(C{4}{1}, 'speed')); % check header
71+
% check header
72+
assert(isequal(C{4}{1}, 'speed'));
73+
74+
% check that empty values are entered as NaN
75+
assert(isequal(C{4}{2}, 'NaN'));
7676

77-
assert(isequal(C{4}{2}, 'NaN')); % check that empty values are entered as NaN
78-
assert(isequal(C{4}{4}, 'NaN')); % check that missing fields are entered as NaN
77+
% check that missing fields are entered as NaN
78+
assert(isequal(C{4}{4}, 'NaN'));
7979

80-
assert(isequal(str2double(C{4}{3}), 2)); % check values entered properly
80+
% check values entered properly
81+
assert(isequal(str2double(C{4}{3}), 2));
8182

82-
assert(isequal(str2double(C{5}{4}), 3)); % check values entered properly
83+
% check values entered properly
84+
assert(isequal(str2double(C{5}{4}), 3));

0 commit comments

Comments
 (0)