Interpreter abstraction and memory bug fixes

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index c6044864313280cb71e21a01528d73d0d87b0a36..7da50c55b9bf60667e994cf50bb8178d5f009f3d 100644 (file)
--- 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 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,6 +223,7 @@ private:
         Tuner *tuner;
        long long elapsedTime;
        long satsolverTimeout;
+       Interpreter *interpreter;
        friend class ElementOpt;
        friend class VarOrderingOpt;
 };