renaming alloyenc to alloy interpreter

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 3c8fffa510f16b01b6be889703e84ea83a5b7972..fd4464686ad8afbe99b268a078d97f786ff49835 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -29,7 +29,7 @@
 #include "varorderingopt.h"
 #include <time.h>
 #include <stdarg.h>
-#include "alloyenc.h"
+#include "alloyinterpreter.h"
 
 CSolver::CSolver() :
        boolTrue(BooleanEdge(new BooleanConst(true))),
@@ -39,7 +39,7 @@ CSolver::CSolver() :
        tuner(NULL),
        elapsedTime(0),
        satsolverTimeout(NOTIMEOUT),
-       alloyEncoder(NULL)
+       interpreter(NULL)
 {
        satEncoder = new SATEncoder(this);
 }
@@ -82,6 +82,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 +162,9 @@ CSolver *CSolver::clone() {
        return copy;
 }
 
-CSolver *CSolver::deserialize(const char *file) {
+CSolver *CSolver::deserialize(const char *file, bool alloy) {
        model_print("deserializing %s ...\n", file);
-       Deserializer deserializer(file);
+       Deserializer deserializer(file, alloy);
        return deserializer.deserialize();
 }
 
@@ -606,9 +610,9 @@ int CSolver::solve() {
        }
        int result = IS_INDETER;
        if(useAlloyCompiler()){
-               alloyEncoder->encode();
+               interpreter->encode();
                model_print("Problem encoded in Alloy\n");
-               result = alloyEncoder->solve();
+               result = interpreter->solve();
                model_print("Problem solved by Alloy\n");
        } else{
 
@@ -676,7 +680,9 @@ int CSolver::solve() {
 }
 
 void CSolver::setAlloyEncoder(){
-       alloyEncoder = new AlloyEnc(this);
+       if(interpreter == NULL){
+               interpreter = new AlloyInterpreter(this);
+       }
 }
 
 void CSolver::printConstraints() {
@@ -697,7 +703,7 @@ uint64_t CSolver::getElementValue(Element *element) {
        case ELEMSET:
        case ELEMCONST:
        case ELEMFUNCRETURN:
-               return useAlloyCompiler()? alloyEncoder->getValue(element):
+               return useAlloyCompiler()? interpreter->getValue(element):
                        getElementValueSATTranslator(this, element);
        default:
                ASSERT(0);
@@ -709,7 +715,7 @@ bool CSolver::getBooleanValue(BooleanEdge bedge) {
        Boolean *boolean = bedge.getBoolean();
        switch (boolean->type) {
        case BOOLEANVAR:
-               return useAlloyCompiler()? alloyEncoder->getBooleanValue(boolean):
+               return useAlloyCompiler()? interpreter->getBooleanValue(boolean):
                        getBooleanVariableValueSATTranslator(this, boolean);
        default:
                ASSERT(0);