Alloy interpreter

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 5cdca73eb0ce7c91ce3a3feb4ca405290d3fcfbd..a8eb999de296c7b58b90af4057deb97e5f1faedb 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -26,15 +26,20 @@
 #include "orderedge.h"
 #include "orderanalysis.h"
 #include "elementopt.h"
+#include "varorderingopt.h"
 #include <time.h>
 #include <stdarg.h>
+#include "alloyenc.h"
 
 CSolver::CSolver() :
        boolTrue(BooleanEdge(new BooleanConst(true))),
        boolFalse(boolTrue.negate()),
        unsat(false),
+       booleanVarUsed(false),
        tuner(NULL),
-       elapsedTime(0)
+       elapsedTime(0),
+       satsolverTimeout(NOTIMEOUT),
+       alloyEncoder(NULL)
 {
        satEncoder = new SATEncoder(this);
 }
@@ -134,6 +139,7 @@ void CSolver::resetSolver() {
        boolTrue = BooleanEdge(new BooleanConst(true));
        boolFalse = boolTrue.negate();
        unsat = false;
+       booleanVarUsed = false;
        elapsedTime = 0;
        tuner = NULL;
        satEncoder->resetSATEncoder();
@@ -153,7 +159,7 @@ CSolver *CSolver::clone() {
 }
 
 CSolver *CSolver::deserialize(const char *file) {
-       model_print("deserializing ...\n");
+       model_print("deserializing %s ...\n", file);
        Deserializer deserializer(file);
        return deserializer.deserialize();
 }
@@ -306,6 +312,8 @@ Function *CSolver::completeTable(Table *table, UndefinedBehavior behavior) {
 BooleanEdge CSolver::getBooleanVar(VarType type) {
        Boolean *boolean = new BooleanVar(type);
        allBooleans.push(boolean);
+       if(!booleanVarUsed)
+               booleanVarUsed = true;
        return BooleanEdge(boolean);
 }
 
@@ -575,7 +583,6 @@ void CSolver::inferFixedOrders() {
        }
 }
 
-#define NANOSEC 1000000000.0
 int CSolver::solve() {
        long long startTime = getTimeNano();
        bool deleteTuner = false;
@@ -616,26 +623,34 @@ int CSolver::solve() {
        eop.doTransform();
 
        EncodingGraph eg(this);
-       eg.buildGraph();
        eg.encode();
 
        naiveEncodingDecision(this);
 //     eg.validate();
-       
+
+       VarOrderingOpt bor(this, satEncoder);
+       bor.doTransform();
+
        time2 = getTimeNano();
        model_print("Encoding Graph Time: %f\n", (time2 - time1) / NANOSEC);
 
        satEncoder->encodeAllSATEncoder(this);
        time1 = getTimeNano();
 
-       model_print("Elapse Encode time: %f\n", (time1- startTime) / NANOSEC);
-       
+       model_print("Elapse Encode time: %f\n", (time1 - startTime) / NANOSEC);
+
        model_print("Is problem UNSAT after encoding: %d\n", unsat);
-       int result = unsat ? IS_UNSAT : satEncoder->solve();
-       model_print("Result Computed in SAT solver:\t%s\n", result == IS_SAT? "SAT" : " UNSAT");
-       time2 = getTimeNano();
-       elapsedTime = time2 - startTime;
-       model_print("CSOLVER solve time: %f\n", elapsedTime / NANOSEC);
+       int result = IS_INDETER;
+       if(alloyEncoder != NULL){
+               alloyEncoder->encode();
+               result = alloyEncoder->solve();
+       }else{
+               result = unsat ? IS_UNSAT : satEncoder->solve(satsolverTimeout);
+               model_print("Result Computed in SAT solver:\t%s\n", result == IS_SAT ? "SAT" : result == IS_INDETER ? "INDETERMINATE" : " UNSAT");
+               time2 = getTimeNano();
+               elapsedTime = time2 - startTime;
+               model_print("CSOLVER solve time: %f\n", elapsedTime / NANOSEC);
+       }
        if (deleteTuner) {
                delete tuner;
                tuner = NULL;
@@ -643,6 +658,10 @@ int CSolver::solve() {
        return result;
 }
 
+void CSolver::setAlloyEncode(){
+       alloyEncoder = new AlloyEnc(this);
+}
+
 void CSolver::printConstraints() {
        SetIteratorBooleanEdge *it = getConstraints();
        while (it->hasNext()) {
@@ -661,7 +680,8 @@ uint64_t CSolver::getElementValue(Element *element) {
        case ELEMSET:
        case ELEMCONST:
        case ELEMFUNCRETURN:
-               return getElementValueSATTranslator(this, element);
+               return alloyEncoder == NULL? getElementValueSATTranslator(this, element):
+                       alloyEncoder->getValue(element);
        default:
                ASSERT(0);
        }