mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 08:28:44 +00:00
Code Activity

testing fixplex

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-08-11 08:33:19 -07:00
parent 8d43d98710
commit 2b6308af74
2 changed files with 69 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -608,7 +608,7 @@ namespace polysat {
return; return;
if (m_var_is_touched.get(v, false)) if (m_var_is_touched.get(v, false))
return; return;
m_var_is_touched.set(v, true); m_var_is_touched.setx(v, true, false);
for (auto idx : m_var2ineqs[v]) { for (auto idx : m_var2ineqs[v]) {
if (!m_ineqs[idx].is_active) { if (!m_ineqs[idx].is_active) {
m_ineqs[idx].is_active = true; m_ineqs[idx].is_active = true;

83
src/test/fixplex.cpp
View file

@ -370,17 +370,17 @@ namespace polysat {
} }
static void test_lp( static void test_lp(
vector<svector<std::pair<unsigned, uint32_t>>> const& rows, vector<svector<std::pair<unsigned, uint64_t>>> const& rows,
svector<ineq> const& ineqs, svector<ineq> const& ineqs,
vector<mod_interval<uint32_t>> const& bounds) { vector<mod_interval<uint64_t>> const& bounds) {
unsigned num_vars = 1; unsigned num_vars = 0;
for (auto const& row : rows) for (auto const& row : rows)
for (auto [v, c] : row) for (auto [v, c] : row)
num_vars = std::max(num_vars, v + 1); num_vars = std::max(num_vars, v);
for (auto const& i : ineqs) for (auto const& i : ineqs)
num_vars = std::max(num_vars, std::max(i.v, i.w)); num_vars = std::max(num_vars, std::max(i.v, i.w));
num_vars = std::max(bounds.size(), num_vars); num_vars = std::max(bounds.size(), num_vars + 1);
ast_manager m; ast_manager m;
reg_decl_plugins(m); reg_decl_plugins(m);
@ -423,21 +423,20 @@ namespace polysat {
unsigned v = 0; unsigned v = 0;
for (auto const& b : bounds) { for (auto const& b : bounds) {
++index; ++index;
if (!b.is_free()) { if (b.is_free())
continue;
fp.set_bounds(v, rational(b.lo, rational::ui64()), rational(b.hi, rational::ui64()), index); fp.set_bounds(v, rational(b.lo, rational::ui64()), rational(b.hi, rational::ui64()), index);
if (b.lo < b.hi) { expr_ref A(mk_ult(variables.get(v), bv.mk_numeral(b.hi, 32)), m);
solver.assert_expr(bv.mk_ule(bv.mk_numeral(b.lo, 32), variables.get(v))); expr_ref B(bv.mk_ule(bv.mk_numeral(b.lo, 32), variables.get(v)), m);
solver.assert_expr(mk_ult(variables.get(v), bv.mk_numeral(b.hi, 32)));
} if (b.lo < b.hi)
solver.assert_expr(m.mk_and(A, B));
else if (b.hi == 0) else if (b.hi == 0)
solver.assert_expr(bv.mk_ule(bv.mk_numeral(b.lo, 32), variables.get(v))); solver.assert_expr(B);
else { else
expr_ref a(mk_ult(variables.get(v), bv.mk_numeral(b.hi, 32)), m); solver.assert_expr(m.mk_or(A, B));
expr_ref b(bv.mk_ule(bv.mk_numeral(b.lo, 32), variables.get(v)), m);
solver.assert_expr(m.mk_or(a, b));
}
}
} }
solver.display(std::cout); solver.display(std::cout);
@ -449,7 +448,23 @@ namespace polysat {
std::cout << r1 << " " << r2 << "\n" << fp << "\n"; std::cout << r1 << " " << r2 << "\n" << fp << "\n";
if (r2 == l_true) { if (r2 == l_true) {
std::cout << "TBD validate solution\n"; for (auto const& row : rows) {
uint64_t sum = 0;
for (auto col : row)
sum += col.second * fp.value(col.first);
SASSERT(sum == 0);
}
for (unsigned i = 0; i < bounds.size(); ++i) {
uint64_t val = fp.value(i);
uint64_t lo = bounds[i].lo;
uint64_t hi = bounds[i].hi;
SASSERT(!(lo < hi || hi == 0) || lo <= val && val < hi);
SASSERT(!(hi > lo) || val < hi || lo <= val);
}
for (auto const& i : ineqs) {
SASSERT(fp.value(i.v) <= fp.value(i.w));
SASSERT(!i.strict || fp.value(i.v) < fp.value(i.w));
}
} }
if (r1 == r2) { if (r1 == r2) {
std::cout << "agree\n"; std::cout << "agree\n";
@ -471,11 +486,41 @@ namespace polysat {
static void test_lps(random_gen& r, unsigned num_vars, unsigned num_rows, unsigned num_vars_per_row, unsigned num_ineqs) { static void test_lps(random_gen& r, unsigned num_vars, unsigned num_rows, unsigned num_vars_per_row, unsigned num_ineqs) {
vector<svector<std::pair<unsigned, uint64_t>>> rows;
svector<ineq> ineqs;
vector<mod_interval<uint64_t>> bounds;
for (unsigned i = 0; i < num_vars; ++i) {
uint64_t l = (r() % 2 == 0) ? r() % 100 : (0 - r() % 10);
uint64_t h = (r() % 2 == 0) ? r() % 100 : (0 - r() % 10);
bounds.push_back(mod_interval<uint64_t>(l, h));
}
for (unsigned i = 0; i < num_ineqs; ++i) {
var_t v = r() % num_vars;
var_t w = r() % num_vars;
ineqs.push_back(ineq(v, w, 0, 0 == r() % 2));
}
for (unsigned i = 0; i < num_rows; ++i) {
svector<std::pair<unsigned, uint64_t>> row;
uint64_t coeff = (r() % 2 == 0) ? r() % 100 : (0 - r() % 10);
row.push_back(std::make_pair(i, coeff));
for (unsigned j = 0; j + 1 < num_vars_per_row; ++j) {
var_t v = (r() % (num_vars - num_vars_per_row)) + num_vars_per_row;
coeff = (r() % 2 == 0) ? r() % 100 : (0 - r() % 10);
row.push_back(std::make_pair(v, coeff));
}
rows.push_back(row);
}
test_lp(rows, ineqs, bounds);
} }
static void test_lps() { static void test_lps() {
random_gen r; random_gen r;
for (unsigned i = 0; i < 10000; ++i)
test_lps(r, 6, 0, 0, 5);
for (unsigned i = 0; i < 10000; ++i)
test_lps(r, 6, 3, 3, 0);
for (unsigned i = 0; i < 10000; ++i)
test_lps(r, 6, 3, 3, 3); test_lps(r, 6, 3, 3, 3);
} }
@ -483,6 +528,8 @@ namespace polysat {
void tst_fixplex() { void tst_fixplex() {
polysat::test_lps();
polysat::test_ineq_propagation1(); polysat::test_ineq_propagation1();
polysat::test_ineq_propagation2(); polysat::test_ineq_propagation2();
polysat::test_ineqs(); polysat::test_ineqs();