backout changes

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index ea4b92465f873dd8a59cb5fce07751512f6a5eb8..8ea79e439069e0ccb5baac8d0028c82fbdf9793b 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -21,6 +21,7 @@
 #include "preprocess.h"
 #include "serializer.h"
 #include "deserializer.h"
+#include "encodinggraph.h"
 
 CSolver::CSolver() :
        boolTrue(BooleanEdge(new BooleanConst(true))),
@@ -128,9 +129,9 @@ MutableSet *CSolver::createMutableSet(VarType type) {
        return set;
 }
 
-//void CSolver::addItem(MutableSet *set, uint64_t element) {
-//     set->addElementMSet(element);
-//}
+void CSolver::addItem(MutableSet *set, uint64_t element) {
+       set->addElementMSet(element);
+}
 
 uint64_t CSolver::createUniqueItem(MutableSet *set) {
        uint64_t element = set->getNewUniqueItem();
@@ -138,6 +139,10 @@ uint64_t CSolver::createUniqueItem(MutableSet *set) {
        return element;
 }
 
+void CSolver::finalizeMutableSet(MutableSet* set){
+       set->finalize();
+}
+
 Element *CSolver::getElementVar(Set *set) {
        Element *element = new ElementSet(set);
        allElements.push(element);
@@ -434,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();