PySDD 1.0.2__tar.gz → 1.0.5__tar.gz

{pysdd-1.0.2 → pysdd-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PySDD
-Version: 1.0.2
+Version: 1.0.5
 Summary: Sentential Decision Diagrams
 Author: Arthur Choi
 Author-email: Wannes Meert <wannes.meert@cs.kuleuven.be>, Robin Manhaeve <robin.manhaeve@kuleuven.be>

{pysdd-1.0.2 → pysdd-1.0.5}/PySDD.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PySDD
-Version: 1.0.2
+Version: 1.0.5
 Summary: Sentential Decision Diagrams
 Author: Arthur Choi
 Author-email: Wannes Meert <wannes.meert@cs.kuleuven.be>, Robin Manhaeve <robin.manhaeve@kuleuven.be>

{pysdd-1.0.2 → pysdd-1.0.5}/pyproject.toml

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

{pysdd-1.0.2 → pysdd-1.0.5}/pysdd/lib/libsdd-2.0/src/sdds/io.c

@@ -284,9 +284,9 @@ void print_sdd_node_file(FILE* file, SddNode* node) {
 
   if(node->type==TRUE) fprintf(file,"T %"PRIsS"\n",node->index);
   else if(node->type==FALSE) fprintf(file,"F %"PRIsS"\n",node->index);
-  else if(node->type==LITERAL) fprintf(file,"L %"PRIsS" %"PRIsS" %"PRIlitS"\n",node->index,vtree->position,LITERAL_OF(node));
+  else if(node->type==LITERAL) fprintf(file,"L %"PRIsS" %"PRIlitS" %"PRIlitS"\n",node->index,vtree->position,LITERAL_OF(node));
   else {//decomposition 
-    fprintf(file,"D %"PRIsS" %"PRIsS" %"PRIsS"",node->index,vtree->position,node->size);
+    fprintf(file,"D %"PRIsS" %"PRIlitS" %"PRIsS"",node->index,vtree->position,node->size);
 	FOR_each_prime_sub_of_node(prime,sub,node,fprintf(file," %"PRIsS" %"PRIsS"",prime->index,sub->index));
     fprintf(file,"\n");     
   }

{pysdd-1.0.2 → pysdd-1.0.5}/pysdd/lib/libsdd-2.0/src/vtree_search/search.c

@@ -56,7 +56,7 @@ static inline
 SddSize balance(Vtree* vtree, SddManager* manager) {
   SddLiteral left_count  = sdd_vtree_var_count(sdd_vtree_left(vtree));
   SddLiteral right_count = sdd_vtree_var_count(sdd_vtree_right(vtree));
-  return labs(left_count - right_count);
+  return llabs(left_count - right_count);
 }
 
 /****************************************************************************************

{pysdd-1.0.2 → pysdd-1.0.5}/pysdd/lib/libsdd-2.0/src/vtrees/compare.c

@@ -52,9 +52,9 @@ Vtree* sdd_vtree_lca(Vtree* vtree1, Vtree* vtree2, Vtree* root) {
 Vtree* sdd_manager_lca_of_literals(int count, SddLiteral* literals, SddManager* manager) {
   assert(count>0);
   Vtree* root  = manager->vtree;
-  Vtree* vtree = sdd_manager_vtree_of_var(labs(literals[0]),manager); 
+  Vtree* vtree = sdd_manager_vtree_of_var(llabs(literals[0]),manager); 
   for(int i=1; i<count; i++) {
-    Vtree* leaf = sdd_manager_vtree_of_var(labs(literals[i]),manager); 
+    Vtree* leaf = sdd_manager_vtree_of_var(llabs(literals[i]),manager); 
     vtree       = sdd_vtree_lca(vtree,leaf,root);
   }
   return vtree;

{pysdd-1.0.2 → pysdd-1.0.5}/pysdd/lib/libsdd-2.0/src/vtrees/io.c

@@ -38,12 +38,12 @@ Vtree* sdd_vtree_read(const char* filename) {
 //prints a vtree node
 void print_vtree_node(FILE* file, const Vtree* vnode) {
   if(LEAF(vnode)) {
-    fprintf(file,"L %"PRIsS" %"PRIlitS"",vnode->position,vnode->var);
+    fprintf(file,"L %"PRIlitS" %"PRIlitS"",vnode->position,vnode->var);
   } 
   else { // internal node
     print_vtree_node(file,vnode->left);
     print_vtree_node(file,vnode->right);
-    fprintf(file,"I %"PRIsS" %"PRIsS" %"PRIsS"",vnode->position,vnode->left->position,vnode->right->position);
+    fprintf(file,"I %"PRIlitS" %"PRIlitS" %"PRIlitS"",vnode->position,vnode->left->position,vnode->right->position);
   }
   fprintf(file,"\n");
 }
@@ -66,7 +66,7 @@ void print_vtree_header(FILE* file) {
 void print_vtree(FILE* file, const Vtree* vtree) {
   SddLiteral count = 2*(vtree->var_count) -1;
   print_vtree_header(file);
-  fprintf(file,"vtree %"PRIsS"\n",count);
+  fprintf(file,"vtree %"PRIlitS"\n",count);
   print_vtree_node(file,vtree);
 }
 
@@ -91,13 +91,13 @@ void print_vtree_nodes_as_dot(FILE* file, const Vtree* vtree) {
   if(LEAF(vtree)) {
     SddLiteral var = vtree->var;
     char* var_string = literal_to_label(var);
-    fprintf(file,"\nn%"PRIsS" [label=\"%s\",fontname=\"Times-Italic\","
+    fprintf(file,"\nn%"PRIlitS" [label=\"%s\",fontname=\"Times-Italic\","
             "fontsize=14,shape=\"%s\",fixedsize=true,width=.25,height=.25"
             "]; ",position,var_string,shape);
     free(var_string);
   } 
   else {
-    fprintf(file,"\nn%"PRIsS" [label=\"%"PRIsS"\",fontname=\"Times\","
+    fprintf(file,"\nn%"PRIlitS" [label=\"%"PRIlitS"\",fontname=\"Times\","
            "shape=\"%s\",fontsize=12,fixedsize=true,width=.2,height=.18]; ",
            position,position,shape);
     print_vtree_nodes_as_dot(file,vtree->left);
@@ -110,14 +110,14 @@ void print_vtree_edges_as_dot(FILE* file, const Vtree* vtree, const Vtree* paren
   if(LEAF(vtree)) {
     if(parent != NULL) {
       SddLiteral parent_position = vtree->parent->position;
-      fprintf(file,"\nn%"PRIsS"->n%"PRIsS" [headclip=true,arrowhead=none,headlabel=\"%"PRIsS"\","
+      fprintf(file,"\nn%"PRIlitS"->n%"PRIlitS" [headclip=true,arrowhead=none,headlabel=\"%"PRIlitS"\","
               "labelfontname=\"Times\",labelfontsize=10];",parent_position,position,position);
     }
   } 
   else { //internal node
     if(parent != NULL) {
       SddLiteral parent_position = vtree->parent->position;
-      fprintf(file,"\nn%"PRIsS"->n%"PRIsS" [arrowhead=none];",parent_position,position);
+      fprintf(file,"\nn%"PRIlitS"->n%"PRIlitS" [arrowhead=none];",parent_position,position);
     }
     print_vtree_edges_as_dot(file,vtree->left,vtree);
     print_vtree_edges_as_dot(file,vtree->right,vtree); // right first?

{pysdd-1.0.2 → pysdd-1.0.5}/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()