X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.h;h=eba7b3ccf47ffa7abb4dbae45e398591a8fd025c;hp=7da50c55b9bf60667e994cf50bb8178d5f009f3d;hb=85d422935f1a6ebdb689f4108185521b022a51d9;hpb=3267d387309bb4d2aa130a940f386b419652a956

diff --git a/src/csolver.h b/src/csolver.h
index 7da50c5..eba7b3c 100644
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -101,6 +101,9 @@ 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);
@@ -126,10 +129,19 @@ 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 +153,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;}
+	bool isBooleanVarUsed() {return booleanVarUsed;}
 	void printConstraint(BooleanEdge boolean);
 	void printConstraints();
 
@@ -151,6 +163,8 @@ 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;}
 
@@ -161,18 +175,19 @@ public:
 	void replaceBooleanWithBoolean(BooleanEdge oldb, BooleanEdge newb);
 	CSolver *clone();
 	void serialize();
-	static CSolver *deserialize(const char *file, bool alloy = false);
+	static CSolver *deserialize(const char *file, InterpreterType itype = SATUNE);
 	void autoTune(uint budget);
 	void inferFixedOrders();
 	void inferFixedOrder(Order *order);
-	void setAlloyEncoder();
-	bool useAlloyCompiler() {return interpreter != NULL;}
+	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:
@@ -186,6 +201,7 @@ private:
 	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;
@@ -219,11 +235,14 @@ private:
 
 	SATEncoder *satEncoder;
 	bool unsat;
-        bool booleanVarUsed;
-        Tuner *tuner;
+	bool booleanVarUsed;
+	bool incrementalMode;
+	bool optimizationsOff;
+	Tuner *tuner;
 	long long elapsedTime;
 	long satsolverTimeout;
 	Interpreter *interpreter;
+	bool noOptimization;
 	friend class ElementOpt;
 	friend class VarOrderingOpt;
 };