PySDD 1.0.4__tar.gz → 1.0.6__tar.gz

{pysdd-1.0.4 → pysdd-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PySDD
-Version: 1.0.4
+Version: 1.0.6
 Summary: Sentential Decision Diagrams
 Author: Arthur Choi
 Author-email: Wannes Meert <wannes.meert@cs.kuleuven.be>, Robin Manhaeve <robin.manhaeve@kuleuven.be>
@@ -33,6 +33,7 @@ Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Provides-Extra: notebooks
 Requires-Dist: numpy; extra == "notebooks"
+Dynamic: license-file
 
 =====
 PySDD

{pysdd-1.0.4 → pysdd-1.0.6}/PySDD.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PySDD
-Version: 1.0.4
+Version: 1.0.6
 Summary: Sentential Decision Diagrams
 Author: Arthur Choi
 Author-email: Wannes Meert <wannes.meert@cs.kuleuven.be>, Robin Manhaeve <robin.manhaeve@kuleuven.be>
@@ -33,6 +33,7 @@ Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Provides-Extra: notebooks
 Requires-Dist: numpy; extra == "notebooks"
+Dynamic: license-file
 
 =====
 PySDD

{pysdd-1.0.4 → pysdd-1.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PySDD"
-version = "1.0.4"
+version = "1.0.6"
 description = "Sentential Decision Diagrams"
 authors = [
     { name = "Wannes Meert", email = "wannes.meert@cs.kuleuven.be" },
@@ -116,6 +116,7 @@ include-dirs = [
 environment = {CFLAGS="-O3 -DNDEBUG" }
 test-requires = "pytest"
 test-command = "pytest {project}/tests"
+skip = "pp*"
 
 [tool.cibuildwheel.windows]
 environment = {CL = "/O2 /DNDEBUG"}

{pysdd-1.0.4 → pysdd-1.0.6}/pysdd/sdd.pyx

@@ -53,6 +53,7 @@ cdef class SddNode:
         wrapper._sddnode = node
         if wrapper.garbage_collected():
             return None
+        wrapper.ref()
         if sddapi_c.sdd_node_is_literal(node):
             wrapper._name = sddapi_c.sdd_node_literal(node)
         elif sddapi_c.sdd_node_is_true(node):
@@ -63,6 +64,9 @@ cdef class SddNode:
             wrapper._name = "Decision"
         return wrapper
 
+    def __del__(self):
+        # clean up _sddnode ref
+        self.deref()
 
     @property
     def id(self):
@@ -306,7 +310,6 @@ cdef class SddNode:
 
         Returns the node.
         """
-        # TODO: Should we ref every Python SDDNode object on creation and deref on Python GC?
         sddapi_c.sdd_ref(self._sddnode, self._manager._sddmanager)
 
     def deref(self):

{pysdd-1.0.4 → pysdd-1.0.6}/tests/test_minimize.py

@@ -74,6 +74,22 @@ def test_min2():
         # with (directory / "sdd2_before_b.gv").open("w") as out:
         #     print(sdd_to_dot(sdd), file=out)
 
+def test_refcount():
+    sdd = SddManager(var_count=2)
+    a, b = sdd.vars
+    f = a | b
+    assert f.ref_count() == 1
+    f.ref()
+    assert f.ref_count() == 2
+    f.deref()
+    assert f.ref_count() == 1
+    # equivalent formula will
+    # ref same formula object
+    f2 = b | a
+    assert f2.ref_count() == 2
+    assert f.ref_count() == 2
+    del f2
+    assert f.ref_count() == 1
 
 if __name__ == "__main__":
     logger.setLevel(logging.DEBUG)

{pysdd-1.0.4 → pysdd-1.0.6}/tests/test_nnf.py

@@ -1,12 +1,10 @@
 from pysdd.util import nnf_file_wmc, sdd_file_wmc, psdd_file_wmc
-from pysdd.sdd import Fnf, Vtree, SddManager
 from pysdd import cli
 import sys
 import os
 import math
 import logging
 from pathlib import Path
-import filecmp
 
 
 logger = logging.getLogger("pysdd")
@@ -14,6 +12,13 @@ directory = None
 counter = 0
 here = Path(__file__).parent
 
+def file_contents_equal(path1, path2):
+    with open(path1) as f1:
+        lines1 = [l.strip() for l in f1.readlines()]
+    with open(path2) as f2:
+        lines2 = [l.strip() for l in f2.readlines()]
+    return lines1 == lines2
+
 
 def test_nnf1():
     weights = {
@@ -33,16 +38,6 @@ def test_nnf2():
     assert wmc == 0.75
 
 
-# def test_dnf1():
-#     dnf_filename = str(here / "rsrc" / "test.cnf.nnf")
-#     fnf = Fnf.from_dnf_file(bytes(dnf_filename, encoding='utf8'))
-#     # weights = read_weights(dnf_filename)
-#     vtree = Vtree(var_count=fnf.var_count)
-#     manager = SddManager.from_vtree(vtree)
-#     node = manager.fnf_to_sdd(fnf)
-#     print(node)
-
-
 def test_sdd1():
     weights = {
         +3: 0.5, +2: 0.5, +1: 1,
@@ -70,13 +65,12 @@ def test_psdd1():
 
 
 def test_dimacs1():
-    """This test fails on Windows because of a mismatch between 64b and 32b data types."""
     fn_dimacs = here / "rsrc" / "dimacs1.txt"
     fn_vtree = here / "rsrc" / "dimacs1.vtree"
     fn_vtree_sol = here / "rsrc" / "dimacs1_solution.vtree"
     fn_sdd = here / "rsrc" / "dimacs1.sdd"
     cli.main(["-c", str(fn_dimacs), "-W", str(fn_vtree), "-R", str(fn_sdd)])
-    assert filecmp.cmp(fn_vtree, fn_vtree_sol)
+    assert file_contents_equal(fn_vtree, fn_vtree_sol)
     with fn_vtree.open("r") as fp:
         print(fp.read())
 
@@ -87,8 +81,9 @@ if __name__ == "__main__":
     logger.addHandler(sh)
     directory = Path(os.environ.get('TESTDIR', Path(__file__).parent))
     print(f"Saving files to {directory}")
-    # test_nnf1()
-    # test_sdd2()
-    # test_psdd1()
-    # test_dnf1()
+    test_nnf1()
+    test_nnf2()
+    test_sdd1()
+    test_sdd2()
+    test_psdd1()
     test_dimacs1()