Skip to content

Add output to some measure functions and tests #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pier-d wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add output to some measure functions and tests #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46d611f
Add output to some measure functions
Apr 7, 2022
28b77e8
Add tests
Apr 10, 2022
10752c8
Correct grammatical errors
Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
398 changes: 200 additions & 198 deletions Measures/FOOOFer.m
View file
Open in desktop

Large diffs are not rendered by default.

197 changes: 101 additions & 96 deletions Measures/PSDr.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,102 @@
%% PSDr
% This function computes the Power Spectral Density relative over a total
% band defined by the user, using the Welch's power formulation.
%
% PSDr(fs, cf, nEpochs, dt, inDir, tStart, relBand)
%
% input:
% fs is the sampling frequency
% cf is an array containing the cut frequencies (es, [1 4 8 13 30 40])
% nEpochs contains the number of epochs to compute
% dt contains the time (in seconds) of each epoch
% inDir is the directory containing each case
% tStart is the starting time (in seconds) to computate the first sample
% of the first epoch (0 as default)
% relBand is the total band used to obtain the relative band
% ([min(min(cf),1) max(max(cf),40)] as default, the first value is
% the minimum between 1 and the first cut frequency and the second
% value is the maximum between 40 and the last cut frequency)


function PSDr(fs, cf, nEpochs, dt, inDir, tStart, relBand)
switch nargin
case 5
tStart = 0;
relBand = [min(min(cf), 1) max(max(cf), 40)];
case 6
relBand = [min(min(cf), 1) max(max(cf), 40)];
end

f = waitbar(0,'Processing your data', 'Color', '[1 1 1]');
fchild = allchild(f);
fchild(1).JavaPeer.setForeground(fchild(1).JavaPeer.getBackground.BLUE)
fchild(1).JavaPeer.setStringPainted(true)

cfstart = 0;
cfstop = length(cf)-1;
nBands = cfstop-cfstart;
dt = fs*dt;
tStart = tStart*fs+1;
inDir = path_check(inDir);
if iscell(relBand)
aux_relBand = [str2double(string(relBand{1})), ...
str2double(string(relBand{2}))];
relBand = aux_relBand;
end

cases = define_cases(inDir);

for i = 1:length(cases)
try
[time_series, fsOld, locations, chanlocs] = ...
load_data(strcat(inDir, cases(i).name), 1);
time_series = resample_signal(time_series, fs, fsOld);
time_series = time_series(:, tStart:end);
psdr.data = zeros(nBands, nEpochs, size(time_series, 1));
psdr.locations = locations;
psdr.chanlocs = chanlocs;
for k = 1:nEpochs

for j = 1:size(time_series, 1)
data = squeeze(time_series(j, dt*(k-1)+1:k*dt));
[pxx, w] = pwelch(data, [], [], [], fs);
bandPower = zeros(nBands, 1);

for b = 1:nBands
[infft, supft] = band_boundaries(w, ...
cf(b+cfstart), cf(b+cfstart+1));

bandPower(b, 1) = sum(pxx(infft:supft));
end

[infft, supft] = band_boundaries(w, relBand(1), ...
relBand(end));
totalPower = sum(pxx(infft:supft));

for b = 1:nBands
psdr.data(b, k, j) = bandPower(b, 1)/totalPower;
end
end
end

outDir = path_check(subdir(inDir, 'PSDr'));
name = split(cases(i).name, filesep);
if length(name) > 1
name = name{2};
else
name = cases(i).name;
end
filename = strcat(outDir, strtok(name, '.'), '.mat');

save(fullfile_check(filename), 'psdr');
catch
end %end try
waitbar(i/length(cases), f)
end
close(f)
%% PSDr
% This function computes the Power Spectral Density relative over a total
% band defined by the user, using the Welch's power formulation.
%
% PSDr(fs, cf, nEpochs, dt, inDir, tStart, relBand)
%
% input:
% fs is the sampling frequency
% cf is an array containing the cut frequencies (es, [1 4 8 13 30 40])
% nEpochs contains the number of epochs to compute
% dt contains the time (in seconds) of each epoch
% inDir is the directory containing each case
% tStart is the starting time (in seconds) to computate the first sample
% of the first epoch (0 as default)
% relBand is the total band used to obtain the relative band
% ([min(min(cf),1) max(max(cf),40)] as default, the first value is
% the minimum between 1 and the first cut frequency and the second
% value is the maximum between 40 and the last cut frequency)


function vargout = PSDr(fs, cf, nEpochs, dt, inDir, tStart, relBand)
switch nargin
case 5
tStart = 0;
relBand = [min(min(cf), 1) max(max(cf), 40)];
case 6
relBand = [min(min(cf), 1) max(max(cf), 40)];
end

f = waitbar(0,'Processing your data', 'Color', '[1 1 1]');
fchild = allchild(f);
fchild(1).JavaPeer.setForeground(fchild(1).JavaPeer.getBackground.BLUE)
fchild(1).JavaPeer.setStringPainted(true)

vargout = -1;
cfstart = 0;
cfstop = length(cf)-1;
nBands = cfstop-cfstart;
dt = fs*dt;
tStart = tStart*fs+1;
inDir = path_check(inDir);
if iscell(relBand)
aux_relBand = [str2double(string(relBand{1})), ...
str2double(string(relBand{2}))];
relBand = aux_relBand;
end

cases = define_cases(inDir);
for i = 1:length(cases)
try
[time_series, fsOld, locations, chanlocs] = ...
load_data(strcat(inDir, cases(i).name), 1);
time_series = resample_signal(time_series, fs, fsOld);
time_series = time_series(:, tStart:end);
psdr.data = zeros(nBands, nEpochs, size(time_series, 1));
psdr.locations = locations;
psdr.chanlocs = chanlocs;

for k = 1:nEpochs
for j = 1:size(time_series, 1)

data = squeeze(time_series(j, dt*(k-1)+1:k*dt));
[pxx, w] = pwelch(data, [], [], [], fs);
bandPower = zeros(nBands, 1);

for b = 1:nEpochs
[infft, supft] = band_boundaries(w, ...
cf(b+cfstart), cf(b+cfstart+1));

bandPower(b, 1) = sum(pxx(infft:supft));
vargout = 0;
end

[infft, supft] = band_boundaries(w, relBand(1), ...
relBand(end));

totalPower = sum(pxx(infft:supft));

for b = 1:nBands
psdr.data(b, k, j) = bandPower(b, 1)/totalPower;
end

end
end

outDir = path_check(subdir(inDir, 'PSDr'));
name = split(cases(i).name, filesep);
if length(name) > 1
name = name{2};
else
name = cases(i).name;
end
filename = strcat(outDir, strtok(name, '.'), '.mat');

save(fullfile_check(filename), 'psdr');
catch
end
%end try
waitbar(i/length(cases), f)
end
close(f)
end
Loading