SVMCrossVal.git

@@ -23,7 +23,6 @@ sessionList     = inputStruct.sessionList;

 % classList       = inputStruct.classList;

 % labelMap        = inputStruct.labelMap;

-smoothed        = inputStruct.smoothed;

 eventList       = inputStruct.eventList;

 timeLineStart   = timeline.frameShiftStart;

@@ -38,9 +37,15 @@ timeLineEnd     = timeline.frameShiftEnd;

 minPerformance = inf;

 maxPerformance = -inf;

-imageFiles = getImageFileList(des,~smoothed);

+subjectDir = '';

+sessionDirList = sessionList2DirList(sessionList) ;

+mask = '^fandersen.*img$';

+imageFiles = getImageFileList(subjectDir,sessionDirList,mask);

+disp('press key');

+pause

+

 extr = calculateImageData(imageFiles,voxelList);

 nVoxel = size(voxelList,1);

@@ -1,24 +1,9 @@

-function fileList = getImageFileList(des,use_smoothed_image_hack)

+function fileList = getImageFileList(subjectdir,sessionlist,mask)

+fileList = [];

-global USE_DRIVE_CHECK_HACK;

-

-fileList  = des.xY.VY;

-nFiles = length(fileList);

-

-if USE_DRIVE_CHECK_HACK

-    if fileList(1).fname(1)~='D'

-        for z=1:nFiles % Change Drive Letter - HACK!

-            fileList(z).fname(1) = 'D';

-        end;

-    end

-end

-if ~use_smoothed_image_hack

-    for z=1:nFiles % Change smoothed Filename - HACK!

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

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

-        tmp = findstr(filesep,fileList(z).fname);

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

-    end;

+for session = 1:numel(sessionlist)    

+    [sessionFileList dd] = spm_select('FPList',fullfile(subjectdir,sessionlist{session}),mask);

+    fileList = [fileList; sessionFileList];

 end

 end

\ No newline at end of file

@@ -10,12 +10,14 @@ outstruct.eventMatrix = [];

 for i = 1:nClasses

     line = txt(i,:);

-    delim = strfind(line,','); %first and last are real delimiter

-    outstruct.labelCells{i} = strtrunc(line(1:delim(1)-1));

-    outstruct.conditionCells{i} = eval(strtrunc(line(delim(1)+1:delim(length(delim))-1)));

-    outstruct.eventMatrix   = [outstruct.eventMatrix ; outstruct.conditionCells{i}];

-    outstruct.valueCells{i} = strtrunc(line(delim(length(delim))+1:length(line)));

+    [label rem] = strtok(line,',');

+    

+    outstruct.labelCells{i} = strtrim(label);

+    

+    conds = eval(strtrim(rem(2:end)));

+    outstruct.conditionCells{i} = conds;

+    outstruct.eventMatrix   = [outstruct.eventMatrix ; conds];

 end

 end

@@ -0,0 +1,17 @@

+function voxelList = parseCoordinateTextField(txtFieldHandel)

+s = get(txtFieldHandel,'String');

+rows = size(s,1);

+voxelList = [];

+    for i = 1:rows 

+        if all(isspace(s(i,:)))

+            continue;

+        end

+        line = s(i,:);

+        [roi rem] = strtok(line,'+');

+        roimod = eval(str2mat(rem(2:end)));

+        coord.name = roi;

+        coord.mod = roimod;

+        voxelList = [voxelList; coord];

+

+    end

+end

\ No newline at end of file

@@ -32,20 +32,20 @@ global SVMCROSSVAL_VOXEL_SELECTION_MODE_DEF;

         calculateParams.RANDOMIZE       = 0;

-        calculateParams.smoothed        = getChkValue(paramModel.chkSmoothed);

+%         calculateParams.smoothed        = getChkValue(paramModel.chkSmoothed);

-        calculateParams.svmargs         = get(paramModel.txtSVMopts,'String');

+%         calculateParams.svmargs         = get(paramModel.txtSVMopts,'String');

         calculateParams.sessionList     = 1:3;

         classStruct = parseClassDef(paramModel);

-        calculateParams.labelMap        = LabelMap(classStruct.labelCells , classStruct.conditionCells, 'auto'); % LabelMap({'<','>','<+<','>+>','<+>','>+<'},{-2,-1,1,2,3,4}); 0 is autolabel

-        calculateParams.classList       = getClasses(calculateParams.labelMap);

+%         calculateParams.labelMap        = LabelMap(classStruct.labelCells , classStruct.conditionCells, 'auto'); % LabelMap({'<','>','<+<','>+>','<+>','>+<'},{-2,-1,1,2,3,4}); 0 is autolabel

+%         calculateParams.classList       = getClasses(calculateParams.labelMap);

         calculateParams.eventList       = classStruct.eventMatrix; %[9,11,13; 10,12,14];

 %         calculateParams.eventList       = getPSTEventMatrix(calculateParams.labelMap);

-        subjectSelection = getSubjectIDString(paramModel);

+        subjectSelection = {'JZ006'}; %getSubjectIDString(paramModel);

         calculateParams.subjectSelection = subjectSelection;

         decode = claculateMultiSubjectDecodePerformance(timelineParams,calculateParams,paramModel);

@@ -94,7 +94,7 @@ for subjectCell = calculateParams.subjectSelection

     subjectParams.des             = spm.SPM;

-    subjectParams.voxelList       = parseVoxelList(paramModel,SubjectID);

+    subjectParams.voxelList       = mapVoxelList(voxelList,SubjectID);

     subjectParams.SubjectID       = SubjectID;

@@ -0,0 +1,5 @@

+function sessionDirList = sessionList2DirList(sessionList)

+for i = 1:numel(sessionList)

+    sessionDirList{i} = char(96+sessionList(i));

+end

+end

@@ -240,6 +240,8 @@ function model = createFirstStepPanel(model,parent,DEFAULT)

         set(model.txtVoxelDef,'Min',0);

         set(model.txtVoxelDef, 'FontName', 'FixedWidth');

+        assignin('base','txtVoxelDef',model.txtVoxelDef);

+        

         %normalizations

         pNorm = uipanel(parent,'Title','Normalization','Position',cell2mat(main_grid(2,3)));

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

@@ -1,25 +1,15 @@

 function spm_SVMCrossVal(varargin)

-SVMCROSSVAL_BASEDIR = fullfile('D:','Analyse','Choice');

-

 defineGlobals();

 switch nargin

 case 0

-% 	project_UI;

-	main_UI(varargin);

-case 1

-	main_UI(varargin);

+	ui_main(varargin);

 otherwise

 error('spm_SVMCrossVal:main','wrong nargin');

 end

 end

-function loadStudies(basedir)

-

-end

-

-