move solver_hardness.* from solvers/ to goto-symex/ #6549
Merged
+102
−129
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
kroening
force-pushed
the
move_solver_hardness
branch
7 times, most recently
from
6fc9694 to
0dea53e
Compare
Codecov Report
@@ Coverage Diff @@
## develop #6549 +/- ##
========================================
Coverage 75.98% 75.98%
========================================
Files 1578 1578
Lines 181058 181047 -11
========================================
- Hits 137579 137573 -6
+ Misses 43479 43474 -5
Continue to review full report at Codecov.
|
kroening
requested review from
NlightNFotis,
TGWDB,
chrisr-diffblue,
martin-cs,
peterschrammel,
romainbrenguier,
tautschnig and
thomasspriggs
as code owners
tautschnig
approved these changes
Dec 29, 2021
Comment on lines
+168
to
+183
| // FIXME I am wondering if there is a way to do this that is a bit less | ||
| // dynamically typed. | ||
| if( | ||
| auto prop_conv_solver = | ||
| dynamic_cast<prop_conv_solvert *>(&maybe_hardness_collector)) | ||
| { | ||
| if(auto hardness_collector = prop_conv_solver->get_hardness_collector()) | ||
| { | ||
| if(hardness_collector->solver_hardness) | ||
| { | ||
| auto &solver_hardness = static_cast<solver_hardnesst &>( | ||
| *(hardness_collector->solver_hardness)); | ||
| handler(solver_hardness); | ||
| } | ||
| } | ||
| } |
Collaborator
There was a problem hiding this comment.
This surely is better already, but don't we just need a Boolean function like virtual bool set_hardness_collector(solver_hardnesst *) { return false; } in prop_conv_solvert that will return true when the hardness collector was accepted?
Collaborator
Author
There was a problem hiding this comment.
To make the above go away, you'd need a get_solver_hardness_collector, or the like, in decision_proceduret. I can't get myself to do that.
This class is inherently linked to goto-programs and goto-symex, and introduces a surprising dependency on these corresponding includes into the solver classes. This commit moves these classes into the goto-symex directory, removing the dependency by introducing a base class for the callback.
kroening
force-pushed
the
move_solver_hardness
branch
from
0dea53e to
76cbf3e
Compare
peterschrammel
approved these changes
Jan 12, 2022
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.
The
solver_hardnesstclass is inherently linked to goto-programs and goto-symex, andintroduces a surprising dependency on these corresponding includes into the
solver classes.
This commit moves the class into the goto-symex directory, removing the
dependency by introducing a base class for the callback.