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

add trace tag for levelwise

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-08-14 17:12:09 -07:00
parent 5cb046f9fb
commit 56adbe3c12
5 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/nlsat/levelwise.cpp
View file

@ -6,6 +6,7 @@
#include <map> #include <map>
#include <algorithm> #include <algorithm>
#include "math/polynomial/algebraic_numbers.h" #include "math/polynomial/algebraic_numbers.h"
#include "nlsat_pp.h"
namespace nlsat { namespace nlsat {
// Local enums reused from previous scaffolding // Local enums reused from previous scaffolding
@ -40,7 +41,7 @@ namespace nlsat {
solver& m_solver; solver& m_solver;
polynomial_ref_vector const& m_P; polynomial_ref_vector const& m_P;
var m_n; var m_n;
assignment const& m_s; assignment const& sample() { return m_solver.get_assignment();}
pmanager& m_pm; pmanager& m_pm;
anum_manager& m_am; anum_manager& m_am;
std::vector<property> m_Q; // the set of properties to prove as in single_cell std::vector<property> m_Q; // the set of properties to prove as in single_cell
@ -53,7 +54,8 @@ namespace nlsat {
std::vector<std::vector<bool>> m_prop_dom; std::vector<std::vector<bool>> m_prop_dom;
// max_x plays the role of n in algorith 1 of the levelwise paper. // max_x plays the role of n in algorith 1 of the levelwise paper.
impl(solver& solver, polynomial_ref_vector const& ps, var max_x, assignment const& s, pmanager& pm, anum_manager& am) impl(solver& solver, polynomial_ref_vector const& ps, var max_x, assignment const& s, pmanager& pm, anum_manager& am)
: m_solver(solver), m_P(ps), m_n(max_x), m_s(s), m_pm(pm), m_am(am) { : m_solver(solver), m_P(ps), m_n(max_x), m_pm(pm), m_am(am) {
TRACE(levelwise, tout << "m_n:" << m_n << "\n";);
init_relation(); init_relation();
} }
@ -115,9 +117,13 @@ namespace nlsat {
} }
std::vector<property> seed_properties() { std::vector<property> seed_properties() {
std::vector<property> Q; std::vector<property> Q;
// Algorithm 1: initial goals are sgn_inv(p, s) for p in ps at current level of max_x // Algorithm 1: initial goals are sgn_inv(p, s) for p in ps at current level of max_x
for (unsigned i = 0; i < m_P.size(); ++i) { for (unsigned i = 0; i < m_P.size(); ++i) {
poly* p = m_P.get(i); poly* p = m_P.get(i);
TRACE(levelwise, display(tout << "p:", m_solver, polynomial_ref(p, m_pm)) << std::endl;
tout << "max_var:" << m_pm.max_var(p) << std::endl;
m_solver.display_assignment(tout << "sample()") << std::endl;);
Q.push_back(property{ prop_enum::sgn_inv_irreducible, p, /*s_idx*/0, /* level */ m_n}); Q.push_back(property{ prop_enum::sgn_inv_irreducible, p, /*s_idx*/0, /* level */ m_n});
} }
return Q; return Q;
@ -177,8 +183,8 @@ namespace nlsat {
::sign sign(poly * p) { ::sign sign(poly * p) {
polynomial_ref pr(p, m_P.m()); polynomial_ref pr(p, m_P.m());
auto s = m_am.eval_sign_at(pr, m_s); auto s = m_am.eval_sign_at(pr, sample());
TRACE(nlsat_explain, tout << "p: " << p << " var: " << m_pm.max_var(p) << " sign: " << s << "\n";); TRACE(levelwise, tout << "p: " << p << " var: " << m_pm.max_var(p) << " sign: " << s << "\n";);
return s; return s;
} }
result_struct construct_interval() { result_struct construct_interval() {
@ -206,7 +212,7 @@ namespace nlsat {
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 && sign(pr.p) != 0) if (pr.prop == prop_enum::sgn_inv_irreducible && m_pm.max_var(pr.p) < m_i && sign(pr.p) != 0)
p_non_null.push_back(pr.p); p_non_null.push_back(pr.p);
} }

2
src/nlsat/nlsat_pp.h
View file

@ -14,7 +14,7 @@ Abstract:
#pragma once #pragma once
#include "nlsat/nlsat_solver.h" #include "nlsat/nlsat_solver.h"
#include "nlsat/nlsat_scoped_literal_vector.h"
namespace nlsat { namespace nlsat {
inline std::ostream& display(std::ostream& out, pmanager& pm, polynomial_ref const& p, display_var_proc const& proc) { inline std::ostream& display(std::ostream& out, pmanager& pm, polynomial_ref const& p, display_var_proc const& proc) {

7
src/nlsat/nlsat_solver.cpp
View file

@ -39,6 +39,7 @@ Revision History:
#include "nlsat/nlsat_simplify.h" #include "nlsat/nlsat_simplify.h"
#include "nlsat/nlsat_simple_checker.h" #include "nlsat/nlsat_simple_checker.h"
#include "nlsat/nlsat_variable_ordering_strategy.h" #include "nlsat/nlsat_variable_ordering_strategy.h"
#include "nlsat_solver.h"
#define NLSAT_EXTRA_VERBOSE #define NLSAT_EXTRA_VERBOSE
@ -4123,7 +4124,11 @@ namespace nlsat {
nlsat_params::collect_param_descrs(d); nlsat_params::collect_param_descrs(d);
} }
unsynch_mpq_manager & solver::qm() { const assignment &solver::get_assignment() const {
return m_imp->m_assignment;
}
unsynch_mpq_manager &solver::qm()
{
return m_imp->m_qm; return m_imp->m_qm;
} }

2
src/nlsat/nlsat_solver.h
View file

@ -244,7 +244,7 @@ namespace nlsat {
// ----------------------- // -----------------------
void updt_params(params_ref const & p); void updt_params(params_ref const & p);
static void collect_param_descrs(param_descrs & d); static void collect_param_descrs(param_descrs & d);
const assignment& get_assignment() const;
void reset(); void reset();
void collect_statistics(statistics & st); void collect_statistics(statistics & st);
void reset_statistics(); void reset_statistics();

1
src/util/trace_tags.def
View file

@ -691,6 +691,7 @@ X(Global, nlsat_bug, "nlsat bug")
X(Global, nlsat_evaluator, "nlsat evaluator") X(Global, nlsat_evaluator, "nlsat evaluator")
X(Global, nlsat_evaluator_bug, "nlsat evaluator bug") X(Global, nlsat_evaluator_bug, "nlsat evaluator bug")
X(Global, nlsat_explain, "nlsat explain") X(Global, nlsat_explain, "nlsat explain")
X(Global, levelwise, "levelwise")
X(Global, nlsat_factor, "nlsat factor") X(Global, nlsat_factor, "nlsat factor")
X(Global, nlsat_fd, "nlsat fd") X(Global, nlsat_fd, "nlsat fd")
X(Global, nlsat_inf_set, "nlsat inf set") X(Global, nlsat_inf_set, "nlsat inf set")