1)Making naiveencoder and encoding graph use tuner 2)Adding timeout to the sat solver...

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index c916c58499992b73450e294a26531801b8cc6791..60e7c6861033e70216aa782238d80c7b8f6c0c43 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -18,17 +18,17 @@ public:
        /** This function creates a set from lowrange to highrange (inclusive). */
 
        Set *createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange);
-        
-        bool itemExistInSet(Set *set, uint64_t item);
+
+       bool itemExistInSet(Set *set, uint64_t item);
 
        VarType getSetVarType(Set *set);
 
        Element *createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange);
 
        /** This function creates a mutable set.
-         * Note: You should use addItem for adding new item to Mutable sets, and
-         * at the end, you should call finalizeMutableSet!
-         */
+        * Note: You should use addItem for adding new item to Mutable sets, and
+        * at the end, you should call finalizeMutableSet!
+        */
 
        MutableSet *createMutableSet(VarType type);
 
@@ -58,7 +58,7 @@ public:
        Set *getElementRange (Element *element);
 
        void mustHaveValue(Element *element);
-        
+
        BooleanEdge getBooleanTrue();
 
        BooleanEdge getBooleanFalse();
@@ -139,6 +139,7 @@ public:
        bool isFalse(BooleanEdge b);
 
        void setUnSAT() { model_print("Setting UNSAT %%%%%%\n"); unsat = true; }
+        void setSatSolverTimeout(long seconds){ satsolverTimeout = seconds;}
        bool isUnSAT() { return unsat; }
 
        void printConstraint(BooleanEdge boolean);
@@ -176,8 +177,8 @@ public:
 private:
        void handleIFFTrue(BooleanLogic *bexpr, BooleanEdge child);
        void handleANDTrue(BooleanLogic *bexpr, BooleanEdge child);
-       void handleFunction(ElementFunction * ef, BooleanEdge child);
-       
+       void handleFunction(ElementFunction *ef, BooleanEdge child);
+
        //These two functions are helpers if the client has a pointer to a
        //Boolean object that we have since replaced
        BooleanEdge rewriteLogicalOperation(LogicOp op, BooleanEdge *array, uint asize);
@@ -219,6 +220,7 @@ private:
        bool unsat;
        Tuner *tuner;
        long long elapsedTime;
+        long satsolverTimeout;
        friend class ElementOpt;
 };