SVMCrossVal.git

@@ -83,6 +83,11 @@ end

 function decode(model,task)

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

+if(~(isa(preprocessedData,'struct')))

+    display('you need to preprocess some data before this step');

+    return

+end

+

 header            = preprocessedData.header;

 header.frameShift = getFrameShiftParams(model);

 data              = preprocessedData.subjectdata;

@@ -102,8 +107,11 @@ switch task

         decode.header = header;

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

     case 'SOM'

-        disp('not implemented')

-

+        display('SOM');

+        somopts = '';

+        decode = som_combined_subject_batch(header,data,somopts);

+        decode.header = header;

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

     case 'X-SOM'

         disp('not implemented')

@@ -0,0 +1,74 @@

+%% subject loop

+function decode = som_combined_subject_batch(header,subjectdata,somOpts)

+

+addpath 'somtoolbox2';

+

+nSubjects = numel(subjectdata);

+if(nSubjects < 2) 

+    error('SVMCrossVal:xsvmSubjectLoop:tooFewSubjects','You need at least 2 Subjects in this Across-Subject analysis!');

+end

+

+RANDOMIZE_DATAPOINTS = 1;

+

+decode = struct;

+decode.decodePerformance = [];

+decode.rawTimeCourse     = [];

+

+disp(sprintf('computinig additional datastructs for %u subjects',nSubjects));

+

+timeline = header.timeline;

+timeline.frameShiftStart = header.frameShift.frameShiftStart;

+timeline.frameShiftEnd   = header.frameShift.frameShiftEnd;

+timeline.decodeDuration  = header.frameShift.decodeDuration;

+

+% TimePointMatrix

+for subjectDataID = 1:nSubjects

+    currentSubject = subjectdata{subjectDataID};

+    timePointArgs.pst           = currentSubject.pst;

+    timePointArgs.labelMap      = LabelMap(header.classDef.labelCells,header.classDef.conditionCells);

+    timePointArgs.eventList     = header.classDef.eventMatrix;

+

+    timePointMatrix{subjectDataID} = buildTimePointMatrix(timeline,timePointArgs);

+    

+    decode.rawTimeCourse = [decode.rawTimeCourse currentSubject.pst];

+end

+

+% timeframe x-subject validation

+timeLineStart   = timeline.frameShiftStart;

+timeLineEnd     = timeline.frameShiftEnd;

+

+display(sprintf('%u -fold cross validation for %u timeslices.\n',nSubjects,size(1:timeLineEnd-timeLineStart+1,2)));

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

+% pause

+

+for timeIndex = 1:timeLineEnd-timeLineStart+1

+        svm_train_label = [];

+        svm_train_data  = [];

+        svm_validation_label = [];

+        svm_validation_data  = [];

+        for subjectDataID = 1:nSubjects

+            svmstruct = calculateSVMTables(timePointMatrix{subjectDataID},timeIndex);

+            svm_validation_label = svmstruct.svmlabel;

+            svm_validation_data  = svmstruct.svmdata;

+            svm_train_label = [svm_train_label; svmstruct.svmlabel];

+            svm_train_data  = [svm_train_data;  svmstruct.svmdata];

+        end

+        

+        if RANDOMIZE_DATAPOINTS

+            rndindex  = randperm(length(svm_train_label));

+            svm_train_data   = svm_train_data(rndindex,:);

+            svm_train_label  = svm_train_label(rndindex);

+        end

+

+        [sD sM] = train_som(svmlabel, svmdata, somOpts)

+        

+%         [plabel accuracy dvalue] = svmpredict(svm_validation_label,svm_validation_data,svmmodel,'');

+        cross_value = [cross_value accuracy(1)];

+        

+    end

+    decode.decodePerformance = [decode.decodePerformance; cross_value];

+    

+end

+

+disp('decode done');

+end

@@ -319,11 +319,20 @@ pSVM = uipanel(parent,'Units','normalized','Position',[0 0.4 0.5 0.4]);

     model.txtSVMnfold = createTextField(pSVM,[0.0 0.66 0.5 0.16],DEFAULT.svmnfold);

     createLabel(pSVM,[0.5 0.50 0.5 0.25 ],'-Fold CrossVal');

-    model.chkSVMrnd = uicontrol(pSVM,'Style','checkbox','Units','normalized','Position',[0.1 0.50 1 0.16]);

+    model.chkSVMrnd = uicontrol(pSVM,'Style','checkbox','Units','normalized','Position',[0.1 0.50 0.9 0.16]);

     set(model.chkSVMrnd,'String','Randomize Datapoints');

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

     set(model.chkSVMrnd,'Value',DEFAULT.svmrnd);

+    btnRunSVM = uicontrol(pSVM,'String','run batchmode SVM Crossvalidation',...

+        'Units','normalized',...

+        'Position',[0 0.25 1 0.25]);

+    set(btnRunSVM,'Enable','on');

+    

+    btnRunXSVM = uicontrol(pSVM,'String','run SVM X-Subject validation',...

+        'Units','normalized',...

+        'Position',[0 0.0 1 0.25]);

+    set(btnRunXSVM,'Enable','on');

 pSOM = uipanel(parent,'Units','normalized','Position',[0.5 0.4 0.5 0.4]);

     set(pSOM,'Title','SOM Classification');

@@ -337,30 +346,21 @@ pSOM = uipanel(parent,'Units','normalized','Position',[0.5 0.4 0.5 0.4]);

     set(model.txtSOMnfold,'Enable','off');

     createLabel(pSOM,[0.5 0.50 0.5 0.25 ],'-Fold CrossVal');

-% buttons

-    btnRunSVM = uicontrol(pSVM,'String','run SVM Crossvalidation',...

-        'Units','normalized',...

-        'Position',[0 0.25 1 0.25]);

-    set(btnRunSVM,'Callback',{@cbRunDecode,model,'SVM'}); % set here, because of model.

-    set(btnRunSVM,'Enable','on');

-    

-    btnRunXSVM = uicontrol(pSVM,'String','run SVM X-Subject validation',...

-        'Units','normalized',...

-        'Position',[0 0.0 1 0.25]);

-    set(btnRunXSVM,'Callback',{@cbRunDecode,model,'XSVM'}); % set here, because of model.

-    set(btnRunXSVM,'Enable','on');

-    

     btnRunSOM = uicontrol(pSOM,'String','run SOM Crossvalidation',...

         'Units','normalized',...

         'Position',[0.0 0.25 1 0.25]);

-    set(btnRunSOM,'Callback',{@cbRunDecode,model,'SOM'}); % set here, because of model.

-    set(btnRunSOM,'Enable','off');

+    set(btnRunSOM,'Enable','on');

     btnRunXSOM = uicontrol(pSOM,'String','run SOM X-Subject validation',...

         'Units','normalized',...

         'Position',[0.0 0.0 1 0.25]);

-    set(btnRunXSOM,'Callback',{@cbRunDecode,model,'XSOM'}); % set here, because of model.

     set(btnRunXSOM,'Enable','off');

+

+% button callbacks set here, because of model.

+    set(btnRunSVM, 'Callback',{@cbRunDecode,model,'SVM'}); 

+    set(btnRunXSVM,'Callback',{@cbRunDecode,model,'XSVM'}); 

+    set(btnRunSOM, 'Callback',{@cbRunDecode,model,'SOM'});

+    set(btnRunXSOM,'Callback',{@cbRunDecode,model,'XSOM'}); 

 end

 function model = createVisualStepPanel(model,parent,DEFAULT)