X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fcsolver.h;h=d7ccdb53ee3bd58f46857b7ceb496fa7440b1923;hb=e9ca288c7f0cf0f3bb9508c3cc9b212f557bcc40;hp=044f79e9a3693ea34c6c31e9eca4bad293ce0891;hpb=dea71d97549f037bd9b098b8abb121f02c6ba9df;p=satune.git

diff --git a/src/csolver.h b/src/csolver.h
index 044f79e..d7ccdb5 100644
--- 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,8 +139,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,24 +161,25 @@ 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;
 
 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);
@@ -217,9 +219,13 @@ private:
 
 	SATEncoder *satEncoder;
 	bool unsat;
-	Tuner *tuner;
+        bool booleanVarUsed;
+        Tuner *tuner;
 	long long elapsedTime;
+	long satsolverTimeout;
+	Interpreter *interpreter;
 	friend class ElementOpt;
+	friend class VarOrderingOpt;
 };
 
 inline CompOp flipOp(CompOp op) {
@@ -237,4 +243,20 @@ inline CompOp flipOp(CompOp op) {
 	}
 	ASSERT(0);
 }
+
+inline CompOp negateOp(CompOp op) {
+	switch (op) {
+	case SATC_EQUALS:
+		ASSERT(0);
+	case SATC_LT:
+		return SATC_GTE;
+	case SATC_GT:
+		return SATC_LTE;
+	case SATC_LTE:
+		return SATC_GT;
+	case SATC_GTE:
+		return SATC_LT;
+	}
+	ASSERT(0);
+}
 #endif