diff --git a/usedMcode/callAll.m b/usedMcode/callAll.m index 92acc31..893bcfe 100644 --- a/usedMcode/callAll.m +++ b/usedMcode/callAll.m @@ -134,8 +134,9 @@ % [correlationEMGnnmf,maxRidgeParamIndexEMGnnmf(:,:)]=ridgeCV(savePath,'EMG','NNMF',k,ridgeParams,eegOffset); % [correlationEEGnnmf,maxRidgeParamIndexEEGnnmf(:,:)]=ridgeCV(savePath,'EEG','NNMF',k,ridgeParams,eegOffset); % [correlationLFnnmf,maxRidgeParamIndexLFnnmf(:,:)]=ridgeCV(savePath,'LF','NNMF',k,ridgeParams,eegOffset); -% [correlationEEGemg,maxRidgeParamIndexEEGemg(:,:)]=ridgeCV(savePath,'EEG','EMG',k,ridgeParams,eegOffset); -% [correlationAutoencKin,maxRidgeParamIndexAutoencKin(:,:)]=ridgeCV(savePath,'Autoenc','kin',k,ridgeParams,eegOffset); + [correlationEEGemg,maxRidgeParamIndexEEGemg(:,:)]=ridgeCV(savePath,'EEG','EMG',k,ridgeParams,eegOffset); + [correlationAutoencKin,maxRidgeParamIndexAutoencKin(:,:)]=ridgeCV(savePath,'Autoenc','kin',k,ridgeParams,eegOffset); + disp('begin') [correlationViaAutoenc,viaCorrelationAutoenc]=ridgeCVvia(savePath,'EEG','Autoenc','kin',k,[100],eegOffset); [correlationViaPCA,viaCorrelationPCA]=ridgeCVvia(savePath,'EEG','PCA','kin',k,[100],eegOffset); [correlationViaNNMF,viaCorrelationNNMF]=ridgeCVvia(savePath,'EEG','NNMF','kin',k,[100],eegOffset); diff --git a/usedMcode/shiftingMean.m b/usedMcode/shiftingMean.m index 7c417ae..edc2517 100644 --- a/usedMcode/shiftingMean.m +++ b/usedMcode/shiftingMean.m @@ -2,7 +2,7 @@ %shiftingMean downsampling by taking the mean % taking the mean of $factor data as new datum dataSize=size(data); - output=zeros([fix(ceil(dataSize(1)/factor)),dataSize(2:end)]); + output=zeros([fix(dataSize(1)/factor),dataSize(2:end)]); for i=1:size(output,1) output(i,:)=mean(data(fix(round((i-1)*factor))+1:min(fix(round(i*factor)),dataSize(1)),:),1); end