Skip to content

Fixes csv outputs for thickness + specifies lh vs rh #5

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
vzeng97 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes csv outputs for thickness + specifies lh vs rh #5

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
699facd
Add files via upload
vzeng97 Jun 9, 2022
7e10257
Update mmil_fuzzy_names.m
vzeng97 Jun 9, 2022
6acb7e9
Update mmil_analyze_fuzzy_concat.m
vzeng97 Jun 9, 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
8 changes: 4 additions & 4 deletions GCLUST/matlab/mmil_analyze_fuzzy_concat.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function mmil_analyze_fuzzy_concat(fnames_data,fnames_roi,varargin)
% {default: 0}
%
% Created: 04/05/14 by Don Hagler
% Last Mod: 11/25/14 by Don Hagler
% Last Mod: 06/09/22 by Victor Zeng
%

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand All @@ -67,7 +67,7 @@ function mmil_analyze_fuzzy_concat(fnames_data,fnames_roi,varargin)
'fuzzy_fstem','fuzzy',[],...
'fuzzy_order',12,[0,1,2,4,12,18],...
...
'fuzzy_name_tags',{'fuzzy_fstem','fuzzy_order'},[],...
'fuzzy_name_tags',{'measname','fuzzy_fstem','fuzzy_order'},[],...
});

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down Expand Up @@ -207,7 +207,7 @@ function mmil_analyze_fuzzy_concat(fnames_data,fnames_roi,varargin)
tmp_name = sprintf('%s-%s',parms.roinames{r},hemi);
end;
if ~isempty(parms.measname)
tmp_name = [tmp_name '-' parms.measname];
tmp_name = [hemi '.' tmp_name '-' parms.measname];
end;
roinames{r,h} = tmp_name;
% calculate weighted averages for this ROI
Expand All @@ -221,6 +221,6 @@ function mmil_analyze_fuzzy_concat(fnames_data,fnames_roi,varargin)
data = reshape(roivals,[parms.nhemi*nroi,parms.nframes])';
% write results as csv file
mmil_write_csv(fname_out,data,'row_labels',row_labels,...
'col_labels',col_labels','firstcol_label','SubjID');
'col_labels',col_labels,'firstcol_label','SubjID');
end;

51 changes: 29 additions & 22 deletions GCLUST/matlab/mmil_fuzzy_names.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,43 @@
parms = mmil_args2parms(varargin,{...
'fuzzy_fstem','fuzzy',[],...
'fuzzy_order',18,[2,4,12,18],...
'measname','area',{'area','thickness'},...
...
'order2_labels',{'frontal','posterior'},[],...
'order4_labels',{'frontal','occipital','temporal','parietal'},[],...
'order12_labels',{'motorpremotor','occipital','posterolateraltemporal',...
'order12_labels_area',{'motorpremotor','occipital','posterolateraltemporal',...
'superiorparietal','orbitofrontal','superiortemporal','inferiorparietal',...
'dorsomedialfrontal','anteromedialtemporal','precuneus',...
'dorsolateralprefrontal','parsopercularis'},[],...
'order12_labels_thickness',{'motorpremotor.sma','medialprefrontal','ventralfrontal',...
'middletemporal','perisylvian','ventromedialoccipital','medialtemporal',...
'inferiorparietal','temporalpole','dorsolateralprefrontal',...
'superiorparietal','occipital'},[],...
});

fuzzy_names = cell(1,parms.fuzzy_order);

switch parms.fuzzy_order
case {2,4,12}
fuzzy_labels = parms.(sprintf('order%d_labels',parms.fuzzy_order));
for i=1:parms.fuzzy_order
fuzzy_names{i} = sprintf('%s%d_%s',...
parms.fuzzy_fstem,parms.fuzzy_order,fuzzy_labels{i});
end;
otherwise
fuzzy_labels = cat(2,parms.order2_labels,parms.order4_labels,parms.order12_labels);
for i=1:parms.fuzzy_order
if i<=2
fuzzy_order = 2;
elseif i<=6
fuzzy_order = 4;
else
fuzzy_order = 12;
end;
fuzzy_names{i} = sprintf('%s%d_%s',...
parms.fuzzy_fstem,fuzzy_order,fuzzy_labels{i});
end;
switch parms.measname
case {'area','thickness'}
switch parms.fuzzy_order
case {2,4,12}
fuzzy_labels = parms.(sprintf('order%d_labels_%s',parms.fuzzy_order,parms.measname));
for i=1:parms.fuzzy_order
fuzzy_names{i} = sprintf('%s%d_%s',...
parms.fuzzy_fstem,parms.fuzzy_order,fuzzy_labels{i});
end;
otherwise
fuzzy_labels = cat(2,parms.order2_labels,parms.order4_labels,parms.order12_labels);
for i=1:parms.fuzzy_order
if i<=2
fuzzy_order = 2;
elseif i<=6
fuzzy_order = 4;
else
fuzzy_order = 12;
end;
fuzzy_names{i} = sprintf('%s%d_%s',...
parms.fuzzy_fstem,fuzzy_order,fuzzy_labels{i});
end;
end
end;