SVMCrossVal.git

@@ -69,6 +69,7 @@ maxPerformance = -inf;

             svmdata      = tmp(:,2:size(tmp,2));

             svmlabel     = tmp(:,1);

+%             RANDOMIZE INPUT

 %             rndindex  = randperm(length(svmlabel));

 %             svmdata   = svmdata(rndindex,:);

 %             svmlabel  = svmlabel(rndindex);

@@ -30,7 +30,7 @@ end

           for label = 1:size(psth{voxel},2)

               psthData = [];

               for timepoint = 1:size(psth{voxel}{label},2)

-                  psthData = nanmean(psth{voxel}{label}); % +voxel/100; % ???????????

+                  psthData = nanmean(psth{voxel}{label});

               end

               plot(psthStart:psthEnd,psthData,[colorChooser(voxel), lineStyleChooser(label)]);

           end

@@ -124,18 +124,31 @@ function pst = calculatePST(des,globalStart,baselineStart,baselineEnd,globalEnd,

     %%%%%%%%%%% new 090109 Axel: "Normalization" for SVM

-%     for zr=1:evntrow

-% %        tmp_max(zr)=max(nanmean(pst{zr}));

-%           tmp_max(zr)=max(max(pst{zr}));

-%           tmp_min(zr)=min(min(pst{zr}));

-%     end;

-% %    pstmax=max(tmp_max);

-% %    pstmin=min(tmp_min);

-%     pstmax=max(abs([tmp_max tmp_min]));

-%     for zr=1:evntrow

-%         pst{zr}=pst{zr}./pstmax-.5;

-% %        pst{zr}=(pst{zr}-pstmin)./(pstmax-pstmin);

-%     end;

+    norm4SVM='none'; %Normalization method for SVM

+    disp(['normalization: ' norm4SVM]);   

+    % none - no normalization

+    % mean - mean normalization (meanPSTH max at .5, baseline at -.5]

+    % minmax - all PSTHs between [0 1]

+    

+    for zr=1:evntrow

+          tmp_maxmean(zr)=max(nanmean(pst{zr}));

+          tmp_max(zr)=max(max(pst{zr}));

+          tmp_min(zr)=min(min(pst{zr}));

+    end;

+    

+    pstmaxmean=max(tmp_maxmean);

+    pstmax=max(tmp_max);

+    pstmin=min(tmp_min);

+    

+    for zr=1:evntrow

+        switch norm4SVM

+            case {'none'}

+            case {'mean'}

+                pst{zr}=pst{zr}./pstmaxmean-.5;

+            case {'minmax'}

+                pst{zr}=(pst{zr}-pstmin)./(pstmax-pstmin);

+        end;

+    end;