X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.h;h=54012dee4ae3adf9deafd7b172dd573d539777c0;hp=ffbfe3585227062329e1eae09cdc3643f16f32b7;hb=cbd921ee35b6a29934fd7cecccde7f160228af17;hpb=6372bfaf0fe5c6e24bd46005e95209316d8d5a9a

diff --git a/src/csolver.h b/src/csolver.h
index ffbfe35..54012de 100644
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -11,7 +11,7 @@ class CSolver {
 public:
 	CSolver();
 	~CSolver();
-        void resetSolver();
+	void resetSolver();
 	/** This function creates a set containing the elements passed in the array. */
 	Set *createSet(VarType type, uint64_t *elements, uint num);
 
@@ -19,11 +19,16 @@ public:
 
 	Set *createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange);
 
+	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. */
+	/** 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!
+	 */
 
 	MutableSet *createMutableSet(VarType type);
 
@@ -52,6 +57,8 @@ public:
 
 	Set *getElementRange (Element *element);
 
+	void mustHaveValue(Element *element);
+
 	BooleanEdge getBooleanTrue();
 
 	BooleanEdge getBooleanFalse();
@@ -62,20 +69,20 @@ public:
 
 	/** This function creates a function operator. */
 
-	Function *createFunctionOperator(ArithOp op, Set **domain, uint numDomain, Set *range,
+	Function *createFunctionOperator(ArithOp op, Set *range,
 																	 OverFlowBehavior overflowbehavior);
 
 	/** This function creates a predicate operator. */
 
-	Predicate *createPredicateOperator(CompOp op, Set **domain, uint numDomain);
+	Predicate *createPredicateOperator(CompOp op);
 
 	Predicate *createPredicateTable(Table *table, UndefinedBehavior behavior);
 
 	/** This function creates an empty instance table.*/
 
-	Table *createTable(Set **domains, uint numDomain, Set *range);
+	Table *createTable(Set *range);
 
-	Table *createTableForPredicate(Set **domains, uint numDomain);
+	Table *createTableForPredicate();
 	/** This function adds an input output relation to a table. */
 
 	void addTableEntry(Table *table, uint64_t *inputs, uint inputSize, uint64_t result);
@@ -119,7 +126,7 @@ public:
 
 	/** When everything is done, the client calls this function and then csolver starts to encode*/
 	int solve();
-
+	
 	/** After getting the solution from the SAT solver, client can get the value of an element via this function*/
 	uint64_t getElementValue(Element *element);
 
@@ -132,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();
 
@@ -153,22 +161,24 @@ 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);
 
 	//These two functions are helpers if the client has a pointer to a
 	//Boolean object that we have since replaced
@@ -209,7 +219,44 @@ 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) {
+	switch (op) {
+	case SATC_EQUALS:
+		return SATC_EQUALS;
+	case SATC_LT:
+		return SATC_GT;
+	case SATC_GT:
+		return SATC_LT;
+	case SATC_LTE:
+		return SATC_GTE;
+	case SATC_GTE:
+		return SATC_LTE;
+	}
+	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