Merging + fixing memory bugs

[satune.git] / src / Test / tablefuncencodetest.cc

diff --git a/src/Test/tablefuncencodetest.cc b/src/Test/tablefuncencodetest.cc
index e998f3bb6dbf42588c1b1f61ed948e6351c967d2..a6c1f09cdc8e5d3e4b78bc50f3c2f1e727f8e1b6 100644 (file)
--- a/src/Test/tablefuncencodetest.cc
+++ b/src/Test/tablefuncencodetest.cc
@@ -24,10 +24,9 @@ int main(int numargs, char **argv) {
        Element *e1 = solver->getElementVar(s1);
        Element *e2 = solver->getElementVar(s2);
        Element *e4 = solver->getElementVar(s3);
-       Boolean *overflow = solver->getBooleanVar(2);
-       Set *d1[] = {s1, s2};
+       BooleanEdge overflow = solver->getBooleanVar(2);
        //change the overflow flag
-       Table *t1 = solver->createTable(d1, 2, s2);
+       Table *t1 = solver->createTable(s2);
        uint64_t row1[] = {1, 5};
        uint64_t row2[] = {2, 3};
        uint64_t row3[] = {1, 7};
@@ -44,13 +43,13 @@ int main(int numargs, char **argv) {
        Element *tmparray[] = {e1, e2};
        Element *e3 = solver->applyFunction(f1, tmparray, 2, overflow);
 
-       Set *deq[] = {s3,s2};
-       Predicate *lte = solver->createPredicateOperator(SATC_LTE, deq, 2);
+       Predicate *lte = solver->createPredicateOperator(SATC_LTE);
        Element *inputs2 [] = {e4, e3};
-       Boolean *pred = solver->applyPredicate(lte, inputs2, 2);
+       BooleanEdge pred = solver->applyPredicate(lte, inputs2, 2);
        solver->addConstraint(pred);
+       solver->serialize();
 
-       if (solver->startEncoding() == 1)
+       if (solver->solve() == 1)
                printf("e1=%" PRIu64 " e2=%" PRIu64 " e3=%" PRIu64 " e4=%" PRIu64 " overFlow:%d\n",
                                         solver->getElementValue(e1), solver->getElementValue(e2), solver->getElementValue(e3),
                                         solver->getElementValue(e4), solver->getBooleanValue(overflow));