mirror of
https://github.com/Z3Prover/z3
synced 2025-07-19 02:42:02 +00:00
enable pb theory always as pb terms can be introduced during transformations. Issue #884
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
256a0e2d82
commit
9cfd412cd0
2 changed files with 4 additions and 5 deletions
|
@ -570,11 +570,11 @@ namespace opt {
|
||||||
m_opt_solver = alloc(opt_solver, m, m_params, m_fm);
|
m_opt_solver = alloc(opt_solver, m, m_params, m_fm);
|
||||||
m_opt_solver->set_logic(m_logic);
|
m_opt_solver->set_logic(m_logic);
|
||||||
m_solver = m_opt_solver.get();
|
m_solver = m_opt_solver.get();
|
||||||
|
m_opt_solver->ensure_pb();
|
||||||
|
|
||||||
if (opt_params(m_params).priority() == symbol("pareto") ||
|
//if (opt_params(m_params).priority() == symbol("pareto") ||
|
||||||
(opt_params(m_params).priority() == symbol("lex") && m_objectives.size() > 1)) {
|
// (opt_params(m_params).priority() == symbol("lex") && m_objectives.size() > 1)) {
|
||||||
m_opt_solver->ensure_pb();
|
//}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void context::setup_arith_solver() {
|
void context::setup_arith_solver() {
|
||||||
|
|
|
@ -154,7 +154,6 @@ namespace sat {
|
||||||
if (!m_subsumption && !m_elim_blocked_clauses && !m_resolution)
|
if (!m_subsumption && !m_elim_blocked_clauses && !m_resolution)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
initialize();
|
initialize();
|
||||||
|
|
||||||
CASSERT("sat_solver", s.check_invariant());
|
CASSERT("sat_solver", s.check_invariant());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue