Merge branch 'scratch' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 44b29bbad3845ec86009f64a17b6b714f114b7e5..5cdca73eb0ce7c91ce3a3feb4ca405290d3fcfbd 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -184,8 +184,8 @@ Set *CSolver::createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange
        return set;
 }
 
-bool CSolver::itemExistInSet(Set *set, uint64_t item){
-        return set->exists(item);
+bool CSolver::itemExistInSet(Set *set, uint64_t item) {
+       return set->exists(item);
 }
 
 VarType CSolver::getSetVarType(Set *set) {
@@ -223,8 +223,8 @@ Element *CSolver::getElementVar(Set *set) {
        return element;
 }
 
-void CSolver::mustHaveValue(Element *element){
-       element->getElementEncoding()->anyValue = true;
+void CSolver::mustHaveValue(Element *element) {
+       element->anyValue = true;
 }
 
 Set *CSolver::getElementRange (Element *element) {
@@ -577,7 +577,7 @@ void CSolver::inferFixedOrders() {
 
 #define NANOSEC 1000000000.0
 int CSolver::solve() {
-       long long starttime = getTimeNano();
+       long long startTime = getTimeNano();
        bool deleteTuner = false;
        if (tuner == NULL) {
                tuner = new DefaultTuner();
@@ -597,17 +597,17 @@ int CSolver::solve() {
                delete orderit;
        }
        computePolarities(this);
-       long long time2 = getTimeNano();
-       model_print("Polarity time: %f\n", (time2 - starttime) / NANOSEC);
+       long long time1 = getTimeNano();
+       model_print("Polarity time: %f\n", (time1 - startTime) / NANOSEC);
        Preprocess pp(this);
        pp.doTransform();
-       long long time3 = getTimeNano();
-       model_print("Preprocess time: %f\n", (time3 - time2) / NANOSEC);
+       long long time2 = getTimeNano();
+       model_print("Preprocess time: %f\n", (time2 - time1) / NANOSEC);
 
        DecomposeOrderTransform dot(this);
        dot.doTransform();
-       long long time4 = getTimeNano();
-       model_print("Decompose Order: %f\n", (time4 - time3) / NANOSEC);
+       time1 = getTimeNano();
+       model_print("Decompose Order: %f\n", (time1 - time2) / NANOSEC);
 
        IntegerEncodingTransform iet(this);
        iet.doTransform();
@@ -620,20 +620,22 @@ int CSolver::solve() {
        eg.encode();
 
        naiveEncodingDecision(this);
-       long long time5 = getTimeNano();
-       model_print("Encoding Graph Time: %f\n", (time5 - time4) / NANOSEC);
+//     eg.validate();
+       
+       time2 = getTimeNano();
+       model_print("Encoding Graph Time: %f\n", (time2 - time1) / NANOSEC);
 
-       long long startTime = getTimeNano();
        satEncoder->encodeAllSATEncoder(this);
-       long long endTime = getTimeNano();
-
-       elapsedTime = endTime - startTime;
-       model_print("Elapse Encode time: %f\n", elapsedTime / NANOSEC);
+       time1 = getTimeNano();
 
+       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: %d\n", result);
-
+       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);
        if (deleteTuner) {
                delete tuner;
                tuner = NULL;