Skip to content

Commit 5f18633

Browse files
Merge pull request #1532 from softmatterlab/ac-ConnectivityOrderedMultiplexPipeline
Ac connectivity ordered multiplex pipeline
2 parents 56e45c9 + 55ab1f8 commit 5f18633

File tree

34 files changed

+380
-64
lines changed

34 files changed

+380
-64
lines changed

braph2genesis/measures/_MultilayerCommunityStructure.gen.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@
161161
it(:,i)=M(ii(i));
162162
end
163163
it = it(ii,:);
164-
if norm(full(it-it')) > 2*eps
165-
error([BRAPH2.STR ':MultilayerCommunityStructure:' BRAPH2.WRONG_INPUT], ...
166-
'Function handle does not correspond to a symmetric matrix. Deviation: %i', norm(full(it-it')))
167-
end
164+
% if norm(full(it-it')) > 2*eps
165+
% error([BRAPH2.STR ':MultilayerCommunityStructure:' BRAPH2.WRONG_INPUT], ...
166+
% 'Function handle does not correspond to a symmetric matrix. Deviation: %i', norm(full(it-it')))
167+
% end
168168
else
169169
n = length(OM);
170170
S = (1:n)';

braph2genesis/neuralnetworks/_NNClassifierCrossValidation.gen.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@
266266
else
267267
pr = PanelPropCell('EL', nncv, 'PROP', NNClassifierCrossValidation.FEATURE_IMPORTANCE, varargin{:});
268268
end
269+
else
270+
pr = PanelPropCell('EL', nncv, 'PROP', NNClassifierCrossValidation.FEATURE_IMPORTANCE, varargin{:});
269271
end
270272

271273
%% ¡props_update!

braph2genesis/neuralnetworks/_NNClassifierEvaluator.gen.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ under the ROC curve (AUC), and the confusion matrix.
4646
else
4747
pr = PanelPropCell('EL', nne, 'PROP', NNClassifierEvaluator.FEATURE_MASK, varargin{:});
4848
end
49+
else
50+
pr = PanelPropCell('EL', nne, 'PROP', NNClassifierEvaluator.FEATURE_MASK, varargin{:});
4951
end
5052

5153
%%% ¡prop!
@@ -130,6 +132,8 @@ under the ROC curve (AUC), and the confusion matrix.
130132
else
131133
pr = PanelPropCell('EL', nne, 'PROP', NNClassifierEvaluator.FEATURE_PERMUTATION_IMPORTANCE, varargin{:});
132134
end
135+
else
136+
pr = PanelPropCell('EL', nne, 'PROP', NNClassifierEvaluator.FEATURE_PERMUTATION_IMPORTANCE, varargin{:});
133137
end
134138

135139
%%% ¡prop!

braph2genesis/pipelines/connectivity multiplex group_average/example_CON_MP_GA_WU.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
gr2 = im_gr2.get('GR');
3030

31-
%% Analysis Group CON_MP WU
31+
%% Analysis Group CON_MP GA WU
3232
a_WU1 = AnalyzeGroup_CON_MP_GA_WU( ...
3333
'GR', gr1 ...
3434
);

braph2genesis/pipelines/connectivity multiplex group_average/pipeline_connectivity_multiplex_group_analysis_wu.braph2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
% This is the pipeline script to analyze a group of subjects using connectivity multiplex data averaged by group and a weighted undirected graph.
44
% 1. It loads a brain atlas from an XLS file (e.g., desikan_atlas.xlsx).
5-
% 2.1 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
6-
% 2.2 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
5+
% 2. It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
76
% 3. It analyzes the data using connectivity multiplex analysis (CON_MP) based on weighted undirected graphs (WU) averaged by group (GA).
87

98
%% Brain Atlas

braph2genesis/pipelines/connectivity multiplex/pipeline_connectivity_multiplex_analysis_bud.braph2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
% This is the pipeline script to analyze a group of subjects using connectivity multiplex data and a binary undirected graph at fixed densities.
44
% 1. It loads a brain atlas from an XLS file (e.g., aal90_atlas.xlsx).
5-
% 2.1 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
6-
% 2.2 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
5+
% 2. It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
76
% 3. It analyzes the data using connectivity multiplex analysis (CON_MP) based on a binary undirected graph at fixed densities (BUD).
87

98
%% Brain Atlas

braph2genesis/pipelines/connectivity multiplex/pipeline_connectivity_multiplex_analysis_but.braph2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
% This is the pipeline script to analyze a group of subjects using connectivity multiplex data and a binary undirected graph at fixed thresholds.
44
% 1. It loads a brain atlas from an XLS file (e.g., aal90_atlas.xlsx).
5-
% 2.1 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
6-
% 2.2 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
5+
% 2. It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
76
% 3. It analyzes the data using connectivity multiplex analysis (CON_MP) based on a binary undirected graph at fixed thresholds (BUT).
87

98
%% Brain Atlas

braph2genesis/pipelines/connectivity multiplex/pipeline_connectivity_multiplex_analysis_wu.braph2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
% This is the pipeline script to analyze a group of subjects using connectivity multiplex data and a weighted undirected graph.
44
% 1. It loads a brain atlas from an XLS file (e.g., aal90_atlas.xlsx).
5-
% 2.1 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
6-
% 2.2 It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
5+
% 2. It loads the connectivity data of one group of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
76
% 3. It analyzes the data using connectivity multiplex analysis (CON_MP) based on weighted undirected graphs (WU).
87

98
%% Brain Atlas

braph2genesis/pipelines/connectivity multiplex/pipeline_connectivity_multiplex_comparison_bud.braph2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
% This is the pipeline script to compare two groups of subjects using connectivity multiplex data and binary undirected graphs at fixed densities.
44
% 1. It loads a brain atlas from an XLS file (e.g., aal90_atlas.xlsx).
5-
% 2.1 It loads the connectivity data of two groups of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
6-
% 2.2 It loads the connectivity data of two groups of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
5+
% 2. It loads the connectivity data of two groups of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
76
% 3. It analyzes the first group using connectivity multiplex analyses (CON_MP) based on binary undirected graphs at fixed densities (BUD).
87
% 4. It analyzes the second group using the same parameters selected for the first group.
98
% 5. It compares the results of the two analyses.

braph2genesis/pipelines/connectivity multiplex/pipeline_connectivity_multiplex_comparison_but.braph2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
% This is the pipeline script to compare two groups of subjects using connectivity multiplex data and binary undirected graphs at fixed thresholds.
44
% 1. It loads a brain atlas from an XLS file (e.g., aal90_atlas.xlsx).
5-
% 2.1 It loads the connectivity data of two groups of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
6-
% 2.2 It loads the connectivity data of two groups of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
5+
% 2. It loads the connectivity data of two groups of subjects from two directories (e.g., GroupName1 and GroupName2) containing XLS files of each subject.
76
% 3. It analyzes the first group using connectivity multiplex analyses (CON_MP) based on binary undirected graphs at fixed thresholds (BUT).
87
% 4. It analyzes the second group using the same parameters selected for the first group.
98
% 5. It compares the results of the two analyses.

0 commit comments

Comments
 (0)