diff --git a/bashscripts/runOnEciton.bash b/bashscripts/runOnEciton.bash index 84882a1..5966ef3 100755 --- a/bashscripts/runOnEciton.bash +++ b/bashscripts/runOnEciton.bash @@ -7,4 +7,4 @@ #sed 's,\./,,g' -i dirs.txt #sed '/^[[:blank:]]*$/d' -i dirs.txt -matlab < /home/hohlochj/masterarbeit/usedMcode/callAll.m > /nfs/wsi/ti/messor/hohlochj/log/$(date +%y-%m-%d--%T)-all.log +matlab < /home/hohlochj/masterarbeit/usedMcode/callAll.m > /nfs/wsi/ti/messor/hohlochj/log/$(date +%y-%m-%d--%T)-allDefault3Syn.log diff --git a/usedMcode/callAll.m b/usedMcode/callAll.m index 50216fa..17cd5aa 100644 --- a/usedMcode/callAll.m +++ b/usedMcode/callAll.m @@ -4,10 +4,10 @@ maxFile=5; threshold=10000; %EMG is classified as movement EMGChannels={'AbdPolLo','Biceps','Triceps','FrontDelt','MidDelt','BackDelt'}; -noSynergies=4; +noSynergies=3; allSubjects=true; %run all subjects and days or only one random day for one random subject -name='default'; %suffix for the output, has to be valid name for file (no space, /, ...) +name='default3Syn'; %suffix for the output, has to be valid name for file (no space, /, ...) windowEMG=0.2; windowEEG=1; shiftEMG=0.05; @@ -35,7 +35,7 @@ j=j+1; end end -j=j-1; +j=j-1; %number of trial-days for all subjects if allSubjects @@ -77,7 +77,7 @@ parfor j=1:size(numbersMat,2) number=numbersMat(j); subject=subjectsForNumbers{j}; - savePath=readAll(pathToFile,subject,number,windowEMG,windowEEG,shiftEMG,shiftEEG,maxFile,threshold,pburgOrder,minEEGFreq,maxEEGFreq,pause,noLFsamples); + savePath=readAll(pathToFile,subject,number,windowEMG,windowEEG,shiftEMG,shiftEEG,maxFile,threshold,pburgOrder,minEEGFreq,maxEEGFreq,pause,noLFsamples,EMGChannels,noSynergies); [meanAccurancysEMG(j),maxCEMG(j,:),cmScaledEMG(j,:,:)]=svmEciton(savePath,'EMG',k,maxExpC,maxPerClass,eegOffset); [meanAccurancysEEG(j),maxCEEG(j,:),cmScaledEEG(j,:,:)]=svmEciton(savePath,'EEG',k,maxExpC,maxPerClass,eegOffset); [meanAccurancysLF(j),maxCLF(j,:),cmScaledLF(j,:,:)]=svmEciton(savePath,'LF',k,maxExpC,maxPerClass,eegOffset); diff --git a/usedMcode/readAll.m b/usedMcode/readAll.m index 2795b78..4e1533c 100644 --- a/usedMcode/readAll.m +++ b/usedMcode/readAll.m @@ -3,8 +3,8 @@ %fprintf('start read %s%i %s\n',subject,number,datestr(datetime('now'))); savePath=strcat(pathToFile,... - sprintf('../matlabData/%s%i%imsWindowEMG%isWindowEEG%imsShiftEMG%imsShiftEEGFreq%ito%iPause%ipBurg%i.mat',... - subject,number,windowEMG*1000,windowEEG,shiftEMG*1000,shiftEEG*1000,minEEGFreq,maxEEGFreq,pause,pburgOrder)); + sprintf('../matlabData/%s%i%imsWindowEMG%isWindowEEG%imsShiftEMG%imsShiftEEGFreq%ito%iPause%ipBurg%inoSyn%i.mat',... + subject,number,windowEMG*1000,windowEEG,shiftEMG*1000,shiftEEG*1000,minEEGFreq,maxEEGFreq,pause,pburgOrder,noSynergies)); %only create file if it doesn't exist yet if exist(savePath, 'file') ~= 2