mirror of
https://github.com/Z3Prover/z3
synced 2025-06-23 14:23:40 +00:00
save
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
a81a00a93c
commit
8d3c3ede39
3 changed files with 11 additions and 4 deletions
|
@ -61,7 +61,7 @@ namespace polysat {
|
||||||
|
|
||||||
void search_state::pop() {
|
void search_state::pop() {
|
||||||
auto const& item = m_items.back();
|
auto const& item = m_items.back();
|
||||||
if (item.is_assignment() && item.var() == m_assignment.back().first)
|
if (item.is_assignment() && !m_assignment.empty() && item.var() == m_assignment.back().first)
|
||||||
m_assignment.pop_back();
|
m_assignment.pop_back();
|
||||||
m_items.pop_back();
|
m_items.pop_back();
|
||||||
}
|
}
|
||||||
|
|
|
@ -190,7 +190,7 @@ namespace polysat {
|
||||||
lo = val;
|
lo = val;
|
||||||
}
|
}
|
||||||
SASSERT(hi <= s.var2pdd(v).max_value());
|
SASSERT(hi <= s.var2pdd(v).max_value());
|
||||||
LOG("forbidden interval [" << lo << ", " << hi << "[\n");
|
LOG("forbidden interval " << e->interval << " - " << val << " " << coeff_val << " [" << lo << ", " << hi << "[");
|
||||||
entry* ne = alloc_entry();
|
entry* ne = alloc_entry();
|
||||||
ne->src = e->src;
|
ne->src = e->src;
|
||||||
ne->side_cond = e->side_cond;
|
ne->side_cond = e->side_cond;
|
||||||
|
|
|
@ -1065,10 +1065,17 @@ namespace polysat {
|
||||||
|
|
||||||
void tst_polysat() {
|
void tst_polysat() {
|
||||||
|
|
||||||
|
polysat::test_ineq_axiom1();
|
||||||
polysat::test_l5();
|
polysat::test_ineq_axiom2();
|
||||||
|
polysat::test_ineq_axiom3();
|
||||||
|
polysat::test_ineq_axiom4();
|
||||||
|
polysat::test_ineq_axiom5();
|
||||||
|
polysat::test_ineq_axiom6();
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
polysat::test_ineq_basic4();
|
||||||
|
//return;
|
||||||
|
|
||||||
polysat::test_ineq_basic6();
|
polysat::test_ineq_basic6();
|
||||||
|
|
||||||
// polysat::test_monot_bounds(8);
|
// polysat::test_monot_bounds(8);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue