SVMCrossVal.git

@@ -31,24 +31,23 @@ svmopts = fbsargs.svmopts;

 disp(sprintf('batch processing  %g subjects.',nSubjects));

 for s = 1:nSubjects

+    elapsed{s} = struct; %measure the timing

-

-    

-    elapsed = struct; %measure the timing

     disp(sprintf('processing subject %s.',subjects{s}.name));

     % load image data

     disp('fetching volume definitions, please wait');

     tic;

     volumes = spm_vol(getImageFileList(subjects{s}.dir,sessionlist,args.mask));

-    elapsed.loadList = toc;

+    elapsed{s}.loadList = toc;

+    

     disp('computing volume values, please wait');

     tic 

     [extr x y z] = calculateRoiImageData(volumes,subjects{s}.roiFile);

-    elapsed.calcExtr = toc;

+    elapsed{s}.calcExtr = toc;

-% clear volumes; %save memory ??

-% disp('cleared volumes');

+    clear volumes; %save memory ??

+    disp('cleared volumes');

     tic

     nVoxel = size(extr(1).dat,1);

@@ -68,7 +67,7 @@ tic

     mapping.indexToCoordMap = indexToCoordMap;

     mapping.coordToIndexMap = coordToIndexMap;

-    elapsed.mapping = toc;

+    elapsed{s}.mapping = toc;

     % calculate psth

@@ -88,11 +87,11 @@ tic

         pst{iVoxel} = calculatePST(args.timeline,pstopts,rawdata); % do not store in subjectStruct, so we can clear it later.

          p = iVoxel/nVoxel*100;

-         if(mod(iVoxel,nVoxel/100)==0)

+         if(mod(iVoxel,floor(nVoxel/100))==0)

              sprintf(' %g%%\t complete',p);

          end

     end

-elapsed.psth = toc;

+    elapsed{s}.psth = toc;

     disp('psth done');

     warning(warn);

     clear extr;

@@ -158,13 +157,12 @@ tic

         end  %for each voxel

         nii = make_nii(img3D,vdim,mask_image.hdr.hist.originator(1:3),16,'decode performance'); %default origin

-        save_nii(nii,sprintf('TESTFILE%g',timeShift));

+        save_nii(nii,fullfile('output',sprintf('TESTFILE%g',timeShift)));

 %         save_nii(mask_image,sprintf('MTESTFILE%g',timeShift));

     end %for each timeslice

     display('rastering done');

-elapsed.decode = toc;

-

+    elapsed{s}.decode = toc;

     clear pst; %save memory!

     assignin('base','timing',elapsed);