Preprocessing check

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 2c15b62fd87e6322fb92d60f0fad6ca7d5e19047..45163be66ded9b2b608b518a83564cef2f328496 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -26,6 +26,7 @@
 #include "orderedge.h"
 #include "orderanalysis.h"
 #include "elementopt.h"
+#include "varorderingopt.h"
 #include <time.h>
 #include <stdarg.h>
 
@@ -33,6 +34,7 @@ CSolver::CSolver() :
        boolTrue(BooleanEdge(new BooleanConst(true))),
        boolFalse(boolTrue.negate()),
        unsat(false),
+       booleanVarUsed(false),
        tuner(NULL),
        elapsedTime(0),
        satsolverTimeout(NOTIMEOUT)
@@ -135,6 +137,7 @@ void CSolver::resetSolver() {
        boolTrue = BooleanEdge(new BooleanConst(true));
        boolFalse = boolTrue.negate();
        unsat = false;
+       booleanVarUsed = false;
        elapsedTime = 0;
        tuner = NULL;
        satEncoder->resetSATEncoder();
@@ -154,7 +157,7 @@ CSolver *CSolver::clone() {
 }
 
 CSolver *CSolver::deserialize(const char *file) {
-       model_print("deserializing ...\n");
+       model_print("deserializing %s ...\n", file);
        Deserializer deserializer(file);
        return deserializer.deserialize();
 }
@@ -307,6 +310,8 @@ Function *CSolver::completeTable(Table *table, UndefinedBehavior behavior) {
 BooleanEdge CSolver::getBooleanVar(VarType type) {
        Boolean *boolean = new BooleanVar(type);
        allBooleans.push(boolean);
+       if(!booleanVarUsed)
+               booleanVarUsed = true;
        return BooleanEdge(boolean);
 }
 
@@ -576,7 +581,6 @@ void CSolver::inferFixedOrders() {
        }
 }
 
-#define NANOSEC 1000000000.0
 int CSolver::solve() {
        long long startTime = getTimeNano();
        bool deleteTuner = false;
@@ -621,18 +625,21 @@ int CSolver::solve() {
 
        naiveEncodingDecision(this);
 //     eg.validate();
-       
+
+       VarOrderingOpt bor(this, satEncoder);
+       bor.doTransform();
+
        time2 = getTimeNano();
        model_print("Encoding Graph Time: %f\n", (time2 - time1) / NANOSEC);
 
        satEncoder->encodeAllSATEncoder(this);
        time1 = getTimeNano();
 
-       model_print("Elapse Encode time: %f\n", (time1- startTime) / NANOSEC);
-       
+       model_print("Elapse Encode time: %f\n", (time1 - startTime) / NANOSEC);
+
        model_print("Is problem UNSAT after encoding: %d\n", unsat);
        int result = unsat ? IS_UNSAT : satEncoder->solve(satsolverTimeout);
-       model_print("Result Computed in SAT solver:\t%s\n", result == IS_SAT? "SAT" : result == IS_INDETER? "INDETERMINATE" : " UNSAT");
+       model_print("Result Computed in SAT solver:\t%s\n", result == IS_SAT ? "SAT" : result == IS_INDETER ? "INDETERMINATE" : " UNSAT");
        time2 = getTimeNano();
        elapsedTime = time2 - startTime;
        model_print("CSOLVER solve time: %f\n", elapsedTime / NANOSEC);