3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-03-16 20:48:32 -07:00 committed by Lev Nachmanson
parent 7577f6fea0
commit 8b5510bcd6

View file

@ -111,15 +111,13 @@ namespace lp {
} }
// Only b0 exists // Only b0 exists
else if (has_b0) { else if (has_b0) {
unsigned a0 = m_rev_map.at(b0); unsigned a0 = m_rev_map.at(b0);
erase_val(b0); erase_val(b0);
add(a0, b1); add(a0, b1);
} }
// Only b1 exists // Only b1 exists
else if (has_b1) { else if (has_b1) {
unsigned a1 = m_rev_map.at(b1); unsigned a1 = m_rev_map.at(b1);
erase_val(b1); erase_val(b1);
add(a1, b0); add(a1, b0);
} }
@ -2479,14 +2477,11 @@ namespace lp {
print_deps(out, explain_fixed_in_meta_term(l_term)); print_deps(out, explain_fixed_in_meta_term(l_term));
out << "}\n"; out << "}\n";
} }
if (belongs_to_f(i)) { if (belongs_to_f(i))
out << "in F\n"; out << "in F\n";
} else if (print_in_S)
else { out << "in S\n";
if (print_in_S) {
out << "in S\n";
}
}
if (print_column_info) { if (print_column_info) {
bool has_fresh = false; bool has_fresh = false;
for (const auto& p : m_e_matrix[i] ) { for (const auto& p : m_e_matrix[i] ) {
@ -2500,7 +2495,8 @@ namespace lp {
auto j = local_to_lar_solver(p.var()); auto j = local_to_lar_solver(p.var());
out << "\tx" << p.var() << " := " << lra.get_column_value(j) << " " << lra.get_bounds_string(j) << "\n"; out << "\tx" << p.var() << " := " << lra.get_column_value(j) << " " << lra.get_bounds_string(j) << "\n";
} }
} else { }
else {
out << "\thas fresh vars\n"; out << "\thas fresh vars\n";
} }
} }
@ -2585,9 +2581,7 @@ namespace lp {
TRACE("dioph_eq", tout << "push to S:\n"; print_entry(h, tout);); TRACE("dioph_eq", tout << "push to S:\n"; print_entry(h, tout););
move_entry_from_f_to_s(kh, h); move_entry_from_f_to_s(kh, h);
eliminate_var_in_f(h, kh, kh_sign); eliminate_var_in_f(h, kh, kh_sign);
if (ih != f_vector.size() - 1) { f_vector[ih] = f_vector.back();
f_vector[ih] = f_vector.back();
}
f_vector.pop_back(); f_vector.pop_back();
} }
else { else {