X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.h;h=49438b697b1235287cba1a437ec4b17aa63c9f7f;hp=1bc24769a7edee9e78cf2025b0e855b8d3fbf423;hb=974a00584da88dce9c638bd5fd981f2164176e2c;hpb=e0ee8656d201f77504bd239612969ce43636c324

diff --git a/src/csolver.h b/src/csolver.h
index 1bc2476..49438b6 100644
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -58,7 +58,7 @@ public:
 	Set *getElementRange (Element *element);
 
 	void mustHaveValue(Element *element);
-
+	
 	BooleanEdge getBooleanTrue();
 
 	BooleanEdge getBooleanFalse();
@@ -101,8 +101,11 @@ public:
 
 	BooleanEdge applyPredicate(Predicate *predicate, Element **inputs, uint numInputs);
 
+	/** This exactly one element of array can be true! (i.e. a1 + a2 + a3 + ... + an = 1)*/
+	BooleanEdge applyExactlyOneConstraint (BooleanEdge *array, uint asize);
+	
 	/** This function applies a logical operation to the Booleans in its input. */
-
+	
 	BooleanEdge applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize);
 
 	/** This function applies a logical operation to the Booleans in its input. */
@@ -126,10 +129,21 @@ public:
 
 	/** When everything is done, the client calls this function and then csolver starts to encode*/
 	int solve();
-
+	/**
+	 * Incremental Solving for SATUNE.
+	 * It only supports incremental solving for elements!
+	 * No support for BooleanVar, BooleanOrder or using interpreters
+	 * @return 
+	 */
+	int solveIncremental();
+	
 	/** After getting the solution from the SAT solver, client can get the value of an element via this function*/
 	uint64_t getElementValue(Element *element);
 
+	void freezeElement(Element *e);
+	
+	void turnoffOptimizations(){optimizationsOff = true;}
+	
 	/** After getting the solution from the SAT solver, client can get the value of a boolean via this function*/
 	bool getBooleanValue(BooleanEdge boolean);
 
@@ -141,7 +155,7 @@ public:
 	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();
 
@@ -151,7 +165,9 @@ public:
 	Tuner *getTuner() { return tuner; }
 
 	SetIteratorBooleanEdge *getConstraints() { return constraints.iterator(); }
-
+	bool isConstraintEncoded(BooleanEdge be) { return encodedConstraints.contains(be);}
+	void addEncodedConstraint(BooleanEdge be) {encodedConstraints.add(be);}
+	
 	SATEncoder *getSATEncoder() {return satEncoder;}
 
 	void replaceBooleanWithTrue(BooleanEdge bexpr);
@@ -161,30 +177,33 @@ 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;}
+	bool isIncrementalMode() {return incrementalMode;}
+	void freezeElementsVariables();
 	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
 	BooleanEdge rewriteLogicalOperation(LogicOp op, BooleanEdge *array, uint asize);
 	BooleanEdge doRewrite(BooleanEdge b);
 	/** This is a vector of constraints that must be satisfied. */
 	HashsetBooleanEdge constraints;
+	HashsetBooleanEdge encodedConstraints;
 
 	/** This is a vector of all boolean structs that we have allocated. */
 	Vector<Boolean *> allBooleans;
@@ -218,11 +237,16 @@ private:
 
 	SATEncoder *satEncoder;
 	bool unsat;
+	bool booleanVarUsed;
+	bool incrementalMode;
+	bool optimizationsOff;
 	Tuner *tuner;
 	long long elapsedTime;
 	long satsolverTimeout;
+	Interpreter *interpreter;
+	bool noOptimization;
 	friend class ElementOpt;
-        friend class VarOrderingOpt;
+	friend class VarOrderingOpt;
 };
 
 inline CompOp flipOp(CompOp op) {