Boolean Variable Ordering optimizations

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 2c15b62fd87e6322fb92d60f0fad6ca7d5e19047..983333b0c4805735ab9f948880a3a0e221827bd8 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -26,6 +26,7 @@
 #include "orderedge.h"
 #include "orderanalysis.h"
 #include "elementopt.h"
+#include "varorderingopt.h"
 #include <time.h>
 #include <stdarg.h>
 
@@ -154,7 +155,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();
 }
@@ -621,15 +622,18 @@ int CSolver::solve() {
 
        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(satsolverTimeout);
        model_print("Result Computed in SAT solver:\t%s\n", result == IS_SAT? "SAT" : result == IS_INDETER? "INDETERMINATE" : " UNSAT");