Skip to content

Commit 4434cee

Browse files
NikolajBjornerNikolajBjorner
committed
merge
1 parent 20c5404 commit 4434cee

File tree

2 files changed

+80
-81
lines changed

2 files changed

+80
-81
lines changed

‎src/math/lp/nra_solver.cpp

+80-79
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace nra {
1818
typedef nla::mon_eq mon_eq;
1919

2020
typedef nla::variable_map_type variable_map_type;
21+
2122
struct solver::imp {
2223
lp::lar_solver& lra;
2324
reslimit& m_limit;
@@ -68,12 +69,12 @@ struct solver::imp {
6869
}
6970
}
7071

71-
for (auto const& m : m_nla_core.m_to_refine)
72-
todo.push_back(m);
72+
for (auto const& m : m_nla_core.m_to_refine)
73+
todo.push_back(m);
7374

7475
for (unsigned i = 0; i < todo.size(); ++i) {
7576
auto v = todo[i];
76-
if (visited.contains(v))
77+
if (visited.contains(v))
7778
continue;
7879
visited.insert(v);
7980
var2occurs.reserve(v + 1);
@@ -82,22 +83,22 @@ struct solver::imp {
8283
auto const& c = lra.constraints()[ci];
8384
for (auto const& [coeff, w] : c.coeffs())
8485
todo.push_back(w);
85-
}
86+
}
8687
for (auto w : var2occurs[v].monics)
8788
todo.push_back(w);
8889

8990
if (lra.column_corresponds_to_term(v)) {
9091
m_term_set.insert(v);
9192
lp::tv ti = lp::tv::raw(lra.column_to_reported_index(v));
92-
for (auto kv : lra.get_term(ti))
93-
todo.push_back(kv.column().index());
93+
for (auto kv : lra.get_term(ti))
94+
todo.push_back(kv.column().index());
9495
}
9596

9697
if (m_nla_core.is_monic_var(v)) {
9798
m_mon_set.insert(v);
9899
for (auto w : m_nla_core.emons()[v])
99100
todo.push_back(w);
100-
}
101+
}
101102
}
102103
}
103104

