Skip to content

Commit fab97f2

Browse files
committed
update gui to work at analysis and comparison for OrdMP
1 parent 21fe5d8 commit fab97f2

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
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_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_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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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) && 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) && 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_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_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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,14 +631,14 @@
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) && 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) && 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_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_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}));

0 commit comments

Comments
 (0)