SVMCrossVal.git

@@ -14,7 +14,7 @@ sessionList     = inputStruct.sessionList;

 voxelList       = inputStruct.voxelList;

 % classList       = inputStruct.classList;

 % labelMap        = inputStruct.labelMap;

-% normalize       = inputStruct.normalize;

+smoothed       = inputStruct.smoothed;

 globalStart     = inputStruct.psthStart;

 globalEnd       = inputStruct.psthEnd;

 baselineStart   = inputStruct.baselineStart;

@@ -39,7 +39,7 @@ maxPerformance = -inf;

         for voxel = 1:size(voxelList,1)  % [[x;x],[y;y],[z;z]]

-                extr  = calculateImageData(voxelList(voxel,:),des);

+                extr  = calculateImageData(voxelList(voxel,:),des,smoothed);

                 rawdata=cell2mat({extr.mean}); % Raw Data

                 pst{voxel}  = calculatePST(des,globalStart,baselineStart,baselineEnd,globalEnd,eventList,rawdata,sessionList);

         end

@@ -83,7 +83,7 @@ maxPerformance = -inf;

 end

-function extr = calculateImageData(voxelList,des)

+function extr = calculateImageData(voxelList,des,smoothed)

 dtype='PSTH';

@@ -93,9 +93,15 @@ switch dtype

     case 'betas'

         V=des.Vbeta;

 end;

-%   for z=1:length(V) % Change Drive Letter!

-%       V(z).fname(1)='E';

-%   end;

+

+if (~smoothed)

+  for z=1:length(V) % Change Drive Letter!\

+      % D:....SUBJECTID\session\swfanders...

+      % D:....SUBJECTID\session\wfanders...

+      tmp = findstr(filesep,V(z).fname);

+      V(z).fname = strcat(V(z).fname(1:tmp(end)),V(z).fname(tmp(end)+2:end));

+  end;

+end

 % rad = 0; % one voxel

 % opt = 1; % xyz coordinates [mm]

@@ -31,13 +31,15 @@ end

         params = struct;

         params.nClasses = 2;

-        assignin('base','params',params);

+%         assignin('base','params',params);

         %% calculate

         display('calculating cross-validation performance time-shift');

         calculateParams  = struct;

         calculateParams.des             = spm.SPM;

+        calculateParams.smoothed        = getDouble(paramModel.txtSmoothed);

+        

         calculateParams.frameShiftStart = getDouble(paramModel.txtFrameShiftStart);  % -20;

         calculateParams.frameShiftEnd   = getDouble(paramModel.txtFrameShiftEnd); %15;

         calculateParams.decodeDuration  = getDouble(paramModel.txtFrameShiftDur);

@@ -52,7 +54,7 @@ end

         calculateParams.sessionList     = 1:3;

         classStruct = parseClassDef(paramModel);

-        assignin('base','classStruct',classStruct);

+%         assignin('base','classStruct',classStruct);

         calculateParams.classList       = classStruct.label; %{'<','>'};

         calculateParams.labelMap        = LabelMap(classStruct.label , classStruct.value); % LabelMap({'<','>','<+<','>+>','<+>','>+<'},{-2,-1,1,2,3,4});

@@ -79,6 +81,7 @@ end

         plotParams.decodePerformance = decode.decodePerformance;

         plotParams.rawTimeCourse     = decode.rawTimeCourse;

         plotParams.SubjectID         = SubjectID;

+        plotParams.smoothed          = calculateParams.smoothed;

         assignin('base','plotParams',plotParams);

 %         plotDecodePerformance(params.psthStart,params.psthEnd,params.nClasses,decode.decodeTable,params.frameShiftStart,params.frameShiftEnd,decode.rawTimeCourse);

@@ -12,6 +12,7 @@ if(nargin==1)

     frameEnd          = inputStruct.frameShiftEnd;

     psth              = inputStruct.rawTimeCourse;

     SubjectID         = inputStruct.SubjectID;

+    smoothed          = inputStruct.smoothed;

 elseif( nargin == 7)

@@ -25,6 +26,7 @@ elseif( nargin == 7)

     psth        = varargin(7);

     psth        = psth{1};

     SubjectID   = '';

+    smoothed    = '';

 end

     f = figure;

@@ -39,7 +41,7 @@ end

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

           end

       end

-%     axis([psthStart psthEnd 0 0])

+    axis([psthStart psthEnd -2 5])

     hold off

     subplot(2,1,2)    

@@ -55,7 +57,7 @@ end

     hold off;

-    title = sprintf('Subject %s, over %g voxel',SubjectID,size(psth,2));

+    title = sprintf('Subject %s, over %g voxel, smoothed %g',SubjectID,size(psth,2),smoothed);

     set(f,'Name',title);

     display(sprintf('%s',title));

@@ -87,7 +89,7 @@ switch(mod(n,4))

     case 2 

         style = ':';

     case 3

-        style = ':-';

+        style = '-.';

 end

 end

@@ -6,7 +6,7 @@ function voxelList = parseVoxelList(model)

         map = model.subjectMap;

         SubjectID = getSubjectIDString(model);

-        assignin('base','txt',txt);

+%         assignin('base','txt',txt);

         rows  = size(txt,1);

@@ -37,6 +37,8 @@ function spm_SVMCrossVal

                     'Position',[firstColumn firstRow 0.66*frameWidth controlElementHeight]);

     set(model.subjectSelector,'BackgroundColor','w');

+    model.txtSmoothed = createTextField(pSubject,[0.68*frameWidth firstRow  0.25*frameWidth controlElementHeight],'0');

+

     % PSTH

     firstColumn  = 5.00;

     secondColumn = 0.33*frameWidth;

@@ -100,7 +102,7 @@ function spm_SVMCrossVal

     firstRow     =  1.00 * controlElementHeight;

     model.txtSVMopts = createTextField(pSVM,[firstColumn firstRow  0.66*frameWidth controlElementHeight],'-t 0 -s 0 -v 6');

-    set(model.txtSVMopts,'Enable','inactive');

+    set(model.txtSVMopts,'Enable','on'); %inactive

     set(model.txtSVMopts,'HorizontalAlignment','left');

     set(btnRunButton,'Callback',{@cbRunSVM,model}); % set here, because of model.    

@@ -145,7 +147,7 @@ function cbRunSVM(src,evnt,model)

     if isSane(model)

         set(0,'userdata',model);

 %         set(src,'Enable','off');

-        assignin('base','guiParams',model);

+%         assignin('base','guiParams',model);

         classify(model)

 %         set(src,'Enable','on');

     else