Fix a bug when calling setComp(data, v, -1)

takemaru · Oct 4, 2024 · 9921ce0 · 9921ce0
1 parent 47bd0ac
commit 9921ce0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/graphillion/degree_distribution/DegreeDistributionSpec.h b/src/graphillion/degree_distribution/DegreeDistributionSpec.h
@@ -59,6 +59,12 @@ class DegreeDistributionSpec
       static_cast<uchar>(fm_.vertexToPos(c));
   }
 
+  void clearComp(DSData* data, int v) const {
+    assert(is_connected_);
+    data[fm_.vertexToPos(v) * 2 + 1] =
+      static_cast<uchar>(-1);
+  }
+
   void incrementFixedDeg(DSData* data, int d) const {
     ++data[fixedDegStart_ + d];
   }
@@ -285,7 +291,7 @@ class DegreeDistributionSpec
         }
         // Since comp of v are never used until the end,
         // we erase the value.
-        setComp(data, v, -1);
+        clearComp(data, v);
       }
       // Since deg of v are never used until the end,
       // we erase the value.

diff --git a/src/graphillion/regular/RegularGraphs.cc b/src/graphillion/regular/RegularGraphs.cc
@@ -62,6 +62,11 @@ class RegularSpec
       static_cast<uchar>(fm_.vertexToPos(c));
   }
 
+  void clearComp(RData* data, int v) const {
+    assert(is_connected_);
+    data[fm_.vertexToPos(v) * 2 + 1] = static_cast<uchar>(-1);
+  }
+
   int getFixedDeg(RData* data) const {
     return data[fixedDegStart_];
   }
@@ -244,7 +249,7 @@ class RegularSpec
         }
         // Since comp of v are never used until the end,
         // we erase the value.
-        setComp(data, v, -1);
+        clearComp(data, v);
       }
       // Since deg of v are never used until the end,
       // we erase the value.