Add integer simplification rule

This adds the rule “(F in G) === (F = G) if F and G are integer
variables” to the simplification rule tableau
This commit is contained in:
Patrick Lühne 2018-04-21 18:12:43 +02:00
parent 97190ace71
commit d950b8ec1a
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF

View File

@ -2,6 +2,7 @@
#include <optional> #include <optional>
#include <anthem/Arithmetics.h>
#include <anthem/ASTCopy.h> #include <anthem/ASTCopy.h>
#include <anthem/Equality.h> #include <anthem/Equality.h>
#include <anthem/SimplificationVisitors.h> #include <anthem/SimplificationVisitors.h>
@ -512,6 +513,31 @@ struct SimplificationRuleNegatedComparison
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
struct SimplificationRuleIntegerSetInclusion
{
static constexpr const auto Description = "(F in G) === (F = G) if F and G are integer variables";
static OperationResult apply(ast::Formula &formula)
{
if (!formula.is<ast::In>())
return OperationResult::Unchanged;
auto &in = formula.get<ast::In>();
const auto isElementInteger = isInteger(in.element);
const auto isSetInteger = isInteger(in.set);
if (isElementInteger != EvaluationResult::True || isSetInteger != EvaluationResult::True)
return OperationResult::Unchanged;
formula = ast::Formula::make<ast::Comparison>(ast::Comparison::Operator::Equal, std::move(in.element), std::move(in.set));
return OperationResult::Changed;
}
};
////////////////////////////////////////////////////////////////////////////////////////////////////
const auto simplifyWithDefaultRules = const auto simplifyWithDefaultRules =
simplify simplify
< <
@ -526,7 +552,8 @@ const auto simplifyWithDefaultRules =
SimplificationRuleSubsumptionInBiconditionals, SimplificationRuleSubsumptionInBiconditionals,
SimplificationRuleDeMorganForConjunctions, SimplificationRuleDeMorganForConjunctions,
SimplificationRuleImplicationFromDisjunction, SimplificationRuleImplicationFromDisjunction,
SimplificationRuleNegatedComparison SimplificationRuleNegatedComparison,
SimplificationRuleIntegerSetInclusion
>; >;
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////