Adding SMT Interpreters

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index c81e2f3e1c1941789dc0259467dc1f206881193e..2670e4745a24c0371aaa4db082be7890bec86666 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -29,7 +29,8 @@
 #include "varorderingopt.h"
 #include <time.h>
 #include <stdarg.h>
-#include "alloyenc.h"
+#include "alloyinterpreter.h"
+#include "smtinterpreter.h"
 
 CSolver::CSolver() :
        boolTrue(BooleanEdge(new BooleanConst(true))),
@@ -39,7 +40,7 @@ CSolver::CSolver() :
        tuner(NULL),
        elapsedTime(0),
        satsolverTimeout(NOTIMEOUT),
-       alloyEncoder(NULL)
+       interpreter(NULL)
 {
        satEncoder = new SATEncoder(this);
 }
@@ -82,6 +83,10 @@ CSolver::~CSolver() {
        for (uint i = 0; i < size; i++) {
                delete allFunctions.get(i);
        }
+       
+       if(interpreter != NULL){
+               delete interpreter;
+       }
 
        delete boolTrue.getBoolean();
        delete satEncoder;
@@ -158,9 +163,9 @@ CSolver *CSolver::clone() {
        return copy;
 }
 
-CSolver *CSolver::deserialize(const char *file, bool alloy) {
+CSolver *CSolver::deserialize(const char *file, InterpreterType itype) {
        model_print("deserializing %s ...\n", file);
-       Deserializer deserializer(file, alloy);
+       Deserializer deserializer(file, itype);
        return deserializer.deserialize();
 }
 
@@ -390,7 +395,7 @@ BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge *array, uin
 }
 
 BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) {
-       if(!useAlloyCompiler()){
+       if(!useInterpreter()){
                BooleanEdge newarray[asize];
                switch (op) {
                case SATC_NOT: {
@@ -490,7 +495,7 @@ BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t seco
                }
        }
        Boolean *constraint = new BooleanOrder(order, first, second);
-       if (!useAlloyCompiler() ){ 
+       if (!useInterpreter() ){ 
                Boolean *b = boolMap.get(constraint);
 
                if (b == NULL) {
@@ -527,7 +532,7 @@ BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t seco
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {
-       if(!useAlloyCompiler()){
+       if(!useInterpreter()){
                if (isTrue(constraint))
                        return;
                else if (isFalse(constraint)) {
@@ -605,11 +610,11 @@ int CSolver::solve() {
                deleteTuner = true;
        }
        int result = IS_INDETER;
-       if(useAlloyCompiler()){
-               alloyEncoder->encode();
-               model_print("Problem encoded in Alloy\n");
-               result = alloyEncoder->solve();
-               model_print("Problem solved by Alloy\n");
+       if(useInterpreter()){
+               interpreter->encode();
+               model_print("Problem encoded in Interpreter\n");
+               result = interpreter->solve();
+               model_print("Problem solved by Interpreter\n");
        } else{
 
                {
@@ -675,9 +680,23 @@ int CSolver::solve() {
        return result;
 }
 
-void CSolver::setAlloyEncoder(){
-       if(alloyEncoder == NULL){
-               alloyEncoder = new AlloyEnc(this);
+void CSolver::setInterpreter(InterpreterType type){
+       if(interpreter == NULL){
+               switch(type){
+                       case SATUNE:
+                               break;
+                       case ALLOY:{
+                               interpreter = new AlloyInterpreter(this);
+                               break;
+                       }case Z3:{
+                               interpreter = new SMTInterpreter(this);
+                               break;
+                       }
+                       case MATHSAT:
+                       case SMTRAT:
+                       default:
+                               ASSERT(0);
+               }
        }
 }
 
@@ -699,7 +718,7 @@ uint64_t CSolver::getElementValue(Element *element) {
        case ELEMSET:
        case ELEMCONST:
        case ELEMFUNCRETURN:
-               return useAlloyCompiler()? alloyEncoder->getValue(element):
+               return useInterpreter()? interpreter->getValue(element):
                        getElementValueSATTranslator(this, element);
        default:
                ASSERT(0);
@@ -711,7 +730,7 @@ bool CSolver::getBooleanValue(BooleanEdge bedge) {
        Boolean *boolean = bedge.getBoolean();
        switch (boolean->type) {
        case BOOLEANVAR:
-               return useAlloyCompiler()? alloyEncoder->getBooleanValue(boolean):
+               return useInterpreter()? interpreter->getBooleanValue(boolean):
                        getBooleanVariableValueSATTranslator(this, boolean);
        default:
                ASSERT(0);