diff --git a/usedMcode/callAll.m b/usedMcode/callAll.m index a7176ec..0e333b2 100644 --- a/usedMcode/callAll.m +++ b/usedMcode/callAll.m @@ -59,7 +59,7 @@ save(strcat(pathToFile,sprintf('../matlabData/%s_callAll.mat',datestr(datetime('now'))))); else - j=rand()*size(numbersMat,2)+1; + j=fix(rand()*size(numbersMat,2)+1); number=numbersMat(j); subject=subjectsForNumbers{j}; @@ -69,7 +69,7 @@ [correlationEMG,maxRidgeParamIndex(:,:)]=ridgeCV(savePath,false,k,ridgeParams); [correlationEEG,maxRidgeParamIndex(:,:)]=ridgeCV(savePath,EEG,k,ridgeParams); fprintf('%s%i finished %s\n',subject,number,datestr(datetime('now'))) - + save(strcat(pathToFile,sprintf('../matlabData/%s_call%s%i.mat',datestr(datetime('now')),subject,number))); end delete(poolObj) diff --git a/usedMcode/ridgeCV.m b/usedMcode/ridgeCV.m index 2fea4fd..3a41e09 100644 --- a/usedMcode/ridgeCV.m +++ b/usedMcode/ridgeCV.m @@ -17,7 +17,7 @@ kin=kinematics(:,j); correlations=zeros([k,1]); - parfor i=1:k + for i=1:k leaveData=trainingData(mod(randMap,k)==i-1,:); leaveKin=kin(mod(randMap,k)==i-1); remainingData=trainingData(mod(randMap,k)~=i-1,:); diff --git a/usedMcode/shiftingKin.m b/usedMcode/shiftingKin.m index 2b6475e..f549076 100644 --- a/usedMcode/shiftingKin.m +++ b/usedMcode/shiftingKin.m @@ -1,6 +1,12 @@ function [kinPerSec]=shiftingKin(kin, windowEEG, shift) kinPerSec=zeros(fix((max(kin(:,1))-windowEEG*1000)/(shift*1000)),3); for j=1:size(kinPerSec,1) - kinPerSec(j,:)=sum(diff(kin(kin(:,1)>(j-1)*shift*1000 & kin(:,1)<=(j-1)*shift*1000+windowEEG*1000,2:4))); + tmp=sum(diff(kin(kin(:,1)>(j-1)*shift*1000 & kin(:,1)<=(j-1)*shift*1000+windowEEG*1000,2:4))); + i=j; + while isnan(tmp) %interval is empty + tmp=sum(diff(kin(kin(:,1)>(i-1)*shift*1000 & kin(:,1)<=(i-1)*shift*1000+windowEEG*1000,2:4))); + i=i+1; + end + kinPerSec(j,:)=tmp; end end \ No newline at end of file diff --git a/usedMcode/shiftingPos.m b/usedMcode/shiftingPos.m index 8a9a4cc..82dec59 100644 --- a/usedMcode/shiftingPos.m +++ b/usedMcode/shiftingPos.m @@ -1,6 +1,12 @@ function [kinPerSec]=shiftingPos(kin, windowEEG, shift) kinPerSec=zeros(fix((max(kin(:,1))-windowEEG*1000)/(shift*1000)),3); for j=1:size(kinPerSec,1) - kinPerSec(j,:)=mean(kin(kin(:,1)>(j-1)*shift*1000 & kin(:,1)<=(j-1)*shift*1000+windowEEG*1000,2:4)); + tmp=mean(kin(kin(:,1)>(j-1)*shift*1000 & kin(:,1)<=(j-1)*shift*1000+windowEEG*1000,2:4)); + i=j; + while isnan(tmp) %interval is empty + tmp=mean(kin(kin(:,1)>i*shift*1000 & kin(:,1)<=i*shift*1000+windowEEG*1000,2:4)); + i=i+1; + end + kinPerSec(j,:)=tmp; end end \ No newline at end of file