3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-28 06:57:55 +00:00

coallesce common code

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-04-19 20:27:39 -07:00
parent b300041075
commit 3f5ed8ff11
5 changed files with 97 additions and 121 deletions

View file

@ -22,23 +22,27 @@ Notes:
#include "solver_na2as.h"
#include "card2bv_tactic.h"
#include "pb_sls.h"
namespace opt {
class sls_solver : public solver_na2as {
ast_manager& m;
ref<solver> m_solver;
scoped_ptr<bvsls_opt_engine> m_sls;
scoped_ptr<bvsls_opt_engine> m_bvsls;
scoped_ptr<smt::pb_sls> m_pbsls;
pb::card_pb_rewriter m_pb2bv;
model_ref m_model;
expr_ref m_objective;
params_ref m_params;
symbol m_engine;
public:
sls_solver(ast_manager & m, solver* s, expr* to_maximize, params_ref const& p):
solver_na2as(m),
m(m),
m_solver(s),
m_sls(0),
m_bvsls(0),
m_pbsls(0),
m_pb2bv(m),
m_objective(to_maximize, m)
{
@ -48,13 +52,16 @@ namespace opt {
virtual void updt_params(params_ref & p) {
m_solver->updt_params(p);
m_params.copy(p);
opt_params _p(p);
m_engine = _p.sls_engine();
}
virtual void collect_param_descrs(param_descrs & r) {
m_solver->collect_param_descrs(r);
}
virtual void collect_statistics(statistics & st) const {
m_solver->collect_statistics(st);
// TBD: m_sls->get_stats();
if (m_bvsls) m_bvsls->collect_statistics(st);
if (m_pbsls) m_pbsls->collect_statistics(st);
}
virtual void assert_expr(expr * t) {
m_solver->assert_expr(t);
@ -79,8 +86,11 @@ namespace opt {
m_pb2bv.set_cancel(f);
#pragma omp critical (this)
{
if (m_sls) {
m_sls->set_cancel(f);
if (m_bvsls) {
m_bvsls->set_cancel(f);
}
if (m_pbsls) {
m_pbsls->set_cancel(f);
}
}
}
@ -95,7 +105,7 @@ namespace opt {
}
virtual void display(std::ostream & out) const {
m_solver->display(out);
// if (m_sls) m_sls->display(out);
// if (m_bvsls) m_bvsls->display(out);
}
protected:
@ -105,15 +115,11 @@ namespace opt {
lbool r = m_solver->check_sat(num_assumptions, assumptions);
if (r == l_true) {
m_solver->get_model(m_model);
#pragma omp critical (this)
{
m_sls = alloc(bvsls_opt_engine, m, m_params);
if (m_engine == symbol("pb")) {
}
assertions2sls();
opt_result or = m_sls->optimize(m_objective, m_model, true);
SASSERT(or.is_sat == l_true || or.is_sat == l_undef);
if (or.is_sat == l_true) {
m_sls->get_model(m_model);
else {
bvsls_opt();
}
}
return r;
@ -124,6 +130,7 @@ namespace opt {
virtual void pop_core(unsigned n) {
m_solver->pop(n);
}
private:
void assertions2sls() {
expr_ref tmp(m);
@ -141,7 +148,43 @@ namespace opt {
SASSERT(result.size() == 1);
goal* r = result[0];
for (unsigned i = 0; i < r->size(); ++i) {
m_sls->assert_expr(r->form(i));
m_bvsls->assert_expr(r->form(i));
}
}
void pbsls_opt() {
#pragma omp critical (this)
{
m_pbsls = alloc(smt::pb_sls, m);
}
m_pbsls->set_model(m_model);
m_pbsls->updt_params(m_params);
for (unsigned i = 0; i < m_solver->get_num_assertions(); ++i) {
m_pbsls->add(m_solver->get_assertion(i));
}
#if 0
TBD:
for (unsigned i = 0; i < m_num_soft; ++i) {
m_pbsls->add(m_soft[i].get(), m_weights[i].get());
}
#endif
lbool is_sat = (*m_pbsls.get())();
if (is_sat == l_true) {
m_bvsls->get_model(m_model);
}
}
void bvsls_opt() {
#pragma omp critical (this)
{
m_bvsls = alloc(bvsls_opt_engine, m, m_params);
}
assertions2sls();
opt_result or = m_bvsls->optimize(m_objective, m_model, true);
SASSERT(or.is_sat == l_true || or.is_sat == l_undef);
if (or.is_sat == l_true) {
m_bvsls->get_model(m_model);
}
}