diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2017-03-02 14:45:21 -0600 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2017-03-02 14:45:21 -0600 |
| commit | 1f4b954a2cc7667a56a3007fa75c125fba93ed23 (patch) | |
| tree | ea8734e89aa5fba170781c7148d3fd886c597d4e /test/unit | |
| parent | 21b0cedd7dadd96e5d256885e3b65a926a7e4a81 (diff) | |
Eliminate Boolean term conversion. Generalizes removeITE pass to remove Boolean terms, treats distinguished BOOLEAN_TERM_VARIABLE kind as theory literal. Fixes bugs 597, 604, 651, 652, 691, 694. Add regressions.
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/expr/node_black.h | 10 | ||||
| -rw-r--r-- | test/unit/prop/cnf_stream_white.h | 4 | ||||
| -rw-r--r-- | test/unit/util/boolean_simplification_black.h | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/test/unit/expr/node_black.h b/test/unit/expr/node_black.h index eb0ff3ad3..bd00b770f 100644 --- a/test/unit/expr/node_black.h +++ b/test/unit/expr/node_black.h @@ -346,14 +346,14 @@ public: } void testIffNode() { - /* Node iffNode(const Node& right) const; */ + /* Node eqNode(const Node& right) const; */ Node left = d_nodeManager->mkConst(true); Node right = d_nodeManager->mkNode(NOT, (d_nodeManager->mkConst(false))); - Node eq = left.iffNode(right); + Node eq = left.eqNode(right); - TS_ASSERT(IFF == eq.getKind()); + TS_ASSERT(EQUAL == eq.getKind()); TS_ASSERT(2 == eq.getNumChildren()); TS_ASSERT(*(eq.begin()) == left); @@ -398,8 +398,8 @@ public: Node n = d_nodeManager->mkNode(NOT, a); TS_ASSERT(NOT == n.getKind()); - n = d_nodeManager->mkNode(IFF, a, b); - TS_ASSERT(IFF == n.getKind()); + n = d_nodeManager->mkNode(EQUAL, a, b); + TS_ASSERT(EQUAL == n.getKind()); Node x = d_nodeManager->mkSkolem("x", *d_realType); Node y = d_nodeManager->mkSkolem("y", *d_realType); diff --git a/test/unit/prop/cnf_stream_white.h b/test/unit/prop/cnf_stream_white.h index c93accd33..7a6281e5b 100644 --- a/test/unit/prop/cnf_stream_white.h +++ b/test/unit/prop/cnf_stream_white.h @@ -178,7 +178,7 @@ class CnfStreamWhite : public CxxTest::TestSuite { d_nodeManager->mkNode( kind::IMPLIES, d_nodeManager->mkNode(kind::AND, a, b), d_nodeManager->mkNode( - kind::IFF, d_nodeManager->mkNode(kind::OR, c, d), + kind::EQUAL, d_nodeManager->mkNode(kind::OR, c, d), d_nodeManager->mkNode(kind::NOT, d_nodeManager->mkNode(kind::XOR, e, f)))), false, false, RULE_INVALID, Node::null()); @@ -203,7 +203,7 @@ class CnfStreamWhite : public CxxTest::TestSuite { NodeManagerScope nms(d_nodeManager); Node a = d_nodeManager->mkVar(d_nodeManager->booleanType()); Node b = d_nodeManager->mkVar(d_nodeManager->booleanType()); - d_cnfStream->convertAndAssert(d_nodeManager->mkNode(kind::IFF, a, b), false, + d_cnfStream->convertAndAssert(d_nodeManager->mkNode(kind::EQUAL, a, b), false, false, RULE_INVALID, Node::null()); TS_ASSERT(d_satSolver->addClauseCalled()); } diff --git a/test/unit/util/boolean_simplification_black.h b/test/unit/util/boolean_simplification_black.h index cb5e20db9..e5c18ff83 100644 --- a/test/unit/util/boolean_simplification_black.h +++ b/test/unit/util/boolean_simplification_black.h @@ -94,10 +94,10 @@ public: hfc = d_nm->mkNode(kind::APPLY_UF, h, fc); gfb = d_nm->mkNode(kind::APPLY_UF, g, fb); - ac = d_nm->mkNode(kind::IFF, a, c); - ffbd = d_nm->mkNode(kind::IFF, ffb, d); - efhc = d_nm->mkNode(kind::IFF, e, fhc); - dfa = d_nm->mkNode(kind::IFF, d, fa); + ac = d_nm->mkNode(kind::EQUAL, a, c); + ffbd = d_nm->mkNode(kind::EQUAL, ffb, d); + efhc = d_nm->mkNode(kind::EQUAL, e, fhc); + dfa = d_nm->mkNode(kind::EQUAL, d, fa); // this test is designed for >= 10 removal threshold TS_ASSERT_LESS_THAN_EQUALS(10u, |