First attempt at refactoring Oracles
#2709
Merged
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## main #2709 +/- ##
==========================================
+ Coverage 78.51% 78.53% +0.01%
==========================================
Files 461 463 +2
Lines 15885 15904 +19
Branches 2609 2590 -19
==========================================
+ Hits 12472 12490 +18
- Misses 3413 3414 +1
... and 2 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
konnov
reviewed
Sep 4, 2023
| * An oracle that uses an integer variable. Although using integers as an oracle is the most straightforward decision, | ||
| * do not use this oracle by default. It is handy, when reasoning about sequences. | ||
| * | ||
| * TODO: add tests |
There was a problem hiding this comment.
How about adding tests? :)
This should be super-easy with the new design. Just a bunch of unit tests
There was a problem hiding this comment.
Well, I sort of ran out of time before PI week, but yes, adding tests is on my todo list
thpani
reviewed
Sep 4, 2023
...cmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/stratifiedRules/aux/oracles/IntOracle.scala
Outdated
Show resolved
Hide resolved
...cmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/stratifiedRules/aux/oracles/IntOracle.scala
Outdated
Show resolved
Hide resolved
tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/stratifiedRules/aux/oracles/Oracle.scala
Outdated
Show resolved
Hide resolved
…iedRules/aux/oracles/Oracle.scala Co-authored-by: Thomas Pani <[email protected]>
thpani
approved these changes
Sep 6, 2023
...src/test/scala/at/forsyte/apalache/tla/bmcmt/stratifiedRules/aux/oracles/TestIntOracle.scala
Outdated
Show resolved
Hide resolved
This was referenced Sep 13, 2023
Merged
Merged
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.
make fmt-fix(or had formatting run automatically on all files edited)./unreleased/for any new functionalityFirst step towards #2708.
The PR makes the following changes to https://github.com/informalsystems/apalache/blob/6bb36acc1ad88fdeba21d45b67663b1e792e29c6/tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/rules/aux/Oracle.scala:
SymbStateis replaced byRewriterScopecaseAssertionshas been changed such that the optional sequence is now anOption, instead of treating the empty sequence as a special case.getIndexOfOracleValueFromModel(previouslyevalPosition) has been changed, to no longer includestate. Upon inspection, none of the oracle implementations ever accessed this parameter.IntOracleis implemented with the changes above as a prototype. Note that tests are currently missing for the IntOracle, and will be added in a subsequent PR.