Remove old TermLike simplifier #2767
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ve-old-term-simplifier
|
…re into remove-old-term-simplifier
This reverts commit 17bd41e.
4 tasks
…mplification' into remove-old-term-simplifier
…/kore into implement-predicate-generator
…re into remove-old-term-simplifier
…re into remove-old-term-simplifier
|
|
Contributor
Author
|
I tested the performance locally and |
|
|
andreiburdusa
approved these changes
Sep 8, 2021
andreiburdusa
approved these changes
Sep 8, 2021
| simplifiedTerm <- simplifyConditionalTerm sideCondition rewritingTerm | ||
| simplifyCondition sideCondition $ | ||
| Pattern.andCondition simplifiedTerm rewritingCondition | ||
| reevaluateFunctions = simplifyPattern |
Contributor
There was a problem hiding this comment.
Do you think it's useful to keep reevaluateFunctions since it's just another name for simplifyPattern?
|
|
emarzion
reviewed
Sep 9, 2021
| SideCondition variable -> | ||
| Bool | ||
| areIncludedIn predicates sideCondition = | ||
| all (flip isIncludedIn sideCondition) predicates |
Contributor
There was a problem hiding this comment.
If isIncludedIn is only used here, does it make sense to flip the arguments here instead of simply flipping the arguments in the definition? Of course the name would need to be modified.
Contributor
Author
There was a problem hiding this comment.
I wanted it to be similar to the elem function, so that the order of the arguments is intuitive.
emarzion
approved these changes
Sep 9, 2021
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2770
Needs #2766, #2758, #2796 and #2805
The
TermLikesimplifier does not simplify predicates anymore, removing the complicated loop inside theTermLikesimplifier. The interface to the simplifier is nowsimplifyPattern, which takes care of simplifying the term and condition together. This has resulted in multiple unit tests needing changes, in particular those which had too general test data (TermLikes which containedPredicates).Review checklist
The author performs the actions on the checklist. The reviewer evaluates the work and checks the boxes as they are completed.