From 699facd9c070f5c0751497e595d3c365fdda71a5 Mon Sep 17 00:00:00 2001 From: vzeng97 <76026118+vzeng97@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:22:04 -0400 Subject: [PATCH 1/3] Add files via upload --- GCLUST/matlab/mmil_fuzzy_names.m | 51 ++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/GCLUST/matlab/mmil_fuzzy_names.m b/GCLUST/matlab/mmil_fuzzy_names.m index 41d4768..8f49f88 100644 --- a/GCLUST/matlab/mmil_fuzzy_names.m +++ b/GCLUST/matlab/mmil_fuzzy_names.m @@ -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',{'motorpremotor2','occipital2','posterolateraltemporal',... 'superiorparietal','orbitofrontal','superiortemporal','inferiorparietal',... 'dorsomedialfrontal','anteromedialtemporal','precuneus',... 'dorsolateralprefrontal','parsopercularis'},[],... }); 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; From 7e10257ad17a38127fb5779414570af3effe13ac Mon Sep 17 00:00:00 2001 From: vzeng97 <76026118+vzeng97@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:26:17 -0400 Subject: [PATCH 2/3] Update mmil_fuzzy_names.m --- GCLUST/matlab/mmil_fuzzy_names.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GCLUST/matlab/mmil_fuzzy_names.m b/GCLUST/matlab/mmil_fuzzy_names.m index 8f49f88..9cf67d8 100644 --- a/GCLUST/matlab/mmil_fuzzy_names.m +++ b/GCLUST/matlab/mmil_fuzzy_names.m @@ -28,10 +28,10 @@ 'superiorparietal','orbitofrontal','superiortemporal','inferiorparietal',... 'dorsomedialfrontal','anteromedialtemporal','precuneus',... 'dorsolateralprefrontal','parsopercularis'},[],... - 'order12_labels_thickness',{'motorpremotor2','occipital2','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); From 6acb7e9c50d3c2b96a320d456e0f787ae4cad20b Mon Sep 17 00:00:00 2001 From: vzeng97 <76026118+vzeng97@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:39:00 -0400 Subject: [PATCH 3/3] Update mmil_analyze_fuzzy_concat.m --- GCLUST/matlab/mmil_analyze_fuzzy_concat.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GCLUST/matlab/mmil_analyze_fuzzy_concat.m b/GCLUST/matlab/mmil_analyze_fuzzy_concat.m index 7615b5f..8836410 100644 --- a/GCLUST/matlab/mmil_analyze_fuzzy_concat.m +++ b/GCLUST/matlab/mmil_analyze_fuzzy_concat.m @@ -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 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -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'},[],... }); %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -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 @@ -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;