Edits to merge

diff --git a/src/AST/boolean.cc b/src/AST/boolean.cc
index 9196d07765b84e8db76f6b9582867287adf1f03d..fff3658abb16bc404bd0d40f8c3f9c6db5d593aa 100644 (file)
--- a/src/AST/boolean.cc
+++ b/src/AST/boolean.cc
@@ -110,11 +110,11 @@ void BooleanVar::serialize(Serializer* serializer){
 }
 
 void BooleanVar::print(){
 }
 
 void BooleanVar::print(){

-        model_println("BooleanVar:%lu", (uintptr_t)this);
+       model_print("BooleanVar:%lu\n", (uintptr_t)this);

 }
 
 void BooleanConst::print(){
 }
 
 void BooleanConst::print(){

-        model_println("BooleanConst:%s", istrue?"TRUE" :"FALSE");
+       model_print("BooleanConst:%s\n", istrue?"TRUE" :"FALSE");

 }
 
 void BooleanOrder::serialize(Serializer* serializer){
 }
 
 void BooleanOrder::serialize(Serializer* serializer){


@@ -132,9 +132,9 @@ void BooleanOrder::serialize(Serializer* serializer){
 }
 
 void BooleanOrder::print(){
 }
 
 void BooleanOrder::print(){

-       model_println("{BooleanOrder: First= %lu, Second = %lu on Order:", first, second);
+       model_print("{BooleanOrder: First= %lu, Second = %lu on Order:\n", first, second);

        order->print();
        order->print();

-        model_println("}\n");
+       model_print("}\n");

 }
 
 void BooleanPredicate::serialize(Serializer* serializer){
 }
 
 void BooleanPredicate::serialize(Serializer* serializer){


@@ -164,15 +164,15 @@ void BooleanPredicate::serialize(Serializer* serializer){
 }
 
 void BooleanPredicate::print(){
 }
 
 void BooleanPredicate::print(){

-       model_println("{BooleanPredicate:");
-        predicate->print();
-       model_println("elements:");
-        uint size = inputs.getSize();
+       model_print("{BooleanPredicate:\n");
+       predicate->print();
+       model_print("elements:\n");
+       uint size = inputs.getSize();

        for(uint i=0; i<size; i++){
                Element *input = inputs.get(i);
                input->print();
        }
        for(uint i=0; i<size; i++){
                Element *input = inputs.get(i);
                input->print();
        }

-        model_println("}\n");
+       model_print("}\n");

 }
 
 void BooleanLogic::serialize(Serializer* serializer){
 }
 
 void BooleanLogic::serialize(Serializer* serializer){


@@ -196,16 +196,16 @@ void BooleanLogic::serialize(Serializer* serializer){
 }
 
 void BooleanLogic::print(){
 }
 
 void BooleanLogic::print(){

-       model_println("{BooleanLogic: %s", 
-                op ==SATC_AND? "AND": op == SATC_OR? "OR": op==SATC_NOT? "NOT":
-                op == SATC_XOR? "XOR" : op==SATC_IFF? "IFF" : "IMPLIES");
-        uint size = inputs.getSize();
+       model_print("{BooleanLogic: %s\n", 
+                                                       op ==SATC_AND? "AND": op == SATC_OR? "OR": op==SATC_NOT? "NOT":
+                                                       op == SATC_XOR? "XOR" : op==SATC_IFF? "IFF" : "IMPLIES");
+       uint size = inputs.getSize();

        for(uint i=0; i<size; i++){
                BooleanEdge input = inputs.get(i);
        for(uint i=0; i<size; i++){
                BooleanEdge input = inputs.get(i);

-                if(input.isNegated())
-                        model_print("!");
-                input.getBoolean()->print();
+               if(input.isNegated())
+                       model_print("!");
+               input.getBoolean()->print();

        }
        }

-        model_println("}\n");
+       model_print("}\n");

 }
 
 }
 

diff --git a/src/AST/element.cc b/src/AST/element.cc
index fb5b8222badb2f4064215bfe74202d8c25e02532..205d31fa1bb5ed910d46f6ce5251ca7b9d480141 100644 (file)
--- a/src/AST/element.cc
+++ b/src/AST/element.cc
@@ -78,9 +78,9 @@ void ElementSet::serialize(Serializer* serializer){
 }
 
 void ElementSet::print(){
 }
 
 void ElementSet::print(){

-       model_println("{ElementSet:");
+       model_print("{ElementSet:\n");

        set->print();
        set->print();

-       model_println("}\n");
+       model_print("}\n");

 }
 
 void ElementConst::serialize(Serializer* serializer){
 }
 
 void ElementConst::serialize(Serializer* serializer){


@@ -99,7 +99,7 @@ void ElementConst::serialize(Serializer* serializer){
 }
 
 void ElementConst::print(){
 }
 
 void ElementConst::print(){

-       model_println("{ElementConst: %lu}", value);    
+       model_print("{ElementConst: %lu}\n", value);    

 }
 
 void ElementFunction::serialize(Serializer* serializer){
 }
 
 void ElementFunction::serialize(Serializer* serializer){


@@ -129,13 +129,13 @@ void ElementFunction::serialize(Serializer* serializer){
 }
 
 void ElementFunction::print(){
 }
 
 void ElementFunction::print(){

-        model_println("{ElementFunction:");
+       model_print("{ElementFunction:\n");

        function->print();
        function->print();

-        model_println("Elements:");
+       model_print("Elements:\n");

        uint size = inputs.getSize();
        for(uint i=0; i<size; i++){
                Element *input = inputs.get(i);
                input->print();
        }
        uint size = inputs.getSize();
        for(uint i=0; i<size; i++){
                Element *input = inputs.get(i);
                input->print();
        }

-       model_println("}\n");
+       model_print("}\n");

 }
 }

diff --git a/src/AST/function.cc b/src/AST/function.cc
index 26decd093b1d1354d778427419db991b3407f898..f17fb6202fc753d8fa64b3f4010b65c62e824ce0 100644 (file)
--- a/src/AST/function.cc
+++ b/src/AST/function.cc
@@ -83,10 +83,9 @@ void FunctionTable::serialize(Serializer* serializer){
 }
 
 void FunctionTable::print(){
 }
 
 void FunctionTable::print(){

-       model_println("{FunctionTable:");
-        table->print();
-        model_println("}\n");
-       
+       model_print("{FunctionTable:\n");
+       table->print();
+       model_print("}\n");

 }
 
 void FunctionOperator::serialize(Serializer* serializer){
 }
 
 void FunctionOperator::serialize(Serializer* serializer){


@@ -115,6 +114,6 @@ void FunctionOperator::serialize(Serializer* serializer){
        serializer->mywrite(&overflowbehavior, sizeof(OverFlowBehavior));
 }
 
        serializer->mywrite(&overflowbehavior, sizeof(OverFlowBehavior));
 }
 

-void FunctionOperator::print(){
-       model_println("{FunctionOperator: %s}", op == SATC_ADD? "ADD": "SUB" );
-}
\ No newline at end of file
+void FunctionOperator::print() {
+       model_print("{FunctionOperator: %s}\n", op == SATC_ADD? "ADD": "SUB" );
+}

diff --git a/src/AST/order.cc b/src/AST/order.cc
index 96e7be5f619ca7f28d971027babc5e8d2b191496..a28d6c0b4181ec3bee524691103edb9659b1ef9c 100644 (file)
--- a/src/AST/order.cc
+++ b/src/AST/order.cc
@@ -60,7 +60,7 @@ void Order::serialize(Serializer* serializer){
 }
 
 void Order::print(){
 }
 
 void Order::print(){

-       model_println("{Order on Set:");
-        set->print();
-       model_println("}\n");
+       model_print("{Order on Set:\n");
+       set->print();
+       model_print("}\n");

 }
 }

diff --git a/src/AST/predicate.cc b/src/AST/predicate.cc
index f320a4dd2b8e7162538f67d2be948f29f7404e4e..1e0bb21911cd23d9e491949b72440d2f7580f0f5 100644 (file)
--- a/src/AST/predicate.cc
+++ b/src/AST/predicate.cc
@@ -67,9 +67,9 @@ void PredicateTable::serialize(Serializer* serializer){
 }
 
 void PredicateTable::print(){  
 }
 
 void PredicateTable::print(){  

-       model_println("{PredicateTable:");
-        table->print();
-        model_println("}\n");
+       model_print("{PredicateTable:\n");
+       table->print();
+       model_print("}\n");

 }
 
 void PredicateOperator::serialize(Serializer* serializer){     
 }
 
 void PredicateOperator::serialize(Serializer* serializer){     


@@ -96,7 +96,7 @@ void PredicateOperator::serialize(Serializer* serializer){
 }
 
 void PredicateOperator::print(){       
 }
 
 void PredicateOperator::print(){       

-       model_println("{PredicateOperator: %s }", op ==SATC_EQUALS? "EQUAL": "NOT-EQUAL");
+       model_print("{PredicateOperator: %s }\n", op ==SATC_EQUALS? "EQUAL": "NOT-EQUAL");

 }
 
 
 }
 
 

diff --git a/src/AST/rewriter.cc b/src/AST/rewriter.cc
index c508185f99928cd2eff5d6e67c332510080e15b3..b6908e1f1dc1b7435b21fa637345492ad4f98971 100644 (file)
--- a/src/AST/rewriter.cc
+++ b/src/AST/rewriter.cc
@@ -6,9 +6,6 @@
 void CSolver::replaceBooleanWithTrue(BooleanEdge bexpr) {
        if (constraints.contains(bexpr.negate())) {
                constraints.remove(bexpr.negate());
 void CSolver::replaceBooleanWithTrue(BooleanEdge bexpr) {
        if (constraints.contains(bexpr.negate())) {
                constraints.remove(bexpr.negate());

-#ifdef TRACE_DEBUG
-                model_println("replaceBooleanWithTrue");
-#endif

                setUnSAT();
        }       
        if (constraints.contains(bexpr)) {
                setUnSAT();
        }       
        if (constraints.contains(bexpr)) {

diff --git a/src/AST/set.cc b/src/AST/set.cc
index 25ccd05e67d6d9e480d45346735ea40ef4d1ed6f..8fa9eda18fb3251a394f8bf385f924d52cce74fb 100644 (file)
--- a/src/AST/set.cc
+++ b/src/AST/set.cc
@@ -145,15 +145,15 @@ void Set::serialize(Serializer* serializer){
 
 void Set::print(){
        model_print("{Set:");
 
 void Set::print(){
        model_print("{Set:");

-        if(isRange){
-                model_print("Range: low=%lu, high=%lu}\n\n", low, high);
-        } else {
-                uint size = members->getSize();
-                model_print("Members: ");
-                for(uint i=0; i<size; i++){
-                        uint64_t mem = members->get(i);
-                        model_print("%lu, ", mem);
-                }
-                model_println("}\n");
-        }
+       if(isRange){
+               model_print("Range: low=%lu, high=%lu}\n\n", low, high);
+       } else {
+               uint size = members->getSize();
+               model_print("Members: ");
+               for(uint i=0; i<size; i++){
+                       uint64_t mem = members->get(i);
+                       model_print("%lu, ", mem);
+               }
+               model_print("}\n");
+       }

 }
 }

diff --git a/src/AST/table.cc b/src/AST/table.cc
index f6494f479c17880e8b16d71979d0041d1c60c325..37787671366bc30400d43db9cfee5fa046c8e6c7 100644 (file)
--- a/src/AST/table.cc
+++ b/src/AST/table.cc
@@ -98,16 +98,16 @@ void Table::serialize(Serializer* serializer){
 
 
 void Table::print(){
 
 
 void Table::print(){

-        model_println("{Table:");
+       model_print("{Table:\n");

        SetIteratorTableEntry* iterator = getEntries();
        while(iterator->hasNext()){
                TableEntry* entry = iterator->next();
        SetIteratorTableEntry* iterator = getEntries();
        while(iterator->hasNext()){
                TableEntry* entry = iterator->next();

-                model_print("<");
-                for(uint i=0; i<entry->inputSize; i++){
-                        model_print("%lu, ", entry->inputs[i]);
-                }
-                model_print(" == %lu>", entry->output);
+               model_print("<");
+               for(uint i=0; i<entry->inputSize; i++){
+                       model_print("%lu, ", entry->inputs[i]);
+               }
+               model_print(" == %lu>", entry->output);

        }
        }

-        model_println("}\n");
+       model_print("}\n");

        delete iterator;
 }
        delete iterator;
 }

diff --git a/src/ASTAnalyses/Order/orderanalysis.cc b/src/ASTAnalyses/Order/orderanalysis.cc
index 8bffb4e8f0e7818bed8ea73592ba562381fa19f7..ae3c7525b57f900d97c6d3e1577a7cc28c3ae12f 100644 (file)
--- a/src/ASTAnalyses/Order/orderanalysis.cc
+++ b/src/ASTAnalyses/Order/orderanalysis.cc
@@ -42,15 +42,9 @@ void DFSReverse(OrderGraph *graph, Vector<OrderNode *> *finishNodes) {
 
 void DFSNodeVisit(OrderNode *node, Vector<OrderNode *> *finishNodes, bool isReverse, bool mustvisit, uint sccNum) {
        SetIteratorOrderEdge *iterator = isReverse ? node->inEdges.iterator() : node->outEdges.iterator();
 
 void DFSNodeVisit(OrderNode *node, Vector<OrderNode *> *finishNodes, bool isReverse, bool mustvisit, uint sccNum) {
        SetIteratorOrderEdge *iterator = isReverse ? node->inEdges.iterator() : node->outEdges.iterator();

-#ifdef TRACE_DEBUG
-        model_print("Node:%lu=>", node->id);
-#endif

        while (iterator->hasNext()) {
                OrderEdge *edge = iterator->next();
        while (iterator->hasNext()) {
                OrderEdge *edge = iterator->next();

-#ifdef TRACE_DEBUG
-                model_print("Edge:%lu=>",(uintptr_t) edge);
-#endif
-                if (mustvisit) {
+               if (mustvisit) {

                        if (!edge->mustPos)
                                continue;
                } else
                        if (!edge->mustPos)
                                continue;
                } else


@@ -58,10 +52,7 @@ void DFSNodeVisit(OrderNode *node, Vector<OrderNode *> *finishNodes, bool isReve
                        continue;
 
                OrderNode *child = isReverse ? edge->source : edge->sink;
                        continue;
 
                OrderNode *child = isReverse ? edge->source : edge->sink;

-#ifdef TRACE_DEBUG
-                model_println("NodeChild:%lu", child->id);
-#endif
-                if (child->status == NOTVISITED) {
+               if (child->status == NOTVISITED) {

                        child->status = VISITED;
                        DFSNodeVisit(child, finishNodes, isReverse, mustvisit, sccNum);
                        child->status = FINISHED;
                        child->status = VISITED;
                        DFSNodeVisit(child, finishNodes, isReverse, mustvisit, sccNum);
                        child->status = FINISHED;


@@ -124,10 +115,7 @@ void bypassMustBeTrueNode(CSolver *This, OrderGraph *graph, OrderNode *node) {
                        OrderNode *sinkNode = outEdge->sink;
                        sinkNode->inEdges.remove(outEdge);
                        //Adding new edge to new sink and src nodes ...
                        OrderNode *sinkNode = outEdge->sink;
                        sinkNode->inEdges.remove(outEdge);
                        //Adding new edge to new sink and src nodes ...

-                       if(srcNode == sinkNode){
-#ifdef TRACE_DEBUG
-                                model_println("bypassMustBe 1");
-#endif
+                       if(srcNode == sinkNode) {

                                This->setUnSAT();
                                delete iterout;
                                delete iterin;
                                This->setUnSAT();
                                delete iterout;
                                delete iterin;


@@ -136,12 +124,8 @@ void bypassMustBeTrueNode(CSolver *This, OrderGraph *graph, OrderNode *node) {
                        OrderEdge *newEdge = graph->getOrderEdgeFromOrderGraph(srcNode, sinkNode);
                        newEdge->mustPos = true;
                        newEdge->polPos = true;
                        OrderEdge *newEdge = graph->getOrderEdgeFromOrderGraph(srcNode, sinkNode);
                        newEdge->mustPos = true;
                        newEdge->polPos = true;

-                       if (newEdge->mustNeg){
-#ifdef TRACE_DEBUG
-                                model_println("BypassMustBe 2");
-#endif
+                       if (newEdge->mustNeg)

                                This->setUnSAT();
                                This->setUnSAT();

-                       }

                        srcNode->outEdges.add(newEdge);
                        sinkNode->inEdges.add(newEdge);
                }
                        srcNode->outEdges.add(newEdge);
                        sinkNode->inEdges.add(newEdge);
                }


@@ -282,12 +266,8 @@ void DFSClearContradictions(CSolver *solver, OrderGraph *graph, Vector<OrderNode
                                OrderEdge *newedge = graph->getOrderEdgeFromOrderGraph(srcnode, node);
                                newedge->mustPos = true;
                                newedge->polPos = true;
                                OrderEdge *newedge = graph->getOrderEdgeFromOrderGraph(srcnode, node);
                                newedge->mustPos = true;
                                newedge->polPos = true;

-                               if (newedge->mustNeg){
-#ifdef TRACE_DEBUG
-                                        model_println("DFS clear 1");
-#endif
+                               if (newedge->mustNeg)

                                        solver->setUnSAT();
                                        solver->setUnSAT();

-                                }

                                srcnode->outEdges.add(newedge);
                                node->inEdges.add(newedge);
                        }
                                srcnode->outEdges.add(newedge);
                                node->inEdges.add(newedge);
                        }


@@ -302,12 +282,8 @@ void DFSClearContradictions(CSolver *solver, OrderGraph *graph, Vector<OrderNode
                                if (!edge->mustPos && sources->contains(parent)) {
                                        edge->mustPos = true;
                                        edge->polPos = true;
                                if (!edge->mustPos && sources->contains(parent)) {
                                        edge->mustPos = true;
                                        edge->polPos = true;

-                                       if (edge->mustNeg){
-#ifdef TRACE_DEBUG
-                                                model_println("DFS clear 2");
-#endif
-                                                solver->setUnSAT();
-                                        }
+                                       if (edge->mustNeg)
+                                               solver->setUnSAT();

                                }
                        }
                        delete iterator;
                                }
                        }
                        delete iterator;


@@ -322,11 +298,8 @@ void DFSClearContradictions(CSolver *solver, OrderGraph *graph, Vector<OrderNode
                                        edge->mustNeg = true;
                                        edge->polNeg = true;
                                        if (edge->mustPos){
                                        edge->mustNeg = true;
                                        edge->polNeg = true;
                                        if (edge->mustPos){

-#ifdef TRACE_DEBUG
-                                                model_println("DFS clear 3: NodeFrom:%lu=>edge%lu=>NodeTo:%lu", node->id, (uintptr_t) edge, child->id);
-#endif
-                                                solver->setUnSAT();
-                                        }
+                                               solver->setUnSAT();
+                                       }

                                }
                        }
                        delete iterator;
                                }
                        }
                        delete iterator;


@@ -365,12 +338,8 @@ void localMustAnalysisTotal(CSolver *solver, OrderGraph *graph) {
                        if (invEdge != NULL) {
                                if (!invEdge->mustPos) {
                                        invEdge->polPos = false;
                        if (invEdge != NULL) {
                                if (!invEdge->mustPos) {
                                        invEdge->polPos = false;

-                               } else {
-#ifdef TRACE_DEBUG
-                                        model_println("localMustAnalysis Total");
-#endif
+                               } else

                                        solver->setUnSAT();
                                        solver->setUnSAT();

-                               }

                                invEdge->mustNeg = true;
                                invEdge->polNeg = true;
                        }
                                invEdge->mustNeg = true;
                                invEdge->polNeg = true;
                        }


@@ -391,22 +360,15 @@ void localMustAnalysisPartial(CSolver *solver, OrderGraph *graph) {
                if (edge->mustPos) {
                        if (!edge->mustNeg) {
                                edge->polNeg = false;
                if (edge->mustPos) {
                        if (!edge->mustNeg) {
                                edge->polNeg = false;

-                       } else{
-#ifdef TRACE_DEBUG
-                                model_println("Local must analysis partial");
-#endif
+                       } else {

                                solver->setUnSAT();
                                solver->setUnSAT();

-                        }
+                       }

                        OrderEdge *invEdge = graph->getInverseOrderEdge(edge);
                        if (invEdge != NULL) {
                                if (!invEdge->mustPos)
                                        invEdge->polPos = false;
                        OrderEdge *invEdge = graph->getInverseOrderEdge(edge);
                        if (invEdge != NULL) {
                                if (!invEdge->mustPos)
                                        invEdge->polPos = false;

-                               else{
-#ifdef TRACE_DEBUG
-                                        model_println("Local must analysis partial 2");
-#endif
+                               else

                                        solver->setUnSAT();
                                        solver->setUnSAT();

-                                }

                                invEdge->mustNeg = true;
                                invEdge->polNeg = true;
                        }
                                invEdge->mustNeg = true;
                                invEdge->polNeg = true;
                        }

diff --git a/src/Backend/constraint.cc b/src/Backend/constraint.cc
index f018c6c433a5baa358e2f8812fbd73b6837a8040..7c3a094701d3c12ffa08d5a3fba5c83dd6b3f4d8 100644 (file)
--- a/src/Backend/constraint.cc
+++ b/src/Backend/constraint.cc
@@ -341,11 +341,7 @@ int solveCNF(CNF *cnf) {
        convertPass(cnf, false);
        finishedClauses(cnf->solver);
        long long startSolve = getTimeNano();
        convertPass(cnf, false);
        finishedClauses(cnf->solver);
        long long startSolve = getTimeNano();

-#ifdef TRACE_DEBUG
-        model_println("Backend: Calling the SAT Solver from CSolver ...");
-#endif
-        int result = solve(cnf->solver);
-        model_print("Backend: Result got from SATSolver: %d", result);
+       int result = solve(cnf->solver);

        long long finishTime = getTimeNano();
        cnf->encodeTime = startSolve - startTime;
        cnf->solveTime = finishTime - startSolve;
        long long finishTime = getTimeNano();
        cnf->encodeTime = startSolve - startTime;
        cnf->solveTime = finishTime - startSolve;

diff --git a/src/Backend/satencoder.cc b/src/Backend/satencoder.cc
index 720375db8b1ab5deedcebdfed70bdc5c90691f74..fdeee9ee8816faf0c812a7696bde8e69b6ba95eb 100644 (file)
--- a/src/Backend/satencoder.cc
+++ b/src/Backend/satencoder.cc
@@ -29,7 +29,6 @@ void SATEncoder::encodeAllSATEncoder(CSolver *csolver) {
        SetIteratorBooleanEdge *iterator = csolver->getConstraints();
        while (iterator->hasNext()) {
                BooleanEdge constraint = iterator->next();
        SetIteratorBooleanEdge *iterator = csolver->getConstraints();
        while (iterator->hasNext()) {
                BooleanEdge constraint = iterator->next();

-//                constraint.getBoolean()->print();

                Edge c = encodeConstraintSATEncoder(constraint);
                addConstraintCNF(cnf, c);
        }
                Edge c = encodeConstraintSATEncoder(constraint);
                addConstraintCNF(cnf, c);
        }

diff --git a/src/common.h b/src/common.h
index 58ad1f1acdb2cbacf64c99e7b6576f4d3233134e..a15f7df3e64f0840f561f4ab8bbc801ef1995347 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,20 +18,21 @@
 #include "config.h"
 #include "time.h"
 
 #include "config.h"
 #include "time.h"
 

+/*
+       extern int model_out;
+       extern int model_err;
+       extern int switch_alloc;
+       
+       #define model_dprintf(fd, fmt, ...) do { switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
+       #define model_print(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0)
+       #define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)
+ 
+       #define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
+ 
+       #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
+ */

 
 

-extern int model_out;
-extern int model_err;
-extern int switch_alloc;
-
-#define model_dprintf(fd, fmt, ...) do { switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
-
-#define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
-#define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)
-#define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
-
-
-
-//#define model_print printf
+#define model_print printf

 
 #define NEXTPOW2(x) ((x == 1) ? 1 : (1 << (sizeof(uint) * 8 - __builtin_clz(x - 1))))
 #define NUMBITS(x) ((x == 0) ? 0 : 8 * sizeof(x) - __builtin_clz(x))
 
 #define NEXTPOW2(x) ((x == 1) ? 1 : (1 << (sizeof(uint) * 8 - __builtin_clz(x - 1))))
 #define NUMBITS(x) ((x == 0) ? 0 : 8 * sizeof(x) - __builtin_clz(x))

diff --git a/src/csolver.cc b/src/csolver.cc
index f1c39e0e33229648c39e97bf02460c0e0271c52a..592d1d51baf89e7c8f6b4a3d043ea4b07604be34 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -289,8 +289,7 @@ static int ptrcompares(const void *p1, const void *p2) {
 }
 
 BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint asize) {
 }
 
 BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint asize) {

-  return applyLogicalOperation(op, array, asize);
-  /*  BooleanEdge newarray[asize];
+       BooleanEdge newarray[asize];

        memcpy(newarray, array, asize * sizeof(BooleanEdge));
        for(uint i=0; i < asize; i++) {
                BooleanEdge b=newarray[i];
        memcpy(newarray, array, asize * sizeof(BooleanEdge));
        for(uint i=0; i < asize; i++) {
                BooleanEdge b=newarray[i];


@@ -301,7 +300,7 @@ BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, ui
                        }
                }
        }
                        }
                }
        }

-       return applyLogicalOperation(op, newarray, asize);*/
+       return applyLogicalOperation(op, newarray, asize);

 }
 
 BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) {
 }
 
 BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) {


@@ -338,10 +337,6 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint
                uint newindex = 0;
                for (uint i = 0; i < asize; i++) {
                        BooleanEdge b = array[i];
                uint newindex = 0;
                for (uint i = 0; i < asize; i++) {
                        BooleanEdge b = array[i];

-//                        model_print("And: Argument %u:", i);
-//                        if(b.isNegated())
-//                                model_print("!");
-//                        b->print();

                        if (b->type == LOGICOP) {
                                if (((BooleanLogic *)b.getBoolean())->replaced)
                                        return rewriteLogicalOperation(op, array, asize);
                        if (b->type == LOGICOP) {
                                if (((BooleanLogic *)b.getBoolean())->replaced)
                                        return rewriteLogicalOperation(op, array, asize);


@@ -372,78 +367,53 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint
        }
        case SATC_IMPLIES: {
                //handle by translation
        }
        case SATC_IMPLIES: {
                //handle by translation

-//                model_print("Implies: first:");
-//                if(array[0].isNegated())
-//                        model_print("!");
-//                array[0]->print();
-//                model_print("Implies: second:");
-//                if(array[1].isNegated())
-//                        model_print("!");
-//                array[1]->print();
-//                model_println("##### OK let's get the operation done");

                return applyLogicalOperation(SATC_OR, applyLogicalOperation(SATC_NOT, array[0]), array[1]);
        }
        }
 
        ASSERT(asize != 0);
        Boolean *boolean = new BooleanLogic(this, op, array, asize);
                return applyLogicalOperation(SATC_OR, applyLogicalOperation(SATC_NOT, array[0]), array[1]);
        }
        }
 
        ASSERT(asize != 0);
        Boolean *boolean = new BooleanLogic(this, op, array, asize);

-       /*      Boolean *b = boolMap.get(boolean);
+       Boolean *b = boolMap.get(boolean);

        if (b == NULL) {
                boolean->updateParents();
                boolMap.put(boolean, boolean);
                allBooleans.push(boolean);
                return BooleanEdge(boolean);
        } else {
        if (b == NULL) {
                boolean->updateParents();
                boolMap.put(boolean, boolean);
                allBooleans.push(boolean);
                return BooleanEdge(boolean);
        } else {

-       delete boolean;*/
+               delete boolean;

                return BooleanEdge(boolean);
                return BooleanEdge(boolean);

-               /*      }*/
+       }

 }
 
 BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {
 }
 
 BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {

-#ifdef TRACE_DEBUG
-        model_println("Creating order: From:%lu => To:%lu", first, second);
-#endif
-        if(first == second)
-                return boolFalse;
+       ASSERT(first != second);

        Boolean *constraint = new BooleanOrder(order, first, second);
        allBooleans.push(constraint);
        return BooleanEdge(constraint);
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {
        Boolean *constraint = new BooleanOrder(order, first, second);
        allBooleans.push(constraint);
        return BooleanEdge(constraint);
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {

-#ifdef TRACE_DEBUG
-        model_println("****New Constraint******");
-#endif
-        if(constraint.isNegated())
-                model_print("!");
-        constraint.getBoolean()->print();
+       if(constraint.isNegated())
+               model_print("!");
+       constraint.getBoolean()->print();

        if (isTrue(constraint))
                return;
        if (isTrue(constraint))
                return;

-       else if (isFalse(constraint)){
-                int t=0;
-#ifdef TRACE_DEBUG
-               model_println("Adding constraint which is false :|");
-#endif
-                setUnSAT();
-        }
+       else if (isFalse(constraint)) {
+               int t=0;
+               setUnSAT();
+       }

        else {
                if (constraint->type == LOGICOP) {
                        BooleanLogic *b=(BooleanLogic *) constraint.getBoolean();
                        if (!constraint.isNegated()) {
                                if (b->op==SATC_AND) {
                                        for(uint i=0;i<b->inputs.getSize();i++) {
        else {
                if (constraint->type == LOGICOP) {
                        BooleanLogic *b=(BooleanLogic *) constraint.getBoolean();
                        if (!constraint.isNegated()) {
                                if (b->op==SATC_AND) {
                                        for(uint i=0;i<b->inputs.getSize();i++) {

-#ifdef TRACE_DEBUG
-                                                model_println("In loop");
-#endif

                                                addConstraint(b->inputs.get(i));
                                        }
                                        return;
                                }
                        }
                        if (b->replaced) {
                                                addConstraint(b->inputs.get(i));
                                        }
                                        return;
                                }
                        }
                        if (b->replaced) {

-#ifdef TRACE_DEBUG
-                                model_println("While rewriting");
-#endif

                                addConstraint(doRewrite(constraint));
                                return;
                        }
                                addConstraint(doRewrite(constraint));
                                return;
                        }


@@ -451,12 +421,9 @@ void CSolver::addConstraint(BooleanEdge constraint) {
                constraints.add(constraint);
                Boolean *ptr=constraint.getBoolean();
                
                constraints.add(constraint);
                Boolean *ptr=constraint.getBoolean();
                

-               if (ptr->boolVal == BV_UNSAT){
-#ifdef TRACE_DEBUG
-                       model_println("BooleanValue is Set to UnSAT");
-#endif
-                        setUnSAT();
-                }
+               if (ptr->boolVal == BV_UNSAT) {
+                       setUnSAT();
+               }

                
                replaceBooleanWithTrueNoRemove(constraint);
                constraint->parents.clear();
                
                replaceBooleanWithTrueNoRemove(constraint);
                constraint->parents.clear();


@@ -480,24 +447,24 @@ int CSolver::solve() {
        long long startTime = getTimeNano();
        computePolarities(this);
 
        long long startTime = getTimeNano();
        computePolarities(this);
 

-//     Preprocess pp(this);
-//     pp.doTransform();
+       Preprocess pp(this);
+       pp.doTransform();

        
        

-//     DecomposeOrderTransform dot(this);
-//     dot.doTransform();
+       DecomposeOrderTransform dot(this);
+       dot.doTransform();

 
 

-//     IntegerEncodingTransform iet(this);
-//     iet.doTransform();
+       IntegerEncodingTransform iet(this);
+       iet.doTransform();

 
 

-//     EncodingGraph eg(this);
-//     eg.buildGraph();
-//     eg.encode();
+       EncodingGraph eg(this);
+       eg.buildGraph();
+       eg.encode();

        
        naiveEncodingDecision(this);
        satEncoder->encodeAllSATEncoder(this);
        
        naiveEncodingDecision(this);
        satEncoder->encodeAllSATEncoder(this);

-        model_println("Is problem UNSAT after encoding: %d", unsat);
+        model_print("Is problem UNSAT after encoding: %d\n", unsat);

        int result = unsat ? IS_UNSAT : satEncoder->solve();
        int result = unsat ? IS_UNSAT : satEncoder->solve();

-        model_println("Result Computed in CSolver: %d", result);
+        model_print("Result Computed in CSolver: %d\n", result);

        long long finishTime = getTimeNano();
        elapsedTime = finishTime - startTime;
        if (deleteTuner) {
        long long finishTime = getTimeNano();
        elapsedTime = finishTime - startTime;
        if (deleteTuner) {

diff --git a/src/csolver.h b/src/csolver.h
index b826258d2aea3b0a7634fb89d2831fed4c4e1b73..41c46277804d85199054548450b7a12db297b306 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -131,7 +131,7 @@ public:
        bool isTrue(BooleanEdge b);
        bool isFalse(BooleanEdge b);
 
        bool isTrue(BooleanEdge b);
        bool isFalse(BooleanEdge b);
 

-       void setUnSAT() { model_println("Setting UNSAT %%%%%%"); unsat = true; }
+       void setUnSAT() { model_print("Setting UNSAT %%%%%%\n"); unsat = true; }

 
        bool isUnSAT() { return unsat; }
 
 
        bool isUnSAT() { return unsat; }
 

diff --git a/src/mymemory.h b/src/mymemory.h
index e0a60bd13294b871199b826e88c0ea13261c1b3d..7c63aa11c10edb99f259ab9a11fffcae8df89794 100644 (file)
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -26,7 +26,7 @@
    void * ourrealloc(void *ptr, size_t size);
 */
 
    void * ourrealloc(void *ptr, size_t size);
 */
 

-#if 1
+#if 0

 void * model_malloc(size_t size);
 void model_free(void *ptr);
 void * model_calloc(size_t count, size_t size);
 void * model_malloc(size_t size);
 void model_free(void *ptr);
 void * model_calloc(size_t count, size_t size);