In PropConnected and PropNbCC: modify the part that removes unreachab…

…le nodes to ensure that it only removes nodes that are in the domain to the variables,. This was not the case and caused useless calls to removeNode
chocoteam · Sep 7, 2021 · d0383f9 · d0383f9
1 parent 3604015
commit d0383f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...er/src/main/java/org/chocosolver/solver/constraints/graph/connectivity/PropConnected.java b/...er/src/main/java/org/chocosolver/solver/constraints/graph/connectivity/PropConnected.java
@@ -74,8 +74,10 @@ public void propagate(int evtmask) throws ContradictionException {
             visited.clear();
             int root = g.getMandatoryNodes().iterator().next();
             helper.exploreFrom(root, visited);
-            for (int o = visited.nextClearBit(0); o < n; o = visited.nextClearBit(o + 1)) {
-                g.removeNode(o, this);
+            for (int o : g.getPotentialNodes()) {
+                if (!visited.get(o)) {
+                    g.removeNode(o, this);
+                }
             }
 
             // 2 --- enforce articulation points and bridges that link two mandatory nodes

diff --git a/solver/src/main/java/org/chocosolver/solver/constraints/graph/connectivity/PropNbCC.java b/solver/src/main/java/org/chocosolver/solver/constraints/graph/connectivity/PropNbCC.java
@@ -83,8 +83,10 @@ public void propagate(int evtmask) throws ContradictionException {
 
                 // 1 --- remove unreachable nodes
                 int n = g.getNbMaxNodes();
-                for (int o = visitedMin.nextClearBit(0); o < n; o = visitedMin.nextClearBit(o + 1)) {
-                    g.removeNode(o, this);
+                for (int o : g.getPotentialNodes()) {
+                    if (!visitedMin.get(o)) {
+                        g.removeNode(o, this);
+                    }
                 }
 
                 // 2 --- enforce articulation points and bridges that link two mandatory nodes