Skip to content

Commit 55ab1f8

Browse files
annacanalannacanal
committed
update
1 parent 971e9fd commit 55ab1f8

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

‎braph2genesis/src/analysis/_AnalyzeEnsemble.gen.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@
8787
a.set('PFGD', PFAnalysisEnsemble('A', a))
8888
elseif ~isempty(tmp_g) && Graph.is_multigraph(tmp_g)
8989
a.set('PFGD', PFMultiAnalysisEnsemble('A', a))
90-
elseif ~isempty(tmp_g) && Graph.is_multiplex(tmp_g) && Graph.is_ordered_multiplex(tmp_g) && Graph.is_weighted(tmp_g)
90+
elseif ~isempty(tmp_g) && (Graph.is_multiplex(tmp_g) || Graph.is_ordered_multiplex(tmp_g)) && Graph.is_weighted(tmp_g)
9191
a.set('PFGD', PFMultiplexAnalysisEnsemble('A', a))
92-
elseif ~isempty(tmp_g) && Graph.is_multiplex(tmp_g) && Graph.is_ordered_multiplex(tmp_g) && Graph.is_binary(tmp_g)
92+
elseif ~isempty(tmp_g) && (Graph.is_multiplex(tmp_g) || Graph.is_ordered_multiplex(tmp_g)) && Graph.is_binary(tmp_g)
9393
a.set('PFGD', PFMultiplexBinaryAnalysisEnsemble('A', a))
9494
else
9595
a.memorize('PFGD').set('A', a)

‎braph2genesis/src/analysis/_ComparisonEnsemble.gen.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@
626626
((Measure.is_global(measure) && Measure.is_unilayer(measure)) || ...
627627
(Measure.is_global(measure) && Measure.is_superglobal(measure)))
628628
g = g_dict.getItem(1);
629-
if Graph.is_multiplex(g) && Measure.is_unilayer(measure)
629+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(measure)
630630
cp.set('PFC', PFComparisonEnsembleMultiplexGU('CP', cp))
631631
else
632632
cp.set('PFC', PFComparisonEnsembleGU('CP', cp))
@@ -635,7 +635,7 @@
635635
((Measure.is_nodal(measure) && Measure.is_unilayer(measure)) || ...
636636
(Measure.is_nodal(measure) && Measure.is_superglobal(measure)))
637637
g = g_dict.getItem(1);
638-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(measure)
638+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(measure)
639639
cp.set('PFC', PFComparisonEnsembleMultiplexNU('CP', cp))
640640
else
641641
cp.set('PFC', PFComparisonEnsembleNU('CP', cp))
@@ -644,7 +644,7 @@
644644
((Measure.is_binodal(measure) && Measure.is_unilayer(measure)) || ...
645645
(Measure.is_binodal(measure) && Measure.is_superglobal(measure)))
646646
g = g_dict.getItem(1);
647-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(measure)
647+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(measure)
648648
cp.set('PFC', PFComparisonEnsembleMultiplexBU('CP', cp))
649649
else
650650
cp.set('PFC', PFComparisonEnsembleBU('CP', cp))
@@ -685,14 +685,14 @@
685685
else
686686
cp.set('PFBG', PFBrainBinaryGraphComparison('ME', cp));
687687
end
688-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_weighted(g) % multiplexWU
688+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_weighted(g) % multiplexWU
689689
ba_list = g.get('BAS');
690690
if ~isempty(ba_list)
691691
cp.set('PFBG', PFBrainMultiplexGraphComparison('ME', cp, 'BA', ba_list{1}));
692692
else
693693
cp.set('PFBG', PFBrainMultiplexGraphComparison('ME', cp));
694694
end
695-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_binary(g)
695+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_binary(g)
696696
ba_list = g.get('BAS');
697697
if ~isempty(ba_list)
698698
cp.set('PFBG', PFBrainMultiplexBinaryGraphComparison('ME', cp, 'BA', ba_list{1}));

‎braph2genesis/src/analysis/_ComparisonGroup.gen.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -624,21 +624,21 @@
624624

625625
if ~isempty(measure) && Measure.is_global(measure) && ...
626626
(Measure.is_unilayer(measure) || Measure.is_superglobal(measure))
627-
if Graph.is_multiplex(g) && Measure.is_unilayer(measure)
627+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(measure)
628628
cp.set('PFC', PFComparisonGroupMultiplexGU('CP', cp))
629629
else
630630
cp.set('PFC', PFComparisonGroupGU('CP', cp))
631631
end
632632
elseif ~isempty(measure) && Measure.is_nodal(measure) && ...
633633
(Measure.is_unilayer(measure) || Measure.is_superglobal(measure))
634-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(measure)
634+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(measure)
635635
cp.set('PFC', PFComparisonGroupMultiplexNU('CP', cp))
636636
else
637637
cp.set('PFC', PFComparisonGroupNU('CP', cp))
638638
end
639639
elseif ~isempty(measure) && Measure.is_binodal(measure) && ...
640640
(Measure.is_unilayer(measure) || Measure.is_superglobal(measure))
641-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(measure)
641+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(measure)
642642
cp.set('PFC', PFComparisonGroupMultiplexBU('CP', cp))
643643
else
644644
cp.set('PFC', PFComparisonGroupBU('CP', cp))
@@ -678,14 +678,14 @@
678678
else
679679
cp.set('PFBG', PFBrainBinaryGraphComparison('ME', cp));
680680
end
681-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_weighted(g) % multiplexWU
681+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_weighted(g) % multiplexWU
682682
ba_list = g.get('BAS');
683683
if ~isempty(ba_list)
684684
cp.set('PFBG', PFBrainMultiplexGraphComparison('ME', cp, 'BA', ba_list{1}));
685685
else
686686
cp.set('PFBG', PFBrainMultiplexGraphComparison('ME', cp));
687687
end
688-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_binary(g)
688+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_binary(g)
689689
ba_list = g.get('BAS');
690690
if ~isempty(ba_list)
691691
cp.set('PFBG', PFBrainMultiplexBinaryGraphComparison('ME', cp, 'BA', ba_list{1}));

