Merge branch 'encoding'

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index bcd8f3fe33043298383aa85e0d7a0cd989573a8e..0eebb1759e8fde28ae529b403e853ad8e0f3202d 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -87,6 +87,7 @@ CSolver *CSolver::clone() {
 }
 
 void CSolver::serialize() {
+       model_print("serializing ...\n");
        {
                Serializer serializer("dump");
                SetIteratorBooleanEdge *it = getConstraints();
@@ -146,7 +147,7 @@ Element *CSolver::getElementVar(Set *set) {
 Element *CSolver::getElementConst(VarType type, uint64_t value) {
        uint64_t array[] = {value};
        Set *set = new Set(type, array, 1);
-       Element *element = new ElementConst(value, type, set);
+       Element *element = new ElementConst(value, set);
        Element *e = elemMap.get(element);
        if (e == NULL) {
                allSets.push(set);
@@ -227,7 +228,7 @@ BooleanEdge CSolver::getBooleanFalse() {
 }
 
 BooleanEdge CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) {
-       return applyPredicateTable(predicate, inputs, numInputs, NULL);
+       return applyPredicateTable(predicate, inputs, numInputs, BooleanEdge(NULL));
 }
 
 BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, BooleanEdge undefinedStatus) {