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

diff --git a/src/csolver.h b/src/csolver.h
index 0dc3cef..7da50c5 100644
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -161,16 +161,17 @@ public:
 	void replaceBooleanWithBoolean(BooleanEdge oldb, BooleanEdge newb);
 	CSolver *clone();
 	void serialize();
-	static CSolver *deserialize(const char *file);
+	static CSolver *deserialize(const char *file, bool alloy = false);
 	void autoTune(uint budget);
 	void inferFixedOrders();
 	void inferFixedOrder(Order *order);
-	void setAlloyEncode();
-
+	void setAlloyEncoder();
+	bool useAlloyCompiler() {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;
 
@@ -222,7 +223,7 @@ private:
         Tuner *tuner;
 	long long elapsedTime;
 	long satsolverTimeout;
-	AlloyEnc *alloyEncoder;
+	Interpreter *interpreter;
 	friend class ElementOpt;
 	friend class VarOrderingOpt;
 };