Preprocessing check

diff --git a/src/ASTTransform/preprocess.cc b/src/ASTTransform/preprocess.cc
index 1e60c19f244468836eddcd05b1f1436cf3fc6bf8..7b4877b7a57cbffea4bb13a34fb10dbc39bb58a8 100644 (file)
--- a/src/ASTTransform/preprocess.cc
+++ b/src/ASTTransform/preprocess.cc
@@ -13,7 +13,7 @@ Preprocess::~Preprocess() {
 }
 
 void Preprocess::doTransform() {
 }
 
 void Preprocess::doTransform() {

-       if (solver->getTuner()->getTunable(PREPROCESS, &onoff) == 0)
+       if (!solver->isBooleanVarUsed() && solver->getTuner()->getTunable(PREPROCESS, &onoff) == 0)

                return;
 
        BooleanIterator bit(solver);
                return;
 
        BooleanIterator bit(solver);

diff --git a/src/csolver.cc b/src/csolver.cc
index fbe0dd082d5070229834d892c2578ecb6af6070b..45163be66ded9b2b608b518a83564cef2f328496 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -34,6 +34,7 @@ CSolver::CSolver() :
        boolTrue(BooleanEdge(new BooleanConst(true))),
        boolFalse(boolTrue.negate()),
        unsat(false),
        boolTrue(BooleanEdge(new BooleanConst(true))),
        boolFalse(boolTrue.negate()),
        unsat(false),

+       booleanVarUsed(false),

        tuner(NULL),
        elapsedTime(0),
        satsolverTimeout(NOTIMEOUT)
        tuner(NULL),
        elapsedTime(0),
        satsolverTimeout(NOTIMEOUT)


@@ -136,6 +137,7 @@ void CSolver::resetSolver() {
        boolTrue = BooleanEdge(new BooleanConst(true));
        boolFalse = boolTrue.negate();
        unsat = false;
        boolTrue = BooleanEdge(new BooleanConst(true));
        boolFalse = boolTrue.negate();
        unsat = false;

+       booleanVarUsed = false;

        elapsedTime = 0;
        tuner = NULL;
        satEncoder->resetSATEncoder();
        elapsedTime = 0;
        tuner = NULL;
        satEncoder->resetSATEncoder();


@@ -308,6 +310,8 @@ Function *CSolver::completeTable(Table *table, UndefinedBehavior behavior) {
 BooleanEdge CSolver::getBooleanVar(VarType type) {
        Boolean *boolean = new BooleanVar(type);
        allBooleans.push(boolean);
 BooleanEdge CSolver::getBooleanVar(VarType type) {
        Boolean *boolean = new BooleanVar(type);
        allBooleans.push(boolean);

+       if(!booleanVarUsed)
+               booleanVarUsed = true;

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

diff --git a/src/csolver.h b/src/csolver.h
index 16937ddd63827f67aaa46827dcdc371914dd0de6..c6044864313280cb71e21a01528d73d0d87b0a36 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -141,7 +141,7 @@ public:
        void setUnSAT() { model_print("Setting UNSAT %%%%%%\n"); unsat = true; }
        void setSatSolverTimeout(long seconds) { satsolverTimeout = seconds;}
        bool isUnSAT() { return unsat; }
        void setUnSAT() { model_print("Setting UNSAT %%%%%%\n"); unsat = true; }
        void setSatSolverTimeout(long seconds) { satsolverTimeout = seconds;}
        bool isUnSAT() { return unsat; }

-
+        bool isBooleanVarUsed(){return booleanVarUsed;}

        void printConstraint(BooleanEdge boolean);
        void printConstraints();
 
        void printConstraint(BooleanEdge boolean);
        void printConstraints();
 


@@ -218,7 +218,8 @@ private:
 
        SATEncoder *satEncoder;
        bool unsat;
 
        SATEncoder *satEncoder;
        bool unsat;

-       Tuner *tuner;
+        bool booleanVarUsed;
+        Tuner *tuner;

        long long elapsedTime;
        long satsolverTimeout;
        friend class ElementOpt;
        long long elapsedTime;
        long satsolverTimeout;
        friend class ElementOpt;