SVMCrossVal.git

@@ -1,4 +1,5 @@

-function extr = calculateImageData(filenameList, voxelList, rad)

+function [extr voxelcount] = calculateImageData(filenameList, voxelList, rad)

+voxelcount = 0;

 V = filenameList;

@@ -18,6 +19,7 @@ for kImage=1:nImage

     vdim = tmp(7:9);

     vxrad = ceil((rad*ones(nVoxel,3))./(ones(nVoxel,1)*vdim))';

+    subvoxelcount = 0;

     for iVoxel = 1:nVoxel

         if rad==0

@@ -35,13 +37,16 @@ for kImage=1:nImage

             z = roicenter(3,iVoxel)+z(sel(:));

         end;

-

         dat = spm_sample_vol(V(kImage), x, y, z,0);

-        extr(kImage).dat(iVoxel,:)    = dat;

-        extr(kImage).mean(iVoxel)     = nanmean(dat);

-        extr(kImage).nvx(iVoxel)      = numel(dat);

-    end;

+        for iSubVoxel = 1:size(dat,1)

+            subvoxelcount = subvoxelcount +1;

+            extr(kImage).dat(subvoxelcount)    = dat(iSubVoxel);

+        end

+%         extr(kImage).mean(iVoxel)     = nanmean(dat);

+%         extr(kImage).nvx(iVoxel)      = numel(dat);

+    end

+    voxelcount = max(voxelcount,subvoxelcount);

+end   

-end;

 end

\ No newline at end of file

@@ -21,23 +21,23 @@ function subjectData = runCoordTable(args)

         map = load(fullfile(subjectStruct{s}.dir,'results','roi','coord_map.mat'));

         subjectStruct{s}.coords = getSubjectCoordinates(args.coords,map);

-        nVoxel = size(subjectStruct{s}.coords,1);

+%         nVoxel = size(subjectStruct{s}.coords,1);

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

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

-        extr = calculateImageData(subjectStruct{s}.volumes,subjectStruct{s}.coords,radius);

+        [extr nExtractedVoxel] = calculateImageData(subjectStruct{s}.volumes,subjectStruct{s}.coords,radius);

         pstopts.des = subjectStruct{s}.des;

         pstopts.eventList = args.eventList;

         pstopts.sessionList = sessionlist;

-        disp('computing psth');

-        for iVoxel = 1:nVoxel

+        disp(sprintf('computing psth for %g voxel',nExtractedVoxel));

+        for iVoxel = 1:nExtractedVoxel

             rawdata = [];

             for iImage = 1:length(extr);

                 tmp = extr(iImage);

-                rawdata = [rawdata tmp.dat(iVoxel,:)];

+                rawdata = [rawdata tmp.dat(iVoxel)];

             end

             subjectStruct{s}.rawData{iVoxel} = rawdata;

             subjectStruct{s}.pst{iVoxel} = calculatePST(args.timeline,pstopts,rawdata);