X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.h;h=c916c58499992b73450e294a26531801b8cc6791;hp=b84d3245801d801e1524876841d9d378c26e4f81;hb=8948c9f91441673b06722feee277ad35838ef401;hpb=c081050838e3612c758d5ed4e59b71a9f5d89abb

diff --git a/src/csolver.h b/src/csolver.h
index b84d324..c916c58 100644
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -57,6 +57,8 @@ public:
 
 	Set *getElementRange (Element *element);
 
+	void mustHaveValue(Element *element);
+        
 	BooleanEdge getBooleanTrue();
 
 	BooleanEdge getBooleanFalse();
@@ -67,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);
@@ -157,7 +159,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);
@@ -175,7 +176,8 @@ 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
 	BooleanEdge rewriteLogicalOperation(LogicOp op, BooleanEdge *array, uint asize);
@@ -217,5 +219,38 @@ private:
 	bool unsat;
 	Tuner *tuner;
 	long long elapsedTime;
+	friend class ElementOpt;
 };
+
+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