completed serializer/deserializer

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

diff --git a/src/Test/tablefuncencodetest.cc b/src/Test/tablefuncencodetest.cc
index 10e7f859555cc09a6a2b91338d38ea1a5312480a..680d1c64fc47bf47db01593827a05d168d42196f 100644 (file)
--- a/src/Test/tablefuncencodetest.cc
+++ b/src/Test/tablefuncencodetest.cc
@@ -24,7 +24,7 @@ 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);
+       BooleanEdge overflow = solver->getBooleanVar(2);
        Set *d1[] = {s1, s2};
        //change the overflow flag
        Table *t1 = solver->createTable(d1, 2, s2);
@@ -40,18 +40,19 @@ int main(int numargs, char **argv) {
        solver->addTableEntry(t1, row4, 2, 5);
        solver->addTableEntry(t1, row5, 2, 3);
        solver->addTableEntry(t1, row6, 2, 5);
-       Function *f1 = solver->completeTable(t1, FLAGIFFUNDEFINED);
-       Element * tmparray[]={e1, e2};
+       Function *f1 = solver->completeTable(t1, SATC_FLAGIFFUNDEFINED);
+       Element *tmparray[] = {e1, e2};
        Element *e3 = solver->applyFunction(f1, tmparray, 2, overflow);
 
        Set *deq[] = {s3,s2};
-       Predicate *lte = solver->createPredicateOperator(LTE, deq, 2);
+       Predicate *lte = solver->createPredicateOperator(SATC_LTE, deq, 2);
        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)
-               printf("e1=%llu e2=%llu e3=%llu e4=%llu overFlow:%d\n",
+       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));
        else