edits

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

diff --git a/src/Test/ordertest.cc b/src/Test/ordertest.cc
index eef8c3620f992324a6ae99e59d0633c53e833ae5..e2d974bed1d3893d256d491bcc9fd284a7f9e508 100644 (file)
--- a/src/Test/ordertest.cc
+++ b/src/Test/ordertest.cc
@@ -7,17 +7,17 @@
  * Result: O(5,1)=0 O(1,4)=0 O(5,4)=0 O(1,5)=1 O(1111,5)=2
  */
 int main(int numargs, char **argv) {
-       CSolver *solver = allocCSolver();
+       CSolver *solver = new CSolver();
        uint64_t set1[] = {5, 1, 4};
-       Set *s = createSet(solver, 0, set1, 3);
-       Order *order = createOrder(solver, TOTAL, s);
-       Boolean *b1 =  orderConstraint(solver, order, 5, 1);
-       Boolean *b2 =  orderConstraint(solver, order, 1, 4);
-       addConstraint(solver, b1);
-       addConstraint(solver, b2);
-       if (startEncoding(solver) == 1)
+       Set *s = solver->createSet(0, set1, 3);
+       Order *order = solver->createOrder(TOTAL, s);
+       Boolean *b1 =  solver->orderConstraint(order, 5, 1);
+       Boolean *b2 =  solver->orderConstraint(order, 1, 4);
+       solver->addConstraint(b1);
+       solver->addConstraint(b2);
+       if (solver->startEncoding() == 1)
                printf("SAT\n");
        else
                printf("UNSAT\n");
-       deleteSolver(solver);
+       delete solver;
 }