mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-10 19:27:06 +00:00
Code Activity

Merge branch 'master' of https://github.com/z3prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2019-03-03 13:10:16 -08:00
parent e51b5fd99c 3723c1af0a
commit 8b261df77a
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/util/lp/lar_solver.cpp
View file

@ -505,24 +505,23 @@ bool lar_solver::remove_from_basis(unsigned j) {
return m_mpq_lar_core_solver.m_r_solver.remove_from_basis(j);
}
lar_term lar_solver::get_term_to_maximize(unsigned ext_j) const {
unsigned local_j;
if (m_var_register.external_is_used(ext_j, local_j)) {
lar_term lar_solver::get_term_to_maximize(unsigned j_or_term) const {
if (is_term(j_or_term))
return get_term(j_or_term);
if (j_or_term < m_mpq_lar_core_solver.m_r_x.size()) {
lar_term r;
r. add_monomial(one_of_type<mpq>(), local_j);
r.add_monomial(one_of_type<mpq>(), j_or_term);
return r;
}
if (!is_term(ext_j) || adjust_term_index(ext_j) >= m_terms.size())
return lar_term(); // return an empty term
return get_term(ext_j);
}
return lar_term(); // return an empty term
}
lp_status lar_solver::maximize_term(unsigned ext_j,
lp_status lar_solver::maximize_term(unsigned j_or_term,
impq &term_max) {
TRACE("lar_solver", print_values(tout););
bool was_feasible = m_mpq_lar_core_solver.m_r_solver.calc_current_x_is_feasible_include_non_basis();
impq prev_value;
lar_term term = get_term_to_maximize(ext_j);
lar_term term = get_term_to_maximize(j_or_term);
if (term.is_empty()) {
return lp_status::UNBOUNDED;
}

2
src/util/lp/lar_solver.h
View file

@ -310,7 +310,7 @@ public:
impq &term_max);
// starting from a given feasible state look for the maximum of the term
// return true if found and false if unbounded
lp_status maximize_term(unsigned ext_j ,
lp_status maximize_term(unsigned j_or_term,
impq &term_max);