mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-09-05 17:47:41 +00:00
Code Activity

rename

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-08-28 10:30:57 -10:00
parent bd987e4399
commit 25ce7ccfd8
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/nlsat/levelwise.cpp
View file

@ -34,12 +34,12 @@ namespace nlsat {
struct levelwise::impl { struct levelwise::impl {
struct property { struct property {
prop_enum prop; prop_enum prop_tag;
polynomial_ref poly; polynomial_ref poly;
unsigned s_idx = -1; // index of the root function, if applicable; -1 means unspecified unsigned s_idx = -1; // index of the root function, if applicable; -1 means unspecified
unsigned level = -1; // -1 means unspecified unsigned level = -1; // -1 means unspecified
property(prop_enum pr, polynomial_ref const & pp, int si, int lvl) : prop(pr), poly(pp), s_idx(si), level(lvl) {} property(prop_enum pr, polynomial_ref const & pp, int si, int lvl) : prop_tag(pr), poly(pp), s_idx(si), level(lvl) {}
property(prop_enum pr, polynomial_ref const & pp) : prop(pr), poly(pp), s_idx(-1), level(-1) {} property(prop_enum pr, polynomial_ref const & pp) : prop_tag(pr), poly(pp), s_idx(-1), level(-1) {}
}; };
solver& m_solver; solver& m_solver;
polynomial_ref_vector const& m_P; polynomial_ref_vector const& m_P;
@ -243,7 +243,7 @@ namespace nlsat {
}; };
bool dominates(const property& a, const property& b) const { bool dominates(const property& a, const property& b) const {
return a.poly == b.poly && dominates(a.prop, b.prop); return a.poly == b.poly && dominates(a.prop_tag, b.prop_tag);
} }
bool dominates(prop_enum a, prop_enum b) const { bool dominates(prop_enum a, prop_enum b) const {
return m_prop_dom[static_cast<unsigned>(a)][static_cast<unsigned>(b)]; return m_prop_dom[static_cast<unsigned>(a)][static_cast<unsigned>(b)];
@ -270,7 +270,7 @@ namespace nlsat {
} }
std::ostream& display(std::ostream& out, const property & pr) { std::ostream& display(std::ostream& out, const property & pr) {
out << "{prop:" << prop_name(pr.prop); out << "{prop:" << prop_name(pr.prop_tag);
if (pr.level != -1) out << ", level:" << pr.level; if (pr.level != -1) out << ", level:" << pr.level;
if (pr.s_idx != -1) out << ", s_idx:" << pr.s_idx; if (pr.s_idx != -1) out << ", s_idx:" << pr.s_idx;
if (pr.poly) { if (pr.poly) {
@ -289,7 +289,7 @@ namespace nlsat {
std::vector<property> cand; std::vector<property> cand;
cand.reserve(m_Q.size()); cand.reserve(m_Q.size());
for (const auto& q : m_Q) for (const auto& q : m_Q)
if (q.level == level && q.prop != prop_to_avoid) if (q.level == level && q.prop_tag != prop_to_avoid)
cand.push_back(q); cand.push_back(q);
if (cand.empty()) return {}; if (cand.empty()) return {};
@ -311,7 +311,7 @@ namespace nlsat {
keys.reserve(cand.size()); keys.reserve(cand.size());
for (size_t i = 0; i < cand.size(); ++i) { for (size_t i = 0; i < cand.size(); ++i) {
if (!dominated[i]) { if (!dominated[i]) {
keys.push_back(Key{ polynomial::manager::id(cand[i].poly.get()), static_cast<unsigned>(cand[i].prop), i }); keys.push_back(Key{ polynomial::manager::id(cand[i].poly.get()), static_cast<unsigned>(cand[i].prop_tag), i });
} }
} }
std::sort(keys.begin(), keys.end(), [](Key const& a, Key const& b){ std::sort(keys.begin(), keys.end(), [](Key const& a, Key const& b){
@ -483,7 +483,7 @@ namespace nlsat {
void build_representation(unsigned i, result_struct& ret) { void build_representation(unsigned i, result_struct& ret) {
std::vector<const poly*> p_non_null; std::vector<const poly*> p_non_null;
for (const auto & pr: m_Q) { for (const auto & pr: m_Q) {
if (pr.prop == prop_enum::sgn_inv_irreducible && max_var(pr.poly) == i && poly_is_not_nullified_at_sample_at_level(pr.poly.get(), i)) if (pr.prop_tag == prop_enum::sgn_inv_irreducible && max_var(pr.poly) == i && poly_is_not_nullified_at_sample_at_level(pr.poly.get(), i))
p_non_null.push_back(pr.poly.get()); p_non_null.push_back(pr.poly.get());
} }
std::vector<std::unique_ptr<bucket_t>> buckets; std::vector<std::unique_ptr<bucket_t>> buckets;