From a2ea857e00f46978fc4eb7f674bece358b6d8247 Mon Sep 17 00:00:00 2001 From: Hamed Date: Thu, 13 Jul 2017 14:55:06 -0700 Subject: [PATCH] changing printfs to model_prints --- src/Backend/constraint.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Backend/constraint.c b/src/Backend/constraint.c index e8ef1db..b1ec593 100644 --- a/src/Backend/constraint.c +++ b/src/Backend/constraint.c @@ -3,7 +3,7 @@ #include #include "inc_solver.h" #include "cnfexpr.h" - +#include "common.h" /* V2 Copyright (c) 2014 Ben Chambers, Eugene Goldberg, Pete Manolios, Vasilis Papavasileiou, Sudarshan Srinivasan, and Daron Vroon. @@ -181,6 +181,7 @@ int comparefunction(const Edge * e1, const Edge * e2) { } Edge constraintAND(CNF * cnf, uint numEdges, Edge * edges) { + ASSERT(numEdges!=0); qsort(edges, numEdges, sizeof(Edge), (int (*)(const void *, const void *)) comparefunction); int initindex=0; while(initindexconstraints, constraint); - printf("****ADDING NEW Constraint*****\n"); + model_print("****ADDING NEW Constraint*****\n"); printCNF(constraint); - printf("\n******************************\n"); + model_print("\n******************************\n"); } Edge constraintNewVar(CNF *cnf) { @@ -699,39 +700,39 @@ CNFExpr* fillArgs(CNF *cnf, Edge e, bool isNeg, Edge * largestEdge) { void printCNF(Edge e) { if (edgeIsVarConst(e)) { Literal l=getEdgeVar(e); - printf ("%d", l); + model_print ("%d", l); return; } bool isNeg=isNegEdge(e); if (edgeIsConst(e)) { if (isNeg) - printf("T"); + model_print("T"); else - printf("F"); + model_print("F"); return; } Node *n=getNodePtrFromEdge(e); if (isNeg) - printf("!"); + model_print("!"); switch(getNodeType(e)) { case NodeType_AND: - printf("and"); + model_print("and"); break; case NodeType_ITE: - printf("ite"); + model_print("ite"); break; case NodeType_IFF: - printf("iff"); + model_print("iff"); break; } - printf("("); + model_print("("); for(uint i=0;inumEdges;i++) { Edge e=n->edges[i]; if (i!=0) - printf(" "); + model_print(" "); printCNF(e); } - printf(")"); + model_print(")"); } CNFExpr * produceConjunction(CNF * cnf, Edge e) { -- 2.34.1