Adding SMT Interpreters

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index 0dc3ceffe99ba68085cca2a9b7703c3eed90673a..d7ccdb53ee3bd58f46857b7ceb496fa7440b1923 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();
        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 autoTune(uint budget);
        void inferFixedOrders();
        void inferFixedOrder(Order *order);

-       void setAlloyEncode();
-
+       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();
        void setTuner(Tuner *_tuner) { tuner = _tuner; }
        long long getElapsedTime() { return elapsedTime; }
        long long getEncodeTime();
        long long getSolveTime();

+       long getSatSolverTimeout() { return satsolverTimeout;}

 
        CMEMALLOC;
 
 
        CMEMALLOC;
 


@@ -222,7 +223,7 @@ private:
         Tuner *tuner;
        long long elapsedTime;
        long satsolverTimeout;
         Tuner *tuner;
        long long elapsedTime;
        long satsolverTimeout;

-       AlloyEnc *alloyEncoder;
+       Interpreter *interpreter;

        friend class ElementOpt;
        friend class VarOrderingOpt;
 };
        friend class ElementOpt;
        friend class VarOrderingOpt;
 };