Merging + fixing memory bugs

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index b99cf804b5e416aa3f8c7fee6896ec1120b72801..eba7b3ccf47ffa7abb4dbae45e398591a8fd025c 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -101,6 +101,9 @@ public:
 
        BooleanEdge applyPredicate(Predicate *predicate, Element **inputs, uint numInputs);
 
+       /** This exactly one element of array can be true! (i.e. a1 + a2 + a3 + ... + an = 1)*/
+       BooleanEdge applyExactlyOneConstraint (BooleanEdge *array, uint asize);
+
        /** This function applies a logical operation to the Booleans in its input. */
 
        BooleanEdge applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize);
@@ -126,10 +129,19 @@ public:
 
        /** When everything is done, the client calls this function and then csolver starts to encode*/
        int solve();
+       /**
+        * Incremental Solving for SATUNE.
+        * It only supports incremental solving for elements!
+        * No support for BooleanVar, BooleanOrder or using interpreters
+        * @return
+        */
+       int solveIncremental();
 
        /** After getting the solution from the SAT solver, client can get the value of an element via this function*/
        uint64_t getElementValue(Element *element);
 
+       void freezeElement(Element *e);
+       void turnoffOptimizations(){optimizationsOff = true;}
        /** After getting the solution from the SAT solver, client can get the value of a boolean via this function*/
        bool getBooleanValue(BooleanEdge boolean);
 
@@ -151,6 +163,8 @@ public:
        Tuner *getTuner() { return tuner; }
 
        SetIteratorBooleanEdge *getConstraints() { return constraints.iterator(); }
+       bool isConstraintEncoded(BooleanEdge be) { return encodedConstraints.contains(be);}
+       void addEncodedConstraint(BooleanEdge be) {encodedConstraints.add(be);}
 
        SATEncoder *getSATEncoder() {return satEncoder;}
 
@@ -172,7 +186,8 @@ public:
        long long getEncodeTime();
        long long getSolveTime();
        long getSatSolverTimeout() { return satsolverTimeout;}
-
+       bool isIncrementalMode() {return incrementalMode;}
+       void freezeElementsVariables();
        CMEMALLOC;
 
 private:
@@ -186,6 +201,7 @@ private:
        BooleanEdge doRewrite(BooleanEdge b);
        /** This is a vector of constraints that must be satisfied. */
        HashsetBooleanEdge constraints;
+       HashsetBooleanEdge encodedConstraints;
 
        /** This is a vector of all boolean structs that we have allocated. */
        Vector<Boolean *> allBooleans;
@@ -220,10 +236,13 @@ private:
        SATEncoder *satEncoder;
        bool unsat;
        bool booleanVarUsed;
+       bool incrementalMode;
+       bool optimizationsOff;
        Tuner *tuner;
        long long elapsedTime;
        long satsolverTimeout;
        Interpreter *interpreter;
+       bool noOptimization;
        friend class ElementOpt;
        friend class VarOrderingOpt;
 };