‎braph2genesis/src/analysis/_MeasureEnsemble.gen.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,23 +187,23 @@
187187
if ~isempty(me.get('MEASURE')) && Measure.is_global(me.get('MEASURE')) && ...
188188
(Measure.is_unilayer(me.get('MEASURE')) || Measure.is_superglobal(me.get('MEASURE')))
189189
g = g_dict.getItem(1);
190-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(me.get('MEASURE'))
190+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(me.get('MEASURE'))
191191
me.set('PFME', PFMeasureEnsembleMultiplexGU('ME', me))
192192
else
193193
me.set('PFME', PFMeasureEnsembleGU('ME', me))
194194
end
195195
elseif ~isempty(me.get('MEASURE')) && Measure.is_nodal(me.get('MEASURE')) && ...
196196
(Measure.is_unilayer(me.get('MEASURE')) || Measure.is_superglobal(me.get('MEASURE')))
197197
g = g_dict.getItem(1);
198-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(me.get('MEASURE'))
198+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(me.get('MEASURE'))
199199
me.set('PFME', PFMeasureEnsembleMultiplexNU('ME', me))
200200
else
201201
me.set('PFME', PFMeasureEnsembleNU('ME', me))
202202
end
203203
elseif ~isempty(me.get('MEASURE')) && Measure.is_binodal(me.get('MEASURE')) && ...
204204
(Measure.is_unilayer(me.get('MEASURE')) || Measure.is_superglobal(me.get('MEASURE')))
205205
g = g_dict.getItem(1);
206-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(me.get('MEASURE'))
206+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(me.get('MEASURE'))
207207
me.set('PFME', PFMeasureEnsembleMultiplexBU('ME', me))
208208
else
209209
me.set('PFME', PFMeasureEnsembleBU('ME', me))
@@ -244,14 +244,14 @@
244244
else
245245
me.set('PFBG', PFBrainMultiGraph('ME', me));
246246
end
247-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_weighted(g) % multiplexWU
247+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_weighted(g) % multiplexWU
248248
ba_list = g.memorize('BAS');
249249
if ~isempty(ba_list)
250250
me.set('PFBG', PFBrainMultiplexGraph('ME', me, 'BA', ba_list{1}));
251251
else
252252
me.set('PFBG', PFBrainMultiplexGraph('ME', me));
253253
end
254-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_binary(g)
254+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_binary(g)
255255
ba_list = g.memorize('BAS');
256256
if ~isempty(ba_list)
257257
me.set('PFBG', PFBrainMultiplexBinaryGraph('ME', me, 'BA', ba_list{1}));

‎braph2genesis/src/gt/_Measure.gen.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,19 @@
151151
if isa(m.getr('PFM'), 'NoValue')
152152
g = m.memorize('G');
153153
if Measure.is_global(m) && (Measure.is_unilayer(m) || Measure.is_superglobal(m))
154-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(m)
154+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(m)
155155
m.set('PFM', PFMeasureMultiplexGU('M', m))
156156
else
157157
m.set('PFM', PFMeasureGU('M', m))
158158
end
159159
elseif Measure.is_nodal(m) && (Measure.is_unilayer(m) || Measure.is_superglobal(m))
160-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(m)
160+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(m)
161161
m.set('PFM', PFMeasureMultiplexNU('M', m))
162162
else
163163
m.set('PFM', PFMeasureNU('M', m))
164164
end
165165
elseif Measure.is_binodal(m) && (Measure.is_unilayer(m) || Measure.is_superglobal(m))
166-
if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(m)
166+
if (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Measure.is_unilayer(m)
167167
m.set('PFM', PFMeasureMultiplexBU('M', m))
168168
else
169169
m.set('PFM', PFMeasureBU('M', m))
@@ -208,14 +208,14 @@
208208
else
209209
m.set('PFBG', PFBrainMultiGraph('ME', m));
210210
end
211-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_weighted(g) % multiplexWU
211+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_weighted(g) % multiplexWU
212212
ba_list = g.memorize('BAS');
213213
if ~isempty(ba_list)
214214
m.set('PFBG', PFBrainMultiplexGraph('ME', m, 'BA', ba_list{1}));
215215
else
216216
m.set('PFBG', PFBrainMultiplexGraph('ME', m));
217217
end
218-
elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_binary(g)
218+
elseif (Graph.is_multiplex(g) || Graph.is_ordered_multiplex(g)) && Graph.is_binary(g)
219219
ba_list = g.memorize('BAS');
220220
if ~isempty(ba_list)
221221
m.set('PFBG', PFBrainMultiplexBinaryGraph('ME', m, 'BA', ba_list{1}));

0 commit comments

Comments
 (0)