Adding a directed search based config for the tuner

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 5cdca73eb0ce7c91ce3a3feb4ca405290d3fcfbd..9f374cc00df78fc08ac6c7097f0e78aaa4b12b2d 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -34,7 +34,8 @@ CSolver::CSolver() :
        boolFalse(boolTrue.negate()),
        unsat(false),
        tuner(NULL),
-       elapsedTime(0)
+       elapsedTime(0),
+       satsolverTimeout(NOTIMEOUT)
 {
        satEncoder = new SATEncoder(this);
 }
@@ -153,7 +154,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();
 }
@@ -616,23 +617,22 @@ int CSolver::solve() {
        eop.doTransform();
 
        EncodingGraph eg(this);
-       eg.buildGraph();
        eg.encode();
 
        naiveEncodingDecision(this);
 //     eg.validate();
-       
+
        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");
+       int 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);