Skip to content

Honour --sat-solver with refinement #7544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

tautschnig
Copy link
Collaborator

All work done in this PR is to support the last commit here; please review commit-by-commit.

  • Each commit message has a non-empty body, explaining why the change was made.
  • Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • n/a My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

Move all SAT solver construction to a procedure of its own. This is in
preparation of also constructing the solver for refinement, which does
not yet honour the new `--sat-solver` option.
With the preceding commit we now apply RAII, making default-constructing
unnecessary.
@tautschnig tautschnig self-assigned this Feb 16, 2023
Refinement should not unconditionally use the default solver despite the
user specifying `--sat-solver <solver>` on the command line.
@tautschnig tautschnig force-pushed the features/refinement-sat-solver branch from acfd5cd to f1be42c Compare February 16, 2023 14:05
@codecov
Copy link

codecov bot commented Feb 16, 2023

Codecov Report

Base: 78.21% // Head: 78.48% // Increases project coverage by +0.27% 🎉

Coverage data is based on head (f1be42c) compared to base (989029d).
Patch coverage: 68.57% of modified lines in pull request are covered.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7544      +/-   ##
===========================================
+ Coverage    78.21%   78.48%   +0.27%     
===========================================
  Files         1667     1667              
  Lines       191473   191463      -10     
===========================================
+ Hits        149758   150277     +519     
+ Misses       41715    41186     -529     
Impacted Files Coverage Δ
src/goto-checker/solver_factory.h 100.00% <ø> (ø)
src/goto-checker/solver_factory.cpp 79.66% <68.57%> (-0.51%) ⬇️
src/ansi-c/expr2c.cpp 67.75% <0.00%> (+0.04%) ⬆️
src/util/simplify_expr.cpp 85.40% <0.00%> (+0.39%) ⬆️
src/util/std_types.h 95.82% <0.00%> (+0.59%) ⬆️
src/util/simplify_expr_int.cpp 88.26% <0.00%> (+1.05%) ⬆️
src/util/std_expr.h 93.15% <0.00%> (+1.66%) ⬆️
src/util/run.cpp 75.63% <0.00%> (+1.68%) ⬆️
src/util/expr.h 97.14% <0.00%> (+1.90%) ⬆️
... and 29 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tautschnig tautschnig merged commit a3dc29d into diffblue:develop Feb 16, 2023
@tautschnig tautschnig deleted the features/refinement-sat-solver branch February 16, 2023 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants