mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-25 01:55:32 +00:00
Code Activity

work on random_updates

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-04-07 18:28:17 -07:00
parent ae8c6acc1a
commit 5c9fd90031
3 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1575,9 +1575,22 @@ var_index lar_solver::add_named_var(unsigned ext_j, bool is_int, const std::stri
m_var_register.set_name(j, name);
return j;
}
unsigned lar_solver::external_to_column_index(unsigned ext_j) const {
unsigned j = external_to_local(ext_j);
if (j == null_lpvar)
return j;
if (tv::is_term(j))
return map_term_index_to_column_index(j);
return j;
}
var_index lar_solver::add_var(unsigned ext_j, bool is_int) {
TRACE("add_var", tout << "adding var " << ext_j << (is_int? " int" : " nonint") << std::endl;);
var_index local_j;
SASSERT(!m_term_register.external_is_used(ext_j));
lp_assert(!tv::is_term(ext_j));
if (m_var_register.external_is_used(ext_j, local_j))
return local_j;
@ -1709,6 +1722,7 @@ bool lar_solver::all_vars_are_registered(const vector<std::pair<mpq, var_index>>
// do not register in m_var_register this term if ext_i == UINT_MAX
var_index lar_solver::add_term(const vector<std::pair<mpq, var_index>> & coeffs, unsigned ext_i) {
TRACE("lar_solver_terms", print_linear_combination_of_column_indices_only(coeffs, tout) << ", ext_i =" << ext_i << "\n";);
SASSERT(!m_var_register.external_is_used(ext_i));
m_term_register.add_var(ext_i, term_is_int(coeffs));
lp_assert(all_vars_are_registered(coeffs));
if (strategy_is_undecided())

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

@ -134,6 +134,8 @@ public:
void set_column_value(unsigned j, const impq& v) {
m_mpq_lar_core_solver.m_r_x[j] = v;
}
unsigned external_to_column_index(unsigned) const;
const mpq& get_column_value_rational(unsigned j) const {
if (tv::is_term(j)) {