3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-10-25 10:29:02 -07:00
parent 34e0e26e3d
commit 1ee2ba2a9b
17 changed files with 132 additions and 80 deletions

View file

@ -590,32 +590,29 @@ public:
return out;
}
out << "[" << j << "]\t";
out << "[" << j << "] " << std::setw(6) << " := " << m_x[j];
if (m_basis_heading[j] >= 0)
out << " base\t";
else
out << " \t";
switch (m_column_types[j]) {
case column_type::fixed:
case column_type::boxed:
out << " [" << m_lower_bounds[j] << ", " << m_upper_bounds[j] << "]";
out << "[" << m_lower_bounds[j] << ", " << m_upper_bounds[j] << "]";
break;
case column_type::lower_bound:
out << " [" << m_lower_bounds[j] << "," << "oo" << "]";
out << "[" << m_lower_bounds[j] << ", oo" << "]";
break;
case column_type::upper_bound:
out << " [-oo, " << m_upper_bounds[j] << ']';
out << "[-oo, " << m_upper_bounds[j] << ']';
break;
case column_type::free_column:
out << " [-oo, oo]";
out << "[-oo, oo]";
break;
default:
lp_assert(false);
}
// out << "basis heading = " << m_basis_heading[j] << std::endl;
out << "\tx = " << m_x[j];
if (m_basis_heading[j] >= 0)
out << " base\n";
else
out << " \n";
return out;
return out << "\n";
}
bool column_is_free(unsigned j) const { return this->m_column_types[j] == column_type::free_column; }