Merge branch 'master' into deploy

ML-KULeuven · Jun 14, 2024 · a7775d4 · a7775d4
2 parents 59eb018 + 6b6239e
commit a7775d4
Show file tree

Hide file tree

Showing 11 changed files with 2,288 additions and 4,974 deletions.
diff --git a/examples/wmc-1.py b/examples/wmc-1.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 from pathlib import Path
 import math
-from pysdd.sdd import SddManager, Vtree, WmcManager
+from pysdd.sdd import SddManager, Vtree
 
 
 here = Path(__file__).parent
@@ -15,6 +15,7 @@ def main():
     root = sdd.read_cnf_file(bytes(here / "input" / "simple.cnf"))
     # For DNF functions use `read_dnf_file`
     # If the vtree is not given, you can also use 'from_cnf_file`
+    sdd.auto_gc_and_minimize_off()
 
     # Model Counting
     wmc = root.wmc(log_mode=True)
@@ -41,4 +42,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
diff --git a/notebooks/examples.ipynb b/notebooks/examples.ipynb
diff --git a/pysdd/compiler_c.pxd b/pysdd/compiler_c.pxd
@@ -29,7 +29,7 @@ cdef extern from "compiler.h":
         int post_search             #  post-compilation search
         int verbose                 #  print manager
     ctypedef struct Fnf:
-        long var_count;
+        long long var_count;
         sddapi_c.SddSize litset_count;
     ctypedef Fnf Cnf;
     ctypedef Fnf Dnf;

diff --git a/pysdd/lib/weight_optimization/include/arithmetic_ansi.h b/pysdd/lib/weight_optimization/include/arithmetic_ansi.h