Merge pull request #4356 from romainbrenguier/feature/bdd-error

romainbrenguier · web-flow · commit 205ec3613cbe · 2019-03-11T09:03:28.000Z
Correct type of bdd_cuddt::indext
diff --git a/src/solvers/bdd/bdd_cudd.h b/src/solvers/bdd/bdd_cudd.h
@@ -17,6 +17,8 @@ Author: Romain Brenguier, romain.brenguier@diffblue.com
 
 #include <cplusplus/cuddObj.hh>
 
+#include <util/narrow.h>
+
 class bdd_managert;
 class bddt;
 class bdd_nodet;
@@ -36,7 +38,7 @@ class bdd_nodet
   }
 
   /// Type of indexes of Boolean variables
-  using indext = int;
+  using indext = unsigned int;
 
   /// Label on the node, corresponds to the index of a Boolean variable
   indext index() const
@@ -152,7 +154,7 @@ class bdd_managert
 
   bddt bdd_variable(bdd_nodet::indext index)
   {
-    return bddt(cudd.bddVar(index));
+    return bddt(cudd.bddVar(narrow_cast<int>(index)));
   }
 
   bdd_nodet bdd_node(const bddt &bdd) const

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ Author: Romain Brenguier, [email protected]`
`17`	`17`
`18`	`18`	`#include <cplusplus/cuddObj.hh>`
`19`	`19`
	`20`	`+#include <util/narrow.h>`
	`21`	`+`
`20`	`22`	`class bdd_managert;`
`21`	`23`	`class bddt;`
`22`	`24`	`class bdd_nodet;`
`@@ -36,7 +38,7 @@ class bdd_nodet`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`/// Type of indexes of Boolean variables`
`39`		`- using indext = int;`
	`41`	`+ using indext = unsigned int;`
`40`	`42`
`41`	`43`	`/// Label on the node, corresponds to the index of a Boolean variable`
`42`	`44`	`indext index() const`
`@@ -152,7 +154,7 @@ class bdd_managert`
`152`	`154`
`153`	`155`	`bddt bdd_variable(bdd_nodet::indext index)`
`154`	`156`	`{`
`155`		`- return bddt(cudd.bddVar(index));`
	`157`	`+ return bddt(cudd.bddVar(narrow_cast<int>(index)));`
`156`	`158`	`}`
`157`	`159`
`158`	`160`	`bdd_nodet bdd_node(const bddt &bdd) const`