mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-13 09:26:15 +00:00
Code Activity

set level2var for m_pdd_manager of pdd_grobner

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-12-28 13:53:04 -08:00
parent c152660911
commit b5364b787c
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/math/dd/dd_pdd.h
View file

@ -259,6 +259,7 @@ namespace dd {
void reset(unsigned_vector const& level2var); void reset(unsigned_vector const& level2var);
void set_max_num_nodes(unsigned n) { m_max_num_nodes = n; } void set_max_num_nodes(unsigned n) { m_max_num_nodes = n; }
unsigned_vector const& get_level2var() const { return m_level2var; } unsigned_vector const& get_level2var() const { return m_level2var; }
unsigned_vector& get_level2var() { return m_level2var; }
pdd mk_var(unsigned i); pdd mk_var(unsigned i);
pdd mk_val(rational const& r); pdd mk_val(rational const& r);

9
src/math/lp/nla_core.cpp
View file

@ -1595,15 +1595,18 @@ void core::set_active_vars_weights(nex_creator& nc) {
} }
void core::set_level2var_for_pdd_grobner() { void core::set_level2var_for_pdd_grobner() {
unsigned_vector level2var(m_lar_solver.column_count()); unsigned n = m_pdd_manager.get_level2var().size();
for (unsigned j = 0; j < level2var.size(); j++) unsigned_vector level2var(n);
for (unsigned j = 0; j < n; j++)
level2var[j] = j; level2var[j] = j;
// sort that the larger weights are in beginning // sort that the larger weights are in beginning
std::sort(level2var.begin(), level2var.end(), [this](unsigned a, unsigned b) { std::sort(level2var.begin(), level2var.end(), [this](unsigned a, unsigned b) {
unsigned wa = get_var_weight(a); unsigned wa = get_var_weight(a);
unsigned wb = get_var_weight(b); unsigned wb = get_var_weight(b);
return wa > wb || (wa == wb && a > b); }); return wa > wb || (wa == wb && a > b); });
m_pdd_manager.set_level2var(level2var); unsigned_vector& l2v = m_pdd_manager.get_level2var();
for (unsigned j = 0; j < n; j++)
l2v[j] = level2var[j];
} }
unsigned core::get_var_weight(lpvar j) const { unsigned core::get_var_weight(lpvar j) const {