Don't do unnecessary work in polarity computation

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

diff --git a/src/Test/tablepredicencodetest.cc b/src/Test/tablepredicencodetest.cc
old mode 100644 (file)
new mode 100755 (executable)
index ee60877..47113fd
--- a/src/Test/tablepredicencodetest.cc
+++ b/src/Test/tablepredicencodetest.cc
@@ -40,25 +40,25 @@ int main(int numargs, char **argv) {
        solver->addTableEntry(t1, row4, 3, false);
        solver->addTableEntry(t1, row5, 3, false);
        solver->addTableEntry(t1, row6, 3, true);
-       Predicate *p1 = solver->createPredicateTable(t1, FLAGIFFUNDEFINED);
-       Boolean *undef = solver->getBooleanVar(2);
+       Predicate *p1 = solver->createPredicateTable(t1, SATC_FLAGIFFUNDEFINED);
+       BooleanEdge undef = solver->getBooleanVar(2);
        Element *tmparray[] = {e1, e2, e3};
-       Boolean *b1 = solver->applyPredicateTable(p1, tmparray, 3, undef);
+       BooleanEdge b1 = solver->applyPredicateTable(p1, tmparray, 3, undef);
        solver->addConstraint(b1);
 
        Set *deq[] = {s3,s2};
        Predicate *gte = solver->createPredicateOperator(SATC_GTE, deq, 2);
        Element *inputs2 [] = {e3, e2};
-       Boolean *pred = solver->applyPredicate(gte, inputs2, 2);
+       BooleanEdge pred = solver->applyPredicate(gte, inputs2, 2);
        solver->addConstraint(pred);
 
        Set *d1[] = {s1, s2};
        Predicate *eq = solver->createPredicateOperator(SATC_EQUALS, d1, 2);
        Element *tmparray2[] = {e1, e2};
-       Boolean *pred2 = solver->applyPredicate(eq, tmparray2, 2);
+       BooleanEdge pred2 = solver->applyPredicate(eq, tmparray2, 2);
        solver->addConstraint(pred2);
 
-       if (solver->startEncoding() == 1)
+       if (solver->solve() == 1)
                printf("e1=%" PRIu64 " e2=%" PRIu64 " e3=%" PRIu64 " undefFlag:%d\n",
                                         solver->getElementValue(e1), solver->getElementValue(e2),
                                         solver->getElementValue(e3), solver->getBooleanValue(undef));