@@ -112,7 +113,7 @@ struct solver::imp {
112113
TBD: use partial model from lra_solver to prime the state of nlsat_solver.
113114
TBD: explore more incremental ways of applying nlsat (using assumptions)
114115
*/
115-
lbool check() {
116+
lbool check() {
116117
SASSERT(need_check());
117118
m_values = nullptr;
118119
m_nlsat = alloc(nlsat::solver, m_limit, m_params, false);
@@ -125,18 +126,18 @@ struct solver::imp {
125126
// add linear inequalities from lra_solver
126127
for (auto ci : m_constraint_set)
127128
add_constraint(ci);
128-
129+
129130
// add polynomial definitions.
130-
for (auto const& m : m_mon_set)
131-
add_monic_eq(m_nla_core.emons()[m]);
131+
for (auto const& m : m_mon_set)
132+
add_monic_eq(m_nla_core.emons()[m]);
132133

133134
// add term definitions.
134-
for (unsigned i : m_term_set)
135+
for (unsigned i : m_term_set)
135136
add_term(i);
136137

137138
lbool r = l_undef;
138139
try {
139-
r = m_nlsat->check();
140+
r = m_nlsat->check();
140141
}
141142
catch (z3_exception&) {
142143
if (m_limit.is_canceled()) {
@@ -146,30 +147,31 @@ struct solver::imp {
146147
throw;
147148
}
148149
}
149-
TRACE("nra",
150+
#if 0
151+
TRACE("nra",
150152
m_nlsat->display(tout << r << "\n");
151-
display(tout);
152-
for (auto [j, x] : m_lp2nl) tout << "j" << j << " := x" << x << "\n";
153-
);
153+
display(tout);
154+
for (auto [j, x] : m_lp2nl) tout << "j" << j << " := x" << x << "\n";);
155+
#endif
154156
switch (r) {
155-
case l_true:
157+
case l_true:
156158
m_nla_core.set_use_nra_model(true);
157-
lra.init_model();
158-
for (lp::constraint_index ci : lra.constraints().indices())
159-
if (!check_constraint(ci)) {
160-
IF_VERBOSE(0, verbose_stream() << "constraint " << ci << " violated\n";
161-
lra.constraints().display(verbose_stream()));
162-
UNREACHABLE();
163-
return l_undef;
164-
}
165-
for (auto const& m : m_nla_core.emons()) {
166-
if (!check_monic(m)) {
167-
IF_VERBOSE(0, verbose_stream() << "monic " << m << " violated\n";
168-
lra.constraints().display(verbose_stream()));
169-
UNREACHABLE();
170-
return l_undef;
171-
}
159+
lra.init_model();
160+
for (lp::constraint_index ci : lra.constraints().indices())
161+
if (!check_constraint(ci)) {
162+
IF_VERBOSE(0, verbose_stream() << "constraint " << ci << " violated\n";
163+
lra.constraints().display(verbose_stream()));
164+
UNREACHABLE();
165+
return l_undef;
172166
}
167+
for (auto const& m : m_nla_core.emons()) {
168+
if (!check_monic(m)) {
169+
IF_VERBOSE(0, verbose_stream() << "monic " << m << " violated\n";
170+
lra.constraints().display(verbose_stream()));
171+
UNREACHABLE();
172+
return l_undef;
173+
}
174+
}
173175
break;
174176
case l_false: {
175177
lp::explanation ex;
@@ -186,9 +188,9 @@ struct solver::imp {
186188
}
187189
case l_undef:
188190
break;
189-
}
191+
}
190192
return r;
191-
}
193+
}
192194

193195
void add_monic_eq_bound(mon_eq const& m) {
194196
if (!lra.column_has_lower_bound(m.var()) &&
@@ -322,22 +324,22 @@ struct solver::imp {
322324
m_lp2nl.reset();
323325
m_term_set.reset();
324326
for (auto const& eq : eqs)
325-
add_eq(*eq);
326-
for (auto const& m : m_nla_core.emons())
327-
if (any_of(m.vars(), [&](lp::lpvar v) { return m_lp2nl.contains(v); }))
328-
add_monic_eq_bound(m);
329-
for (unsigned i : m_term_set)
330-
add_term(i);
327+
add_eq(*eq);
328+
for (auto const& m : m_nla_core.emons())
329+
if (any_of(m.vars(), [&](lp::lpvar v) { return m_lp2nl.contains(v); }))
330+
add_monic_eq_bound(m);
331+
for (unsigned i : m_term_set)
332+
add_term(i);
331333
for (auto const& [v, w] : m_lp2nl) {
332-
if (lra.column_has_lower_bound(v))
333-
add_lb(lra.get_lower_bound(v), w, lra.get_column_lower_bound_witness(v));
334-
if (lra.column_has_upper_bound(v))
335-
add_ub(lra.get_upper_bound(v), w, lra.get_column_upper_bound_witness(v));
334+
if (lra.column_has_lower_bound(v))
335+
add_lb(lra.get_lower_bound(v), w, lra.get_column_lower_bound_witness(v));
336+
if (lra.column_has_upper_bound(v))
337+
add_ub(lra.get_upper_bound(v), w, lra.get_column_upper_bound_witness(v));
336338
}
337339

338340
lbool r = l_undef;
339341
try {
340-
r = m_nlsat->check();
342+
r = m_nlsat->check();
341343
}
342344
catch (z3_exception&) {
343345
if (m_limit.is_canceled()) {
@@ -349,13 +351,13 @@ struct solver::imp {
349351
}
350352

351353
switch (r) {
352-
case l_true:
354+
case l_true:
353355
m_nla_core.set_use_nra_model(true);
354356
lra.init_model();
355-
for (lp::constraint_index ci : lra.constraints().indices())
357+
for (lp::constraint_index ci : lra.constraints().indices())
356358
if (!check_constraint(ci))
357-
return l_undef;
358-
for (auto const& m : m_nla_core.emons()) {
359+
return l_undef;
360+
for (auto const& m : m_nla_core.emons())
359361
if (!check_monic(m))
360362
return l_undef;
361363
break;
@@ -365,7 +367,7 @@ struct solver::imp {
365367
m_nlsat->get_core(core);
366368
u_dependency_manager dm;
367369
vector<unsigned, false> lv;
368-
for (auto c : core)
370+
for (auto c : core)
369371
dm.linearize(static_cast<u_dependency*>(c), lv);
370372
for (auto ci : lv)
371373
ex.push_back(ci);
@@ -375,8 +377,7 @@ struct solver::imp {
375377
}
376378
case l_undef:
377379
break;
378-
}
379-
380+
}
380381
return r;
381382
}
382383

@@ -388,18 +389,18 @@ struct solver::imp {
388389
m_term_set.reset();
389390
for (auto const& eq : eqs)
390391
add_eq(eq);
391-
for (auto const& m : m_nla_core.emons())
392-
add_monic_eq(m);
392+
for (auto const& m : m_nla_core.emons())
393+
add_monic_eq(m);
393394
for (auto const& [v, w] : m_lp2nl) {
394395
if (lra.column_has_lower_bound(v))
395396
add_lb(lra.get_lower_bound(v), w);
396397
if (lra.column_has_upper_bound(v))
397398
add_ub(lra.get_upper_bound(v), w);
398399
}
399-
400+
400401
lbool r = l_undef;
401402
try {
402-
r = m_nlsat->check();
403+
r = m_nlsat->check();
403404
}
404405
catch (z3_exception&) {
405406
if (m_limit.is_canceled()) {
@@ -412,46 +413,44 @@ struct solver::imp {
412413

413414
if (r == l_true)
414415
return r;
415-
416+
416417
IF_VERBOSE(0, verbose_stream() << "check-nra " << r << "\n";
417418
m_nlsat->display(verbose_stream());
418419
for (auto const& [v, w] : m_lp2nl) {
419420
if (lra.column_has_lower_bound(v))
420421
verbose_stream() << "x" << w << " >= " << lra.get_lower_bound(v) << "\n";
421422
if (lra.column_has_upper_bound(v))
422423
verbose_stream() << "x" << w << " <= " << lra.get_upper_bound(v) << "\n";
423-
});
424-
425-
424+
});
425+
426426
return r;
427427
}
428-
428+
429429
void add_eq(dd::solver::equation const& eq) {
430430
add_eq(eq.poly(), eq.dep());
431431
}
432-
432+
433433
void add_eq(dd::pdd const& eq, nlsat::assumption a = nullptr) {
434434
dd::pdd normeq = eq;
435435
rational lc(1);
436-
for (auto const& [c, m] : eq)
436+
for (auto const& [c, m] : eq)
437437
lc = lcm(denominator(c), lc);
438438
if (lc != 1)
439439
normeq *= lc;
440440
polynomial::manager& pm = m_nlsat->pm();
441441
polynomial::polynomial_ref p(pdd2polynomial(normeq), pm);
442-
bool is_even[1] = { false };
443-
polynomial::polynomial* ps[1] = { p };
444-
nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even);
442+
bool is_even[1] = {false};
443+
polynomial::polynomial* ps[1] = {p};
444+
nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even);
445445
m_nlsat->mk_clause(1, &lit, a);
446446
}
447447

448-
449448
void add_lb(lp::impq const& b, unsigned w, nlsat::assumption a = nullptr) {
450449
polynomial::manager& pm = m_nlsat->pm();
451450
polynomial::polynomial_ref p(pm.mk_polynomial(w), pm);
452451
add_lb(b, p, a);
453452
}
454-
453+
455454
void add_ub(lp::impq const& b, unsigned w, nlsat::assumption a = nullptr) {
456455
polynomial::manager& pm = m_nlsat->pm();
457456
polynomial::polynomial_ref p(pm.mk_polynomial(w), pm);
@@ -473,8 +472,8 @@ struct solver::imp {
473472
polynomial::manager& pm = m_nlsat->pm();
474473
polynomial::polynomial_ref p2(pm.mk_const(bound), pm);
475474
polynomial::polynomial_ref p(pm.sub(p1, p2), pm);
476-
polynomial::polynomial* ps[1] = { p };
477-
bool is_even[1] = { false };
475+
polynomial::polynomial* ps[1] = {p};
476+
bool is_even[1] = {false};
478477
nlsat::literal lit = m_nlsat->mk_ineq_literal(k, 1, ps, is_even);
479478
if (neg)
480479
lit.neg();
@@ -486,10 +485,10 @@ struct solver::imp {
486485
polynomial::polynomial_ref p1(pm.mk_polynomial(w), pm);
487486
add_bound(bound, p1, neg, k, a);
488487
}
489-
488+
490489
polynomial::polynomial* pdd2polynomial(dd::pdd const& p) {
491490
polynomial::manager& pm = m_nlsat->pm();
492-
if (p.is_val())
491+
if (p.is_val())
493492
return pm.mk_const(p.val());
494493
polynomial::polynomial_ref lo(pdd2polynomial(p.lo()), pm);
495494
polynomial::polynomial_ref hi(pdd2polynomial(p.hi()), pm);
@@ -502,7 +501,9 @@ struct solver::imp {
502501
polynomial::polynomial_ref mp(pm.mul(vp, hi), pm);
503502
return pm.add(lo, mp);
504503
}
505-
504+
505+
506+
506507
bool is_int(lp::var_index v) {
507508
return lra.var_is_int(v);
508509
}
@@ -521,7 +522,7 @@ struct solver::imp {
521522
//
522523
void add_term(unsigned term_column) {
523524
lp::tv ti = lp::tv::raw(lra.column_to_reported_index(term_column));
524-
const lp::lar_term& t = lra.get_term(ti);
525+
const lp::lar_term& t = lra.get_term(ti);
525526
// code that creates a polynomial equality between the linear coefficients and
526527
// variable representing the term.
527528
svector<polynomial::var> vars;
@@ -531,17 +532,17 @@ struct solver::imp {
531532
den = lcm(den, denominator(kv.coeff()));
532533
}
533534
vars.push_back(lp2nl(term_column));
534-
535+
535536
vector<rational> coeffs;
536537
for (auto kv : t) {
537538
coeffs.push_back(den * kv.coeff());
538539
}
539540
coeffs.push_back(-den);
540541
polynomial::manager& pm = m_nlsat->pm();
541542
polynomial::polynomial_ref p(pm.mk_linear(coeffs.size(), coeffs.data(), vars.data(), rational(0)), pm);
542-
polynomial::polynomial* ps[1] = { p };
543-
bool is_even[1] = { false };
544-
nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even);
543+
polynomial::polynomial* ps[1] = {p};
544+
bool is_even[1] = {false};
545+
nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even);
545546
m_nlsat->mk_clause(1, &lit, nullptr);
546547
}
547548

‎src/math/lp/nra_solver.h

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ namespace lp {
1919

2020
namespace nra {
2121

22-
23-
2422
class solver {
2523
struct imp;
2624
imp* m_imp;

0 commit comments

Comments
 (0)