Preprocessing check

[satune.git] / src / csolver.cc

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);
 }