Interpreter abstraction and memory bug fixes

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index 74d0bf6e2c64b9e237f7ab0e9381b6b40a3f7c63..7da50c55b9bf60667e994cf50bb8178d5f009f3d 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -166,11 +166,12 @@ public:
        void inferFixedOrders();
        void inferFixedOrder(Order *order);
        void setAlloyEncoder();
-       bool useAlloyCompiler() {return alloyEncoder != NULL;}
+       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;
 };