Skip to content

Clean up decision_proceduret #4440

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.

Sign up for GitHub

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
merged 6 commits into from
Mar 27, 2019
Merged

Clean up decision_proceduret #4440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66bcf44
Move decision_proceduret into solvers/prop
peterschrammel Mar 26, 2019
77e1277
Move get_number_of_solver_calls into decision_proceduret
peterschrammel Mar 26, 2019
ab69742
Move literal convert/get to decision_proceduret
peterschrammel Mar 26, 2019
5fad3f1
Make dec_solve protected
peterschrammel Mar 26, 2019
3a68094
Clean up and document decision_proceduret
peterschrammel Mar 26, 2019
c56f992
Remove unused operator
peterschrammel Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove unused operator 
Operator for conversion is not intuitive anyway.
  • Loading branch information
@peterschrammel
peterschrammel committed Mar 27, 2019
commit c56f9929b68b4382327e160f9c77153f2720a44a
5 changes: 0 additions & 5 deletions src/solvers/prop/decision_procedure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ decision_proceduret::~decision_proceduret()
{
}

literalt decision_proceduret::operator()(const exprt &expr)
{
return convert(expr);
}

decision_proceduret::resultt decision_proceduret::operator()()
{
return dec_solve();
Expand Down
3 changes: 0 additions & 3 deletions src/solvers/prop/decision_procedure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ class decision_proceduret
/// Convert a Boolean expression and return the corresponding literal
virtual literalt convert(const exprt &expr) = 0;

/// Convert a Boolean expression and return the corresponding literal
literalt operator()(const exprt &);

/// Result of running the decision procedure
enum class resultt
{
Expand Down