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 4f19f67..47113fd
--- a/src/Test/tablepredicencodetest.cc
+++ b/src/Test/tablepredicencodetest.cc
@@ -15,54 +15,54 @@
  * Result: e1=1, e2=1, e3=6 OR 10 OR 19, overflow=1
  */
 int main(int numargs, char **argv) {
-       CSolver *solver = allocCSolver();
+       CSolver *solver = new CSolver();
        uint64_t set1[] = {1, 2};
        uint64_t set2[] = {1, 3, 5, 7};
        uint64_t set3[] = {6, 10, 19};
-       Set *s1 = createSet(solver, 0, set1, 2);
-       Set *s2 = createSet(solver, 0, set2, 4);
-       Set *s3 = createSet(solver, 0, set3, 3);
-       Element *e1 = getElementVar(solver, s1);
-       Element *e2 = getElementVar(solver, s2);
-       Element *e3 = getElementVar(solver, s3);
+       Set *s1 = solver->createSet(0, set1, 2);
+       Set *s2 = solver->createSet(0, set2, 4);
+       Set *s3 = solver->createSet(0, set3, 3);
+       Element *e1 = solver->getElementVar(s1);
+       Element *e2 = solver->getElementVar(s2);
+       Element *e3 = solver->getElementVar(s3);
        Set *d2[] = {s1, s2, s3};
        //change the overflow flag
-       Table *t1 = createTableForPredicate(solver, d2, 3);
+       Table *t1 = solver->createTableForPredicate(d2, 3);
        uint64_t row1[] = {1, 5, 6};
        uint64_t row2[] = {2, 3, 19};
        uint64_t row3[] = {1, 3, 19};
        uint64_t row4[] = {2, 7, 10};
        uint64_t row5[] = {1, 7, 6};
        uint64_t row6[] = {2, 5, 6};
-       addTableEntry(solver, t1, row1, 3, true);
-       addTableEntry(solver, t1, row2, 3, true);
-       addTableEntry(solver, t1, row3, 3, false);
-       addTableEntry(solver, t1, row4, 3, false);
-       addTableEntry(solver, t1, row5, 3, false);
-       addTableEntry(solver, t1, row6, 3, true);
-       Predicate *p1 = createPredicateTable(solver, t1, FLAGIFFUNDEFINED);
-       Boolean *undef = getBooleanVar(solver, 2);
-       Element * tmparray[] = {e1, e2, e3};
-       Boolean *b1 = applyPredicateTable(solver, p1, tmparray, 3, undef);
-       addConstraint(solver, b1);
+       solver->addTableEntry(t1, row1, 3, true);
+       solver->addTableEntry(t1, row2, 3, true);
+       solver->addTableEntry(t1, row3, 3, false);
+       solver->addTableEntry(t1, row4, 3, false);
+       solver->addTableEntry(t1, row5, 3, false);
+       solver->addTableEntry(t1, row6, 3, true);
+       Predicate *p1 = solver->createPredicateTable(t1, SATC_FLAGIFFUNDEFINED);
+       BooleanEdge undef = solver->getBooleanVar(2);
+       Element *tmparray[] = {e1, e2, e3};
+       BooleanEdge b1 = solver->applyPredicateTable(p1, tmparray, 3, undef);
+       solver->addConstraint(b1);
 
        Set *deq[] = {s3,s2};
-       Predicate *gte = createPredicateOperator(solver, GTE, deq, 2);
+       Predicate *gte = solver->createPredicateOperator(SATC_GTE, deq, 2);
        Element *inputs2 [] = {e3, e2};
-       Boolean *pred = applyPredicate(solver, gte, inputs2, 2);
-       addConstraint(solver, pred);
+       BooleanEdge pred = solver->applyPredicate(gte, inputs2, 2);
+       solver->addConstraint(pred);
 
        Set *d1[] = {s1, s2};
-       Predicate *eq = createPredicateOperator(solver, EQUALS, d1, 2);
-       Element * tmparray2[] = {e1, e2};
-       Boolean *pred2 = applyPredicate(solver, eq, tmparray2, 2);
-       addConstraint(solver, pred2);
+       Predicate *eq = solver->createPredicateOperator(SATC_EQUALS, d1, 2);
+       Element *tmparray2[] = {e1, e2};
+       BooleanEdge pred2 = solver->applyPredicate(eq, tmparray2, 2);
+       solver->addConstraint(pred2);
 
-       if (startEncoding(solver) == 1)
-               printf("e1=%llu e2=%llu e3=%llu undefFlag:%d\n",
-                                        getElementValue(solver,e1), getElementValue(solver, e2),
-                                        getElementValue(solver, e3), getBooleanValue(solver, undef));
+       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));
        else
                printf("UNSAT\n");
-       deleteSolver(solver);
+       delete solver;
 }