diff --git a/bashscripts/runOnEcitonPos.bash b/bashscripts/runOnEcitonPos.bash index c5d744a..15f5861 100755 --- a/bashscripts/runOnEcitonPos.bash +++ b/bashscripts/runOnEcitonPos.bash @@ -7,4 +7,4 @@ #sed 's,\./,,g' -i dirs.txt #sed '/^[[:blank:]]*$/d' -i dirs.txt -matlab < /home/hohlochj/masterarbeit/usedMcode/callAllPos.m > /nfs/wsi/ti/messor/hohlochj/log/$(date +%y-%m-%d--%T)-PosRidgeOnly.log +matlab < /home/hohlochj/masterarbeit/usedMcode/callAllPos.m > /nfs/wsi/ti/messor/hohlochj/log/$(date +%y-%m-%d--%T)-PosDefault.log diff --git a/usedMcode/callAll.m b/usedMcode/callAll.m index e939467..c919acb 100644 --- a/usedMcode/callAll.m +++ b/usedMcode/callAll.m @@ -77,9 +77,9 @@ correlationEMGemg=zeros([j,noSynergies]); maxRidgeParamIndexAutoencKin=zeros([j,noSynergies,k]); correlationAutoencKin=zeros([j,noSynergies]); - correlationViaAutoenc=zeros(j); - correlationViaPCA=zeros(j); - correlationViaNNMF=zeros(j); + correlationViaAutoenc=zeros([j,noSynergies]); + correlationViaPCA=zeros([j,noSynergies]); + correlationViaNNMF=zeros([j,noSynergies]); parfor j=1:size(numbersMat,2) number=numbersMat(j); diff --git a/usedMcode/callAllPos.m b/usedMcode/callAllPos.m index c41e1ba..f34c324 100644 --- a/usedMcode/callAllPos.m +++ b/usedMcode/callAllPos.m @@ -6,13 +6,13 @@ EMGChannels={'AbdPolLo','Biceps','Triceps','FrontDelt','MidDelt','BackDelt'}; noSynergies=3; -allSubjects=false; %run all subjects and days or only one random day for one random subject -name='defaultPosOff1'; %suffix for the output, has to be valid name for file (no space, /, ...) +allSubjects=true; %run all subjects and days or only one random day for one random subject +name='defaultPos'; %suffix for the output, has to be valid name for file (no space, /, ...) windowEMG=0.2; windowEEG=1; shiftEMG=0.05; shiftEEG=0.2; -eegOffset=1; %predict actions x*shiftEEG after EEG measurement +eegOffset=0; %predict actions x*shiftEEG after EEG measurement pburgOrder=250; minEEGFreq=2; maxEEGFreq=49; @@ -54,7 +54,7 @@ [correlationEMGpos(j,:),maxRidgeParamIndex(j,:,:)]=ridgeCV(savePath,'EMG','kin',k,ridgeParams,eegOffset); [correlationEEGpos(j,:),maxRidgeParamIndex(j,:,:)]=ridgeCV(savePath,'EEG','kin',k,ridgeParams,eegOffset); [correlationLFpos(j,:),maxRidgeParamIndex(j,:,:)]=ridgeCV(savePath,'LF','kin',k,ridgeParams,eegOffset); - %fprintf('%s%i finished %s\n',subject,number,datestr(datetime('now'))) + fprintf('%s%i finished %s\n',subject,number,datestr(datetime('now'))) end save(strcat(pathToFile,sprintf('../matlabData/%s_callAll-%s.mat',datestr(datetime('now')),name)));