patrick/anthem
1
0
Fork 0
Code Issues 15 Releases 21 Activity

Merge branch 'fix-comparisons' of github.com:potassco/anthem into develop

Browse Source
This commit is contained in:
Patrick Lühne 2017-03-28 17:21:15 +02:00
commit 67864fedbd
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
## (unreleased) ## (unreleased)
Bug Fixes:
* fixes incorrectly simplified rules with comparisons
## 0.1.2 (2017-03-23) ## 0.1.2 (2017-03-23)
Features: Features:

2
src/anthem/Simplification.cpp
View File

@ -81,7 +81,7 @@ struct ReplaceVariableInFormulaVisitor : public ast::RecursiveFormulaVisitor<Rep
static void accept(ast::Comparison &comparison, ast::Formula &, const ast::Variable &variable, const ast::Term &term) static void accept(ast::Comparison &comparison, ast::Formula &, const ast::Variable &variable, const ast::Term &term)
{ {
comparison.left.accept(ReplaceVariableInTermVisitor(), comparison.left, variable, term); comparison.left.accept(ReplaceVariableInTermVisitor(), comparison.left, variable, term);
comparison.right.accept(ReplaceVariableInTermVisitor(), comparison.left, variable, term); comparison.right.accept(ReplaceVariableInTermVisitor(), comparison.right, variable, term);
} }
static void accept(ast::In &in, ast::Formula &, const ast::Variable &variable, const ast::Term &term) static void accept(ast::In &in, ast::Formula &, const ast::Variable &variable, const ast::Term &term)

8
tests/TestSimplification.cpp
View File

@ -41,4 +41,12 @@ TEST_CASE("[simplification] Rules are simplified correctly", "[simplified]")
REQUIRE(output.str() == "((not covered(I) and I in 1..n) -> #false)\n"); REQUIRE(output.str() == "((not covered(I) and I in 1..n) -> #false)\n");
} }
SECTION("comparisons")
{
input << ":- M > N.";
anthem::translate("input", input, context);
REQUIRE(output.str() == "(M > N -> #false)\n");
}
} }