backout changes

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index d0d2c0612497800a6ee891a42f229163443b2797..8ea79e439069e0ccb5baac8d0028c82fbdf9793b 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -21,7 +21,7 @@
 #include "preprocess.h"
 #include "serializer.h"
 #include "deserializer.h"
-#include "naiveencoder.h"
+#include "encodinggraph.h"
 
 CSolver::CSolver() :
        boolTrue(BooleanEdge(new BooleanConst(true))),
@@ -439,6 +439,10 @@ int CSolver::solve() {
        IntegerEncodingTransform iet(this);
        iet.doTransform();
 
+       EncodingGraph eg(this);
+       eg.buildGraph();
+       eg.encode();
+       
        naiveEncodingDecision(this);
        satEncoder->encodeAllSATEncoder(this);
        int result = unsat ? IS_UNSAT : satEncoder->solve();