mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

indentation

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-09-22 16:48:40 -07:00
parent 5d8779b05d
commit 940775d12d
3 changed files with 70 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
src/math/lp/nla_core.cpp
View file

@ -22,24 +22,25 @@ namespace nla {
typedef lp::lar_term term; typedef lp::lar_term term;
core::core(lp::lar_solver& s, params_ref const& p, reslimit& lim, std_vector<lp::implied_bound>& implied_bounds) : m_evars(), core::core(lp::lar_solver& s, params_ref const& p, reslimit& lim, std_vector<lp::implied_bound>& implied_bounds) :
lra(s), m_evars(),
m_reslim(lim), lra(s),
m_params(p), m_reslim(lim),
m_tangents(this), m_params(p),
m_basics(this), m_tangents(this),
m_order(this), m_basics(this),
m_monotone(this), m_order(this),
m_powers(*this), m_monotone(this),
m_divisions(*this), m_powers(*this),
m_intervals(this, lim), m_divisions(*this),
m_monomial_bounds(this), m_intervals(this, lim),
m_horner(this), m_monomial_bounds(this),
m_grobner(this), m_horner(this),
m_emons(m_evars), m_grobner(this),
m_use_nra_model(false), m_emons(m_evars),
m_nra(s, m_nra_lim, *this), m_use_nra_model(false),
m_implied_bounds(implied_bounds) { m_nra(s, m_nra_lim, *this),
m_implied_bounds(implied_bounds) {
m_nlsat_delay = lp_settings().nlsat_delay(); m_nlsat_delay = lp_settings().nlsat_delay();
lra.m_find_monics_with_changed_bounds_func = [&](const indexed_uint_set& columns_with_changed_bounds) { lra.m_find_monics_with_changed_bounds_func = [&](const indexed_uint_set& columns_with_changed_bounds) {
for (const auto& m : m_emons) { for (const auto& m : m_emons) {
@ -1839,8 +1840,7 @@ bool core::improve_bounds() {
return bounds_improved; return bounds_improved;
} }
bool core::is_linear(const svector<lpvar>& m, lpvar& zero_var, lpvar& non_fixed) bool core::is_linear(const svector<lpvar>& m, lpvar& zero_var, lpvar& non_fixed) {
{
zero_var = non_fixed = null_lpvar; zero_var = non_fixed = null_lpvar;
unsigned n_of_non_fixed = 0; unsigned n_of_non_fixed = 0;
for (lpvar v : m) { for (lpvar v : m) {
@ -1858,8 +1858,7 @@ bool core::is_linear(const svector<lpvar>& m, lpvar& zero_var, lpvar& non_fixed)
return n_of_non_fixed <= 1; return n_of_non_fixed <= 1;
} }
void core::add_lower_bound_monic(lpvar j, const lp::mpq& v, bool is_strict, std::function<u_dependency*()> explain_dep) void core::add_lower_bound_monic(lpvar j, const lp::mpq& v, bool is_strict, std::function<u_dependency*()> explain_dep) {
{
TRACE("add_bound", lra.print_column_info(j, tout) << std::endl;); TRACE("add_bound", lra.print_column_info(j, tout) << std::endl;);
j = lra.column_to_reported_index(j); j = lra.column_to_reported_index(j);
unsigned k; unsigned k;
@ -1876,67 +1875,63 @@ void core::add_lower_bound_monic(lpvar j, const lp::mpq& v, bool is_strict, std:
} }
} }
void core::add_upper_bound_monic(lpvar j, const lp::mpq& bound_val, bool is_strict, std::function<u_dependency*()> explain_dep) void core::add_upper_bound_monic(lpvar j, const lp::mpq& bound_val, bool is_strict, std::function<u_dependency*()> explain_dep) {
{ j = lra.column_to_reported_index(j);
j = lra.column_to_reported_index(j); unsigned k;
unsigned k; if (!m_improved_upper_bounds.find(j, k)) {
if (!m_improved_upper_bounds.find(j, k)) { m_improved_upper_bounds.insert(j, static_cast<unsigned>(m_implied_bounds.size()));
m_improved_upper_bounds.insert(j, static_cast<unsigned>(m_implied_bounds.size())); m_implied_bounds.push_back(lp::implied_bound(bound_val, j, false, is_strict, explain_dep));
m_implied_bounds.push_back(lp::implied_bound(bound_val, j, false, is_strict, explain_dep)); }
} else {
else { auto& found_bound = m_implied_bounds[k];
auto& found_bound = m_implied_bounds[k]; if (bound_val > found_bound.m_bound || (bound_val == found_bound.m_bound && !found_bound.m_strict && is_strict)) {
if (bound_val > found_bound.m_bound || (bound_val == found_bound.m_bound && !found_bound.m_strict && is_strict)) { found_bound = lp::implied_bound(bound_val, j, false, is_strict, explain_dep);
found_bound = lp::implied_bound(bound_val, j, false, is_strict, explain_dep); TRACE("add_bound", lra.print_implied_bound(found_bound, tout););
TRACE("add_bound", lra.print_implied_bound(found_bound, tout);); }
} }
} }
}
bool core::upper_bound_is_available(unsigned j) const bool core::upper_bound_is_available(unsigned j) const {
{ switch (get_column_type(j)) {
switch (get_column_type(j)) {
case lp::column_type::fixed: case lp::column_type::fixed:
case lp::column_type::boxed: case lp::column_type::boxed:
case lp::column_type::upper_bound: case lp::column_type::upper_bound:
return true; return true;
default: default:
return false; return false;
}
} }
}
bool core::lower_bound_is_available(unsigned j) const bool core::lower_bound_is_available(unsigned j) const {
{ switch (get_column_type(j)) {
switch (get_column_type(j)) {
case lp::column_type::fixed: case lp::column_type::fixed:
case lp::column_type::boxed: case lp::column_type::boxed:
case lp::column_type::lower_bound: case lp::column_type::lower_bound:
return true; return true;
default: default:
return false; return false;
}
} }
}
void core::propagate_monic_with_non_fixed(lpvar monic_var, const svector<lpvar>& vars, lpvar non_fixed, const rational& k) void core::propagate_monic_with_non_fixed(lpvar monic_var, const svector<lpvar>& vars, lpvar non_fixed, const rational& k) {
{ lp::impq bound_value;
lp::impq bound_value; new_lemma lemma(*this, "propagate monic with non fixed");
new_lemma lemma(*this, "propagate monic with non fixed"); // using += to not assert thath the inequality does not hold
// using += to not assert thath the inequality does not hold lemma += ineq(term(rational(1), monic_var, -k, non_fixed), llc::EQ, 0);
lemma += ineq(term(rational(1), monic_var, -k, non_fixed), llc::EQ, 0); lp::explanation exp;
lp::explanation exp; for (auto v : m_emons[monic_var].vars()) {
for (auto v : m_emons[monic_var].vars()) { if (v == non_fixed) continue;
if (v == non_fixed) continue; u_dependency* dep = lra.get_column_lower_bound_witness(v);
u_dependency* dep = lra.get_column_lower_bound_witness(v); for (auto ci : lra.flatten(dep)) {
for (auto ci : lra.flatten(dep)) { exp.push_back(ci);
exp.push_back(ci); }
} dep = lra.get_column_upper_bound_witness(v);
dep = lra.get_column_upper_bound_witness(v); for (auto ci : lra.flatten(dep)) {
for (auto ci : lra.flatten(dep)) { exp.push_back(ci);
exp.push_back(ci); }
} }
lemma &= exp;
} }
lemma &= exp;
}
void core::propagate_monic_with_all_fixed(lpvar monic_var, const svector<lpvar>& vars, const rational& k) void core::propagate_monic_with_all_fixed(lpvar monic_var, const svector<lpvar>& vars, const rational& k)
{ {

2
src/smt/smt_context.cpp
View file

@ -4522,6 +4522,8 @@ namespace smt {
theory_var_list * l = n->get_th_var_list(); theory_var_list * l = n->get_th_var_list();
theory_id th_id = l->get_id(); theory_id th_id = l->get_id();
verbose_stream() << "num parents " << n->get_num_parents() << "\n";
for (enode * parent : enode::parents(n)) { for (enode * parent : enode::parents(n)) {
app* p = parent->get_expr(); app* p = parent->get_expr();
family_id fid = p->get_family_id(); family_id fid = p->get_family_id();

13
src/smt/theory_lra.cpp
View file

@ -1480,6 +1480,7 @@ public:
m_model_eqs.reset(); m_model_eqs.reset();
svector<lpvar> vars; svector<lpvar> vars;
theory_var sz = static_cast<theory_var>(th.get_num_vars()); theory_var sz = static_cast<theory_var>(th.get_num_vars());
verbose_stream() << "check " << sz << "\n";
for (theory_var v = 0; v < sz; ++v) { for (theory_var v = 0; v < sz; ++v) {
enode * n1 = get_enode(v); enode * n1 = get_enode(v);
if (!th.is_relevant_and_shared(n1)) { if (!th.is_relevant_and_shared(n1)) {
@ -1528,12 +1529,16 @@ public:
unsigned old_sz = m_assume_eq_candidates.size(); unsigned old_sz = m_assume_eq_candidates.size();
unsigned num_candidates = 0; unsigned num_candidates = 0;
int start = ctx().get_random_value(); int start = ctx().get_random_value();
verbose_stream() << "assume-eqs " << sz << "\n";
unsigned num_relevant = 0;
for (theory_var i = 0; i < sz; ++i) { for (theory_var i = 0; i < sz; ++i) {
theory_var v = (i + start) % sz; theory_var v = (i + start) % sz;
enode* n1 = get_enode(v); enode* n1 = get_enode(v);
verbose_stream() << enode_pp(n1, ctx()) << "\n";
if (!th.is_relevant_and_shared(n1)) { if (!th.is_relevant_and_shared(n1)) {
continue; continue;
} }
++num_relevant;
ensure_column(v); ensure_column(v);
if (!is_registered_var(v)) if (!is_registered_var(v))
continue; continue;
@ -1552,6 +1557,7 @@ public:
} }
} }
verbose_stream() << "candidates " << num_candidates << " num relevant " << num_relevant << "\n";
if (num_candidates > 0) { if (num_candidates > 0) {
ctx().push_trail(restore_vector(m_assume_eq_candidates, old_sz)); ctx().push_trail(restore_vector(m_assume_eq_candidates, old_sz));
} }
@ -2200,13 +2206,12 @@ public:
void propagate_bounds_for_touched_monomials() { void propagate_bounds_for_touched_monomials() {
m_nla->init_bound_propagation(m_nla_lemma_vector); m_nla->init_bound_propagation(m_nla_lemma_vector);
for (unsigned v : m_nla->monics_with_changed_bounds()) { for (unsigned v : m_nla->monics_with_changed_bounds())
m_nla->calculate_implied_bounds_for_monic(v); m_nla->calculate_implied_bounds_for_monic(v);
}
m_nla->reset_monics_with_changed_bounds(); m_nla->reset_monics_with_changed_bounds();
for (const auto & l:m_nla_lemma_vector) { for (const auto & l : m_nla_lemma_vector)
false_case_of_check_nla(l); false_case_of_check_nla(l);
}
} }
void propagate_bounds_with_nlp() { void propagate_bounds_with_nlp() {