mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Code Activity

add tv

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-18 16:48:37 -07:00 • committed by Lev Nachmanson
parent d758a08497
commit e50082b484
8 changed files with 117 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/math/lp/lar_solver.h
View file

@ -136,7 +136,7 @@ public:
}
const mpq& get_column_value_rational(unsigned j) const {
if (is_term(j)) {
if (tv::is_term(j)) {
j = m_var_register.external_to_local(j);
}
return m_mpq_lar_core_solver.m_r_x[j].x;
@ -266,7 +266,7 @@ public:
unsigned map_term_index_to_column_index(unsigned j) const;
var_index local_to_external(var_index idx) const { return is_term(idx)?
var_index local_to_external(var_index idx) const { return tv::is_term(idx)?
m_term_register.local_to_external(idx) : m_var_register.local_to_external(idx); }
unsigned number_of_vars() const { return m_var_register.size(); }
@ -561,14 +561,14 @@ public:
}
constraint_index get_column_upper_bound_witness(unsigned j) const {
if (is_term(j)) {
if (tv::is_term(j)) {
j = m_var_register.external_to_local(j);
}
return m_columns_to_ul_pairs()[j].upper_bound_witness();
}
constraint_index get_column_lower_bound_witness(unsigned j) const {
if (is_term(j)) {
if (tv::is_term(j)) {
j = m_var_register.external_to_local(j);
}
return m_columns_to_ul_pairs()[j].lower_bound_witness();
@ -588,12 +588,12 @@ public:
std::ostream& print_column_info(unsigned j, std::ostream& out) const {
m_mpq_lar_core_solver.m_r_solver.print_column_info(j, out);
if (is_term(j)) {
const lar_term& t = * m_terms[unmask_term(j)];
if (tv::is_term(j)) {
const lar_term& t = * m_terms[tv::unmask_term(j)];
print_term_as_indices(t, out) << "\n";
} else if(column_corresponds_to_term(j)) {
const lar_term& t = * m_terms[unmask_term(m_var_register.local_to_external(j))];
const lar_term& t = * m_terms[tv::unmask_term(m_var_register.local_to_external(j))];
print_term_as_indices(t, out) << "\n";
}
return out;