Small edit

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

diff --git a/src/Test/logicopstest.cc b/src/Test/logicopstest.cc
index df80fa73a50239a8a83d4fb56916917f68f5dbdd..a21e9c6fbe1d27ff6aa5fa53ce6864784eb9d793 100644 (file)
--- a/src/Test/logicopstest.cc
+++ b/src/Test/logicopstest.cc
@@ -12,19 +12,19 @@ int main(int numargs, char **argv) {
        Boolean *b2 = solver->getBooleanVar(0);
        Boolean *b3 = solver->getBooleanVar(0);
        Boolean *b4 = solver->getBooleanVar(0);
-       //L_AND, L_OR, L_NOT, L_XOR, L_IMPLIES
-       Boolean * barray1[]={b1,b2};
-       Boolean *andb1b2 = solver->applyLogicalOperation(L_AND, barray1, 2);
-       Boolean * barray2[]={andb1b2, b3};
-       Boolean *imply = solver->applyLogicalOperation(L_IMPLIES, barray2, 2);
+       //SATC_AND, SATC_OR, SATC_NOT, SATC_XOR, SATC_IMPLIES
+       Boolean *barray1[] = {b1,b2};
+       Boolean *andb1b2 = solver->applyLogicalOperation(SATC_AND, barray1, 2);
+       Boolean *barray2[] = {andb1b2, b3};
+       Boolean *imply = solver->applyLogicalOperation(SATC_IMPLIES, barray2, 2);
        solver->addConstraint(imply);
-       Boolean * barray3[] ={b3};
-       Boolean *notb3 = solver->applyLogicalOperation(L_NOT, barray3, 1);
-       Boolean * barray4[] ={notb3, b4};
-       solver->addConstraint(solver->applyLogicalOperation(L_OR, barray4, 2));
-       Boolean * barray5[] ={b1, b4};
-       solver->addConstraint(solver->applyLogicalOperation(L_XOR, barray5, 2));
-       if (solver->startEncoding() == 1)
+       Boolean *barray3[] = {b3};
+       Boolean *notb3 = solver->applyLogicalOperation(SATC_NOT, barray3, 1);
+       Boolean *barray4[] = {notb3, b4};
+       solver->addConstraint(solver->applyLogicalOperation(SATC_OR, barray4, 2));
+       Boolean *barray5[] = {b1, b4};
+       solver->addConstraint(solver->applyLogicalOperation(SATC_XOR, barray5, 2));
+       if (solver->solve() == 1)
                printf("b1=%d b2=%d b3=%d b4=%d\n",
                                         solver->getBooleanValue(b1), solver->getBooleanValue(b2),
                                         solver->getBooleanValue(b3), solver->getBooleanValue(b4));