mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-05-31 06:07:46 +00:00
Code Activity

refactor

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2026-01-13 13:07:22 -10:00
parent 5bc7ad0c6c
commit 13ef7cc6f4
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/nlsat/levelwise.cpp
View file

@ -585,6 +585,7 @@ namespace nlsat {
} }
} }
// Build relation ≼ for the current level from the chosen interval boundaries.
void fill_relation_pairs(unsigned l, unsigned u) { void fill_relation_pairs(unsigned l, unsigned u) {
auto const& I = m_I[m_level]; auto const& I = m_I[m_level];
if (I.section) { if (I.section) {
@ -661,8 +662,10 @@ namespace nlsat {
return roots.size(); return roots.size();
} }
// Build Θ (root functions), pick I_level around sample(level), and build relation ≼. // Build Θ (root functions) and pick I_level around sample(level).
void build_interval_and_relation(unsigned level, polynomial_ref_vector const& level_ps, std_vector<bool>& poly_has_roots) { // Returns whether any roots were found (i.e., whether a relation can be built).
bool build_interval(unsigned level, polynomial_ref_vector const& level_ps, std_vector<bool>& poly_has_roots,
unsigned& l_index, unsigned& u_index) {
m_level = level; m_level = level;
m_rel.clear(); m_rel.clear();
reset_interval(m_I[level]); reset_interval(m_I[level]);
@ -670,6 +673,9 @@ namespace nlsat {
poly_has_roots.clear(); poly_has_roots.clear();
poly_has_roots.resize(level_ps.size(), false); poly_has_roots.resize(level_ps.size(), false);
l_index = static_cast<unsigned>(-1);
u_index = static_cast<unsigned>(-1);
anum const& v = sample().value(level); anum const& v = sample().value(level);
std::vector<root_function> lhalf; std::vector<root_function> lhalf;
std::vector<root_function> uhalf; std::vector<root_function> uhalf;
@ -678,7 +684,7 @@ namespace nlsat {
poly_has_roots[i] = isolate_roots_around_sample(level, level_ps.get(i), i, v, lhalf, uhalf); poly_has_roots[i] = isolate_roots_around_sample(level, level_ps.get(i), i, v, lhalf, uhalf);
if (lhalf.empty() && uhalf.empty()) if (lhalf.empty() && uhalf.empty())
return; return false;
auto& rfs = m_rel.m_rfunc; auto& rfs = m_rel.m_rfunc;
rfs.clear(); rfs.clear();
@ -719,9 +725,6 @@ namespace nlsat {
std::sort(rfs.begin(), mid, cmp_lo); std::sort(rfs.begin(), mid, cmp_lo);
std::sort(mid, rfs.end(), cmp_hi); std::sort(mid, rfs.end(), cmp_hi);
unsigned l_index = static_cast<unsigned>(-1);
unsigned u_index = static_cast<unsigned>(-1);
if (mid != rfs.begin()) { if (mid != rfs.begin()) {
l_index = static_cast<unsigned>((mid - rfs.begin()) - 1); l_index = static_cast<unsigned>((mid - rfs.begin()) - 1);
auto& r = *(mid - 1); auto& r = *(mid - 1);
@ -748,9 +751,10 @@ namespace nlsat {
m_I[level].u_index = r.ire.i; m_I[level].u_index = r.ire.i;
} }
fill_relation_pairs(l_index, u_index); return true;
} }
void add_relation_resultants(todo_set& P, unsigned level) { void add_relation_resultants(todo_set& P, unsigned level) {
std::set<std::pair<unsigned, unsigned>> added_pairs; std::set<std::pair<unsigned, unsigned>> added_pairs;
for (auto const& pr : m_rel.m_pairs) { for (auto const& pr : m_rel.m_pairs) {
@ -835,7 +839,10 @@ namespace nlsat {
// Lines 3-8: Θ + I_level + relation ≼ // Lines 3-8: Θ + I_level + relation ≼
std_vector<bool> poly_has_roots; std_vector<bool> poly_has_roots;
build_interval_and_relation(level, level_ps, poly_has_roots); unsigned l_index = static_cast<unsigned>(-1);
unsigned u_index = static_cast<unsigned>(-1);
if (build_interval(level, level_ps, poly_has_roots, l_index, u_index))
fill_relation_pairs(l_index, u_index);
// SMT-RAT (levelwise/OneCellCAD.h) upgrades the polynomials defining the current // SMT-RAT (levelwise/OneCellCAD.h) upgrades the polynomials defining the current
// bounds/sections to ORD_INV. Z3's levelwise does not currently implement SMT-RAT's // bounds/sections to ORD_INV. Z3's levelwise does not currently implement SMT-RAT's
// dedicated section/sector heuristics (sectionHeuristic/sectorHeuristic) for choosing // dedicated section/sector heuristics (sectionHeuristic/sectorHeuristic) for choosing