mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-25 01:55:32 +00:00
Code Activity

na (#5536)

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-09-05 03:13:08 -07:00 • committed by GitHub
parent 9f387f5738
commit ed200f4214
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/math/polysat/fixplex.h
View file

@ -281,6 +281,26 @@ namespace polysat {
bool propagate_row_bounds();
bool is_satisfied();
struct backoff {
unsigned m_tries = 0;
unsigned m_delay = 1;
bool should_propagate() {
return ++m_tries >= m_delay;
}
void update(bool progress) {
m_tries = 0;
if (progress)
m_delay = 1;
else
++m_delay;
}
};
backoff m_propagate_eqs_backoff;
backoff m_propagate_bounds_backoff;
var_t select_smallest_var() { return m_to_patch.empty()?null_var:m_to_patch.erase_min(); }
lbool make_var_feasible(var_t x_i);
bool is_infeasible_row(var_t x);

27
src/math/polysat/fixplex_def.h
View file

@ -154,6 +154,8 @@ namespace polysat {
m_base_vars.reset();
}
// TBD: where does parity test go?
template<typename Ext>
lbool fixplex<Ext>::make_feasible() {
++m_stats.m_num_checks;
@ -1073,8 +1075,14 @@ namespace polysat {
bool fixplex<Ext>::propagate_row_eqs() {
if (!m_to_patch.empty())
return true;
if (m_eq_rows.empty())
return true;
if (!m_propagate_eqs_backoff.should_propagate())
return true;
unsigned sz = m_var_eqs.size();
for (unsigned i : m_eq_rows)
get_offset_eqs(row(i));
get_offset_eqs(row(i));
m_propagate_eqs_backoff.update(sz < m_var_eqs.size());
m_eq_rows.reset();
return !inconsistent();
}
@ -1167,16 +1175,21 @@ namespace polysat {
template<typename Ext>
bool fixplex<Ext>::propagate_row_bounds() {
return true;
// return true;
// TBD
if (inconsistent())
return false;
if (!m_to_patch.empty())
return true;
return true;
if (m_bound_rows.empty())
return true;
if (!m_propagate_bounds_backoff.should_propagate())
return true;
for (unsigned i : m_bound_rows)
if (!propagate_row(row(i)))
return false;
m_bound_rows.reset();
m_propagate_bounds_backoff.update(false); // should backoff be adjusted?
return true;
}
@ -1199,7 +1212,6 @@ namespace polysat {
ineq i0 = m_ineqs[i0_idx];
numeral old_lo = m_vars[i0.w].lo;
SASSERT(!m_inconsistent);
// std::cout << "propagate " << i0 << "\n";
if (!propagate_ineq(i0))
return l_false;
on_stack.reset();
@ -1216,9 +1228,6 @@ namespace polysat {
auto& i_out = m_ineqs[ineqs[ineq_out]];
if (i.w != i_out.v)
continue;
// for (unsigned j = 0; j < stack.size(); ++j)
// std::cout << " ";
// std::cout << " -> " << i_out << "\n";
old_lo = m_vars[i_out.w].lo;
if (!propagate_ineq(i_out))
return l_false;
@ -1320,7 +1329,7 @@ namespace polysat {
return res;
// SASSERT(in_bounds(v));
}
return l_true;
return true;
}
template<typename Ext>
@ -1422,7 +1431,7 @@ namespace polysat {
template<typename Ext>
bool fixplex<Ext>::new_bound(row const& r, var_t x, mod_interval<numeral> const& range) {
if (range.contains(m_vars[x]))
return l_true;
return true;
SASSERT(!inconsistent());
bool was_fixed = is_fixed(x);
u_dependency* dep = row2dep(r);

6
src/test/fixplex.cpp
View file

@ -465,7 +465,7 @@ namespace polysat {
solver.assert_expr(m.mk_or(A, B));
}
lbool r1 = solver.check();
lbool r1 = l_undef; // solver.check();
lbool r2 = fp.make_feasible();
std::cout << r1 << " " << r2 << "\n";
@ -566,9 +566,9 @@ namespace polysat {
static void test_lps() {
random_gen r;
for (unsigned i = 0; i < 10000; ++i)
for (unsigned i = 0; i < 10000; ++i)
test_lps(r, 6, 3, 3, 3);
return;
return;
for (unsigned i = 0; i < 10000; ++i)
test_lps(r, 6, 3, 3, 0);
return;