Fix format specifiers (#42)

* Fix format specifiers

* Change labs to llabs

Author: rmanhaeve

pysdd/lib/libsdd-2.0/include/macros.h

@@ -65,7 +65,7 @@
 //recovering fields of nodes
 #define ELEMENTS_OF(N) (N)->alpha.elements
 #define LITERAL_OF(N) (N)->alpha.literal
-#define VAR_OF(N) labs((N)->alpha.literal)
+#define VAR_OF(N) llabs((N)->alpha.literal)
 
 //checking whether an sdd node is live
 //terminal sdds are always live

pysdd/lib/libsdd-2.0/include/sdd.h

@@ -34,13 +34,13 @@ typedef double SddWmc; // weighted model count
 typedef long long SddLiteral; //literals of clauses
 
 //control strings
-#define PRIsS "lli"
-#define PRInsS "u"
-#define PRIrcS "u"
-#define PRImcS "llu"
-#define PRIwmcS "f"
-#define PRIlitS "ld"
- 
+#define PRIsS "zu" // SddSize
+#define PRInsS "zu" // SddNodeSize
+#define PRIrcS "zu" // SddRefCount
+#define PRImcS "llu" //SddModelCount
+#define PRIwmcS "f" // SddWmc
+#define PRIlitS "lli" //SddLiteral
+
 /****************************************************************************************
  * Enumerated Types
  ****************************************************************************************/

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/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/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/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=\"%"PRIsS"\",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/lib/sdd-2.0/include/sddapi.h

@@ -31,11 +31,12 @@ typedef long long SddLiteral; //literals of clauses
 typedef char SddNodeType; //holds one of two values defined next
 
 //control strings
-#define PRIsS "lli"
-#define PRInsS "u"
-#define PRIrcS "u"
-#define PRImcS "llu"
-#define PRIlitS "ld"
+#define PRIsS "zu" // SddSize
+#define PRInsS "zu" // SddNodeSize
+#define PRIrcS "zu" // SddRefCount
+#define PRImcS "llu" //SddModelCount
+#define PRIwmcS "f" // SddWmc
+#define PRIlitS "lli" //SddLiteral
 
 typedef SddSize SddID;