Fix tabbing

[satune.git] / src / csolver.h

diff --git a/src/csolver.h b/src/csolver.h
index 74d0bf6e2c64b9e237f7ab0e9381b6b40a3f7c63..b99cf804b5e416aa3f8c7fee6896ec1120b72801 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -141,7 +141,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();
 
@@ -161,16 +161,17 @@ 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 alloyEncoder != 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;}
 
        CMEMALLOC;
 
@@ -218,11 +219,11 @@ private:
 
        SATEncoder *satEncoder;
        bool unsat;
-        bool booleanVarUsed;
-        Tuner *tuner;
+       bool booleanVarUsed;
+       Tuner *tuner;
        long long elapsedTime;
        long satsolverTimeout;
-       AlloyEnc *alloyEncoder;
+       Interpreter *interpreter;
        friend class ElementOpt;
        friend class VarOrderingOpt;
 };