mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity

format

Browse source
This commit is contained in:
Nikolaj Bjorner 2023-07-31 19:41:11 -07:00
parent afe1218bc6
commit 403340498c
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/math/lp/lp_core_solver_base_def.h
View file

@ -115,12 +115,11 @@ pretty_print(std::ostream & out) {
template <typename T, typename X> void lp_core_solver_base<T, X>:: template <typename T, typename X> void lp_core_solver_base<T, X>::
add_delta_to_entering(unsigned entering, const X& delta) { add_delta_to_entering(unsigned entering, const X& delta) {
m_x[entering] += delta; m_x[entering] += delta;
for (const auto & c : m_A.m_columns[entering]) {
for (const auto & c : m_A.m_columns[entering]) { unsigned i = c.var();
unsigned i = c.var(); m_x[m_basis[i]] -= delta * m_A.get_val(c);
m_x[m_basis[i]] -= delta * m_A.get_val(c); }
}
} }
@ -404,17 +403,17 @@ template <typename T, typename X> void lp_core_solver_base<T, X>::transpose_row
transpose_basis(i, j); transpose_basis(i, j);
m_A.transpose_rows(i, j); m_A.transpose_rows(i, j);
} }
// j is the new basic column, j_basic - the leaving column // j is the new basic column, j_basic - the leaving column
template <typename T, typename X> bool lp_core_solver_base<T, X>::pivot_column_general(unsigned j, unsigned j_basic, indexed_vector<T> & w) { template <typename T, typename X> bool lp_core_solver_base<T, X>::pivot_column_general(unsigned j, unsigned j_basic, indexed_vector<T> & w) {
lp_assert(m_basis_heading[j] < 0); lp_assert(m_basis_heading[j] < 0);
lp_assert(m_basis_heading[j_basic] >= 0); lp_assert(m_basis_heading[j_basic] >= 0);
unsigned row_index = m_basis_heading[j_basic]; unsigned row_index = m_basis_heading[j_basic];
// the tableau case // the tableau case
if (pivot_column_tableau(j, row_index)) if (!pivot_column_tableau(j, row_index))
change_basis(j, j_basic); return false;
else return false; change_basis(j, j_basic);
return true;
return true;
} }