update measure / measureensemble

Author: annacanal

braph2genesis/src/analysis/_MeasureEnsemble.gen.m

@@ -187,23 +187,23 @@
         if ~isempty(me.get('MEASURE')) && Measure.is_global(me.get('MEASURE')) && ...
                 (Measure.is_unilayer(me.get('MEASURE')) || Measure.is_superglobal(me.get('MEASURE')))
             g = g_dict.getItem(1);
-            if Graph.is_multiplex(g) && Measure.is_unilayer(me.get('MEASURE')) 
+            if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(me.get('MEASURE')) 
                 me.set('PFME', PFMeasureEnsembleMultiplexGU('ME', me))
             else
                 me.set('PFME', PFMeasureEnsembleGU('ME', me))
             end
         elseif ~isempty(me.get('MEASURE')) && Measure.is_nodal(me.get('MEASURE')) && ...
                 (Measure.is_unilayer(me.get('MEASURE')) || Measure.is_superglobal(me.get('MEASURE')))
             g = g_dict.getItem(1);
-            if Graph.is_multiplex(g) && Measure.is_unilayer(me.get('MEASURE'))
+            if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(me.get('MEASURE'))
                 me.set('PFME', PFMeasureEnsembleMultiplexNU('ME', me))
             else
                 me.set('PFME', PFMeasureEnsembleNU('ME', me))
             end
         elseif ~isempty(me.get('MEASURE')) && Measure.is_binodal(me.get('MEASURE')) && ...
                 (Measure.is_unilayer(me.get('MEASURE')) || Measure.is_superglobal(me.get('MEASURE')))
             g = g_dict.getItem(1);
-            if Graph.is_multiplex(g) && Measure.is_unilayer(me.get('MEASURE'))
+            if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(me.get('MEASURE'))
                 me.set('PFME', PFMeasureEnsembleMultiplexBU('ME', me))
             else
                 me.set('PFME', PFMeasureEnsembleBU('ME', me))
@@ -244,14 +244,14 @@
                 else
                     me.set('PFBG', PFBrainMultiGraph('ME', me));
                 end
-            elseif Graph.is_multiplex(g) && Graph.is_weighted(g) % multiplexWU
+            elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_weighted(g) % multiplexWU
                 ba_list = g.memorize('BAS');
                 if ~isempty(ba_list)
                     me.set('PFBG', PFBrainMultiplexGraph('ME', me, 'BA', ba_list{1}));
                 else
                     me.set('PFBG', PFBrainMultiplexGraph('ME', me));
                 end
-            elseif Graph.is_multiplex(g) && Graph.is_binary(g)
+            elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_binary(g)
                 ba_list = g.memorize('BAS');
                 if ~isempty(ba_list)
                     me.set('PFBG', PFBrainMultiplexBinaryGraph('ME', me, 'BA', ba_list{1}));

braph2genesis/src/gt/_Measure.gen.m

@@ -151,19 +151,19 @@
     if isa(m.getr('PFM'), 'NoValue')
         g = m.memorize('G');
         if Measure.is_global(m) && (Measure.is_unilayer(m) || Measure.is_superglobal(m))
-            if Graph.is_multiplex(g) && Measure.is_unilayer(m)
+            if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(m)
                 m.set('PFM', PFMeasureMultiplexGU('M', m))
             else
                 m.set('PFM', PFMeasureGU('M', m))
             end  
         elseif Measure.is_nodal(m) && (Measure.is_unilayer(m) || Measure.is_superglobal(m))
-            if Graph.is_multiplex(g) && Measure.is_unilayer(m)
+            if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(m)
                 m.set('PFM', PFMeasureMultiplexNU('M', m))
             else
                 m.set('PFM', PFMeasureNU('M', m))
             end  
         elseif Measure.is_binodal(m) && (Measure.is_unilayer(m) || Measure.is_superglobal(m))
-            if Graph.is_multiplex(g) && Measure.is_unilayer(m)
+            if Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Measure.is_unilayer(m)
                 m.set('PFM', PFMeasureMultiplexBU('M', m))
             else
                 m.set('PFM', PFMeasureBU('M', m))
@@ -208,14 +208,14 @@
                 else
                     m.set('PFBG', PFBrainMultiGraph('ME', m));
                 end
-            elseif Graph.is_multiplex(g) && Graph.is_weighted(g) % multiplexWU
+            elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_weighted(g) % multiplexWU
                 ba_list = g.memorize('BAS');
                 if ~isempty(ba_list)
                     m.set('PFBG', PFBrainMultiplexGraph('ME', m, 'BA', ba_list{1}));
                 else
                     m.set('PFBG', PFBrainMultiplexGraph('ME', m));
                 end
-            elseif Graph.is_multiplex(g) && Graph.is_binary(g)
+            elseif Graph.is_multiplex(g) && Graph.is_ordered_multiplex(g) && Graph.is_binary(g)
                 ba_list = g.memorize('BAS');
                 if ~isempty(ba_list)
                     m.set('PFBG', PFBrainMultiplexBinaryGraph('ME', m, 'BA', ba_list{1}));