diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-10-09 06:13:17 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-10-09 06:13:17 +0000 |
commit | e40b31aa45ca9e34b92875a8a1079ae953922956 (patch) | |
tree | aa607aca0669a53df81045a530ce4e5e2a35eef9 | |
parent | 97668b64994c5749a5a75822136de49841d2c15d (diff) |
bug fixes to model gen
-rw-r--r-- | src/smt/smt_engine.cpp | 2 | ||||
-rw-r--r-- | src/theory/uf/morgan/theory_uf_morgan.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 3a4fd90e9..5de1cd0b1 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -410,7 +410,7 @@ Expr SmtEngine::getValue(Expr e) Node resultNode = d_theoryEngine->getValue(n); // type-check the result we got - Assert(resultNode.getType(true) == eNode.getType()); + Assert(resultNode.isNull() || resultNode.getType(true) == eNode.getType()); return Expr(d_exprManager, new Node(resultNode)); } diff --git a/src/theory/uf/morgan/theory_uf_morgan.cpp b/src/theory/uf/morgan/theory_uf_morgan.cpp index a1eec9d4c..fe1f3106e 100644 --- a/src/theory/uf/morgan/theory_uf_morgan.cpp +++ b/src/theory/uf/morgan/theory_uf_morgan.cpp @@ -462,10 +462,9 @@ Node TheoryUFMorgan::getValue(TNode n, TheoryEngine* engine) { if(n.getType().isBoolean()) { if(d_cc.areCongruent(d_trueNode, n)) { return nodeManager->mkConst(true); - } else if(d_cc.areCongruent(d_trueNode, n)) { + } else if(d_cc.areCongruent(d_falseNode, n)) { return nodeManager->mkConst(false); } - return Node::null(); } return d_cc.normalize(n); |