mirror of
https://github.com/Z3Prover/z3
synced 2025-04-15 13:28:47 +00:00
port bug fixes from unit prop branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
fba5de3a25
commit
eff3f5f65e
|
@ -31,7 +31,7 @@ namespace lp {
|
||||||
lra.remove_fixed_vars_from_base();
|
lra.remove_fixed_vars_from_base();
|
||||||
lp_assert(lia.is_feasible());
|
lp_assert(lia.is_feasible());
|
||||||
for (unsigned j : lra.r_basis())
|
for (unsigned j : lra.r_basis())
|
||||||
if (!lra.get_value(j).is_int() && lra.column_is_int(j))
|
if (!lra.get_value(j).is_int() && lra.column_is_int(j) && !lia.is_fixed(j))
|
||||||
patch_basic_column(j);
|
patch_basic_column(j);
|
||||||
if (!lia.has_inf_int()) {
|
if (!lia.has_inf_int()) {
|
||||||
lia.settings().stats().m_patches_success++;
|
lia.settings().stats().m_patches_success++;
|
||||||
|
|
|
@ -137,8 +137,9 @@ class constraint_set {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
constraint_set(u_dependency_manager& d, column_namer& cn):
|
constraint_set(u_dependency_manager& d, column_namer& cn):
|
||||||
m_dep_manager(d),
|
m_namer(cn),
|
||||||
m_namer(cn) {}
|
m_dep_manager(d)
|
||||||
|
{}
|
||||||
|
|
||||||
~constraint_set() {
|
~constraint_set() {
|
||||||
for (auto* c : m_constraints)
|
for (auto* c : m_constraints)
|
||||||
|
|
Loading…
Reference in a new issue