Bug fixes for Java API + Exactly one constraints + Adding support for getting the...

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index 19ba3e12db5eac9f06affa74540cf66bf774f997..0ff566e53cee07fd935e35a58a60d63d668943ea 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -101,8 +101,11 @@ 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);
 
        /** This function applies a logical operation to the Booleans in its input. */
@@ -139,8 +142,9 @@ public:
        bool isFalse(BooleanEdge b);
 
        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();
 
@@ -160,16 +164,17 @@ public:
        void replaceBooleanWithBoolean(BooleanEdge oldb, BooleanEdge newb);
        CSolver *clone();
        void serialize();
-       static CSolver *deserialize(const char *file);
+       static CSolver *deserialize(const char *file, InterpreterType itype = SATUNE);
        void autoTune(uint budget);
        void inferFixedOrders();
        void inferFixedOrder(Order *order);
-
-
+       void setInterpreter(InterpreterType type);
+       bool useInterpreter() {return interpreter != NULL;}
        void setTuner(Tuner *_tuner) { tuner = _tuner; }
        long long getElapsedTime() { return elapsedTime; }
        long long getEncodeTime();
        long long getSolveTime();
+       long getSatSolverTimeout() { return satsolverTimeout;}
 
        CMEMALLOC;
 
@@ -217,9 +222,13 @@ private:
 
        SATEncoder *satEncoder;
        bool unsat;
+       bool booleanVarUsed;
        Tuner *tuner;
        long long elapsedTime;
+       long satsolverTimeout;
+       Interpreter *interpreter;
        friend class ElementOpt;
+       friend class VarOrderingOpt;
 };
 
 inline CompOp flipOp(CompOp op) {