SVMCrossVal.git

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

             x = roicenter(1,iVoxel)+x(sel(:));

             y = roicenter(2,iVoxel)+y(sel(:));

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

+            [x y z]

         end;

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

@@ -1,4 +1,9 @@

 function sphere = fbs_buildSphere(mapping,center,radius,vdim)

+if radius == 0

+    sphere = center;

+    return

+end

+

 iVoxel = 1;

 % returns the IDs within Sphere

 coord = mapping.indexToCoordMap.get(center);

@@ -60,7 +60,7 @@ for s = 1:nSubjects

     indexToCoordMap = java.util.HashMap;

     coordToIndexMap = java.util.HashMap;

     for iVoxel = 1:nVoxel

-        coord = [x(iVoxel) y(iVoxel) z(iVoxel)];

+        coord = [x(iVoxel) y(iVoxel) z(iVoxel)]

         a = java.util.Vector(3,0);

         a.add(0,coord(1));

         a.add(1,coord(2));

@@ -131,9 +131,10 @@ for s = 1:nSubjects

     nSamplePoints = ((timeLineEnd-timeLineStart)/res) +1;

 if isempty( fbsargs.timeline )

-	fbsTimeLine = 1:nSamplePoints

+	fbsTimeLine = 1:nSamplePoints;

+    fbsTimeLine = fbsTimeLine +globalStart;

 else 

-	fbsTimeLine = fbsargs.timeline

+	fbsTimeLine = fbsargs.timeline;

 end

@@ -152,6 +153,7 @@ end

             end

             % get surrounding coordinate-IDs within radius

             sphere = fbs_buildSphere(mapping,iVoxel,radius,vdim);

+%             pause

             %build svm inputmatrix

             svmdata = [];

@@ -169,6 +171,7 @@ end

             end

             if RANDOMIZE_DATAPOINTS

+%                 [svmlabel svmdata]

                 rndindex  = randperm(length(svmlabel));

                 svmdata   = svmdata(rndindex,:);

                 svmlabel  = svmlabel(rndindex);

@@ -177,7 +180,7 @@ end

             decode = svm_single_crossval(svmlabel,svmdata,svmopts);

             % save the decode value to the corresponding coordinate

-            coord= mapping.indexToCoordMap.get(iVoxel);

+            coord = mapping.indexToCoordMap.get(iVoxel)

             x = coord(1);

             y = coord(2);

             z = coord(3);

@@ -32,7 +32,7 @@ for s = 1:nSubjects

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

-    extr = calculateRoiImageData(subjectStruct{s}.volumes,subjectStruct{s}.roiFile);

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

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

@@ -41,6 +41,7 @@ for s = 1:nSubjects

     disp('computing psth');

     for iVoxel = 1:nVoxel

+        [ x(iVoxel) y(iVoxel) z(iVoxel)]

         rawdata = [];

         for iImage = 1:length(extr);

             tmp = extr(iImage);