SVMCrossVal.git

@@ -7,7 +7,11 @@ decode = struct;

 decode.decodePerformance = [];

 decode.rawTimeCourse     = [];

-for subjectDataID = 1:size(subjectdata)

+

+disp(sprintf('we have %g subjects. Press ANY-Key to continue.\n Use Retrun if your Keyboard lacks the ANY-Key.',numel(subjectdata)));

+pause

+

+for subjectDataID = 1:numel(subjectdata)

 %     SubjectID = cell2mat(subjectCell);

     currentSubject = subjectdata{subjectDataID};

@@ -49,6 +47,12 @@ switch task

     case 'ROI'

         disp('ROI');

+        out = struct;

+        out.header = struct;

+        out.header.type = 'ROI';

+        out.header.timeline = timeLine;

+        out.header.classDef = classDef;

+        

         roiargs = struct;

         roiargs.subjects        = subjects;

         roiargs.timeline        = timeLine;

@@ -58,7 +62,9 @@ switch task

         roiargs.sessionList     = 1:3;

         roiargs.eventList       = classDef.eventMatrix;

-        runROIImageMaskMode(roiargs);

+        out.subjectdata = runROIImageMaskMode(roiargs);

+        

+        assignin('base','preprocessedData',out);

     case 'FBS'

         disp('not implemented')

@@ -72,8 +78,7 @@ switch task

         svmopts    = getSvmArgs(model,1);

         preprocessedData = evalin('base','preprocessedData');

         decode = calculateMultiSubjectDecodePerformance(preprocessedData.header,preprocessedData.subjectdata,svmopts);

-        

-        

+        assignin('base','decode',decode);

     case 'X-SVM'

         disp('not implemented')

@@ -1,13 +1,16 @@

 function subjectData = runCoordTable(args)

-global SVMCROSSVAL_SUBJECTSTRUCT_NAME;

+% global SVMCROSSVAL_SUBJECTSTRUCT_NAME;

     disp('run coord table')

     subjects = args.subjects;

-    nSubjects = size(subjects);

+    nSubjects = numel(subjects);

     sessionlist = args.sessionList;

+    disp(sprintf('we have %g subjects. Press ANY-Key to continue.\n Use Retrun if your Keyboard lacks the ANY-Key.',nSubjects));

+    pause

+

     for s = 1:nSubjects

         subjectStruct{s}.dir = fullfile(args.basedir,cell2mat(subjects(s)));

         d = load(fullfile(subjectStruct{s}.dir,'results','SPM.mat'));

@@ -37,7 +40,7 @@ global SVMCROSSVAL_SUBJECTSTRUCT_NAME;

             end

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

         end

-       disp(sprintf('done %g // %g',s,nSubjects));

+       disp(sprintf('done %g / %g',s,nSubjects));

     end

     subjectData = subjectStruct;

@@ -1,12 +1,14 @@

-function runROIImageMaskMode(args)

+function subjectStruct  = runROIImageMaskMode(args)

-global SVMCROSSVAL_SUBJECTSTRUCT_NAME;

+% global SVMCROSSVAL_SUBJECTSTRUCT_NAME;

 subjects = args.subjects;

-nSubjects = size(subjects);

+nSubjects = numel(subjects);

 sessionlist = args.sessionList;

+disp(sprintf('we have %g subjects. Press ANY-Key to continue.\n Use Retrun if your Keyboard lacks the ANY-Key.',nSubjects));

+pause

 for s = 1:nSubjects

     subjectStruct{s}.dir = fullfile(args.basedir,cell2mat(subjects(s)));

@@ -49,7 +51,7 @@ for s = 1:nSubjects

     disp('done');

 end

-assignin('base',SVMCROSSVAL_SUBJECTSTRUCT_NAME,subjectStruct);

+% assignin('base',SVMCROSSVAL_SUBJECTSTRUCT_NAME,subjectStruct);

 end

@@ -29,7 +29,7 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

 %     set(frame,'Color',get(0,'defaultUicontrolBackgroundColor'));

     set(frame,'Resize','on');

     set(frame,'Units','normalized');

-    set(frame,'Color','w');

+    set(frame,'Color','y');

     model = struct;

     model.baseDir = DEFAULT.wd;

@@ -38,7 +38,7 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

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

     set(model.txtBaseDir,'ForegroundColor','b');

-    pFirstStep   = uipanel(frame,'Title','Preprocessing','Position',[0 0.25 1 0.720]);

+    pFirstStep   = uipanel(frame,'Title','Preprocessing','Position',[0 0.36 1 0.610]);

     set(pFirstStep,'BackgroundColor','w');

     set(pFirstStep,'Units','normalized');

@@ -47,15 +47,15 @@ DEFAULT.wd  = fullfile('d:','Analyze','Choice','24pilot');

     %Classification Step

     secondStepBaseColor = 'w';

-    pSecondStep = uipanel(frame,'Title','Classification','Position',[0 0 1 0.25]);

+    pSecondStep = uipanel(frame,'Title','Classification','Position',[0 0.1 1 0.25]);

     set(pSecondStep,'BackgroundColor',secondStepBaseColor);

     model = createSecondStepPanel(model,pSecondStep,DEFAULT,secondStepBaseColor);

     savemenu = uimenu(frame,'Label','Save/Load');

-    uimenu(savemenu,'Label','Save','Callback',{@mcb_save,model});

-    uimenu(savemenu,'Label','Load','Callback',{@mcb_load,model});

+    uimenu(savemenu,'Label','Save Preprocessing Parameter','Callback',{@mcb_save,model});

+    uimenu(savemenu,'Label','Load Preprocessing Parameter','Callback',{@mcb_load,model});

     uimenu(frame,'Label','change Study','Callback',{@mcb_cd,model},'Enable','off');