fix mcmgraph

Author: MarcG-TUE

include/maxplus/base/analysis/mcm/mcmgraph.h

@@ -193,10 +193,9 @@ class MCMgraph {
     // Remove an edge from the MCMgraph.
     // Note: containers of edges are lists, so remove is expensive!
     void removeEdge(MCMedge &e) {
-        this->edges.remove(e);
         e.src->out.remove(&e);
         e.dst->in.remove(&e);
-    }
+        this->edges.remove(e);    }
 
     void relabelNodeIds(std::map<CId, CId> *nodeIdMap = nullptr);
 

src/base/analysis/mcm/mcmgraph.cc

@@ -599,79 +599,52 @@ void stronglyConnectedMCMgraph(MCMgraph &g,
  * edges are assigned a new id starting in the range [0,nrNodes()).
  */
 void relabelMCMgraph(MCMgraph &g) {
-    uint nodeId = 0;
-    uint edgeId = 0;
 
-    // Relabel nodes
+    std::set<MCMedge*> edgesToRemove;
+    std::set<MCMnode*> nodesToRemove;
+    
+    // find nodes to remove
     for (auto &n : g.getNodes()) {
-        if (n.visible) {
-            n.id = nodeId;
-            nodeId++;
+        if (! n.visible) {
+            nodesToRemove.insert(&n);
         }
     }
 
-    // Relabel edges
+    // find edges to remove
     for (auto &e : g.getEdges()) {
-        if (e.visible) {
-            e.id = edgeId;
-            edgeId++;
+        if (! e.visible) {
+            edgesToRemove.insert(&e);
         }
     }
 
-    // Remove edges from nodes
-    for (auto &n : g.getNodes()) {
-        if (!n.visible) {
-            continue;
-        }
-
-        for (auto iterE = n.in.begin(); iterE != n.in.end();) {
-            auto iterEN = iterE;
-
-            // Next iterator
-            iterE++;
-
-            // Erase current iterator?
-            if (!(*iterEN)->visible) {
-                n.in.erase(iterEN);
-            }
-        }
-
-        for (auto iterE = n.out.begin(); iterE != n.out.end();) {
-            auto iterEN = iterE;
-
-            // Next iterator
-            iterE++;
-
-            // Erase current iterator?
-            if (!(*iterEN)->visible) {
-                n.out.erase(iterEN);
-            }
-        }
+    // remove edges
+    for (auto *e : edgesToRemove) {
+        g.removeEdge(*e);
     }
 
-    // Remove nodes from graph
-    for (auto iter = g.getNodes().begin(); iter != g.getNodes().end();) {
-        auto iterN = iter;
-
-        // Next iterator
-        iter++;
+    // remove nodes
+    for (auto *n : nodesToRemove) {
+        g.removeNode(*n);
+    }
 
-        if (!(*iterN).visible) {
-            g.removeNode(*iterN);
+    // Relabel nodes
+    uint nodeId = 0;
+    for (auto &n : g.getNodes()) {
+        if (n.visible) {
+            n.id = nodeId;
+            nodeId++;
         }
     }
 
-    // Remove edges from graph
-    for (auto iter = g.getEdges().begin(); iter != g.getEdges().end();) {
-        auto iterE = iter;
-
-        // Next iterator
-        iter++;
-
-        if (!(*iterE).visible) {
-            g.removeEdge(*iterE);
+    // Relabel edges
+    uint edgeId = 0;
+    for (auto &e : g.getEdges()) {
+        if (e.visible) {
+            e.id = edgeId;
+            edgeId++;
         }
     }
+
 }
 
 // Prune the edges in the MCMgraph to maintain only Pareto maximal combinations