mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 02:42:02 +00:00
Code Activity

Merge branch 'opt' of https://git01.codeplex.com/z3 into opt

Browse source
This commit is contained in:
Nikolaj Bjorner 2015-01-20 16:38:55 -08:00
commit e50e02e656
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/opt/maxres.cpp
View file

@ -925,7 +925,7 @@ public:
} }
void verify_assignment() { void verify_assignment() {
IF_VERBOSE(0, verbose_stream() << "verify assignment\n";); IF_VERBOSE(1, verbose_stream() << "verify assignment\n";);
ref<solver> smt_solver = mk_smt_solver(m, m_params, symbol()); ref<solver> smt_solver = mk_smt_solver(m, m_params, symbol());
for (unsigned i = 0; i < s().get_num_assertions(); ++i) { for (unsigned i = 0; i < s().get_num_assertions(); ++i) {
smt_solver->assert_expr(s().get_assertion(i)); smt_solver->assert_expr(s().get_assertion(i));

5
src/sat/sat_solver.cpp
View file

@ -930,8 +930,11 @@ namespace sat {
void solver::reinit_assumptions() { void solver::reinit_assumptions() {
if (tracking_assumptions() && scope_lvl() == 0) { if (tracking_assumptions() && scope_lvl() == 0) {
TRACE("sat", tout << m_assumptions.size() << "\n";); TRACE("sat", tout << m_assumptions << "\n";);
push(); push();
for (unsigned i = 0; !inconsistent() && i < m_user_scope_literals.size(); ++i) {
assign(~m_user_scope_literals[i], justification());
}
for (unsigned i = 0; !inconsistent() && i < m_assumptions.size(); ++i) { for (unsigned i = 0; !inconsistent() && i < m_assumptions.size(); ++i) {
assign(m_assumptions[i], justification()); assign(m_assumptions[i], justification());
} }

4
src/smt/theory_arith_aux.h
View file

@ -417,7 +417,7 @@ namespace smt {
template<typename Ext> template<typename Ext>
void theory_arith<Ext>::atom::display(theory_arith<Ext> const& th, std::ostream& out) const { void theory_arith<Ext>::atom::display(theory_arith<Ext> const& th, std::ostream& out) const {
literal l(get_bool_var(), !m_is_true); literal l(get_bool_var(), !m_is_true);
out << "v" << get_var() << " " << get_bound_kind() << " " << get_k() << " "; out << "v" << bound::get_var() << " " << bound::get_bound_kind() << " " << get_k() << " ";
out << l << ":"; out << l << ":";
th.get_context().display_detailed_literal(out, l); th.get_context().display_detailed_literal(out, l);
} }
@ -747,7 +747,7 @@ namespace smt {
template<typename Ext> template<typename Ext>
void theory_arith<Ext>::derived_bound::display(theory_arith<Ext> const& th, std::ostream& out) const { void theory_arith<Ext>::derived_bound::display(theory_arith<Ext> const& th, std::ostream& out) const {
out << "v" << m_var << " " << get_bound_kind() << " " << get_value(); out << "v" << bound::get_var() << " " << bound::get_bound_kind() << " " << bound::get_value();
ast_manager& m = th.get_manager(); ast_manager& m = th.get_manager();
for (unsigned i = 0; i < m_eqs.size(); ++i) { for (unsigned i = 0; i < m_eqs.size(); ++i) {