X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.h;h=c6044864313280cb71e21a01528d73d0d87b0a36;hp=fa2ee1426fad6288162bc880ef7c1fdd72dd03d5;hb=c53a5c97df5189f82b618e510bb7fcad8671e5ff;hpb=9ef6c2bc13c8474fa7848e06f312cdcd05254b6b

diff --git a/src/csolver.h b/src/csolver.h
index fa2ee14..c604486 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);
 
@@ -57,8 +57,8 @@ public:
 
 	Set *getElementRange (Element *element);
 
-        void mustHaveValue(Element *element);
-        
+	void mustHaveValue(Element *element);
+
 	BooleanEdge getBooleanTrue();
 
 	BooleanEdge getBooleanFalse();
@@ -69,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);
@@ -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();
 
@@ -159,7 +160,6 @@ public:
 	void replaceBooleanWithFalse(BooleanEdge bexpr);
 	void replaceBooleanWithBoolean(BooleanEdge oldb, BooleanEdge newb);
 	CSolver *clone();
-//        Set* addItemsToRange(Element* element, uint num, ...);
 	void serialize();
 	static CSolver *deserialize(const char *file);
 	void autoTune(uint budget);
@@ -177,6 +177,7 @@ public:
 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
@@ -217,7 +218,43 @@ private:
 
 	SATEncoder *satEncoder;
 	bool unsat;
-	Tuner *tuner;
+        bool booleanVarUsed;
+        Tuner *tuner;
 	long long elapsedTime;
+	long satsolverTimeout;
+	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