mirror of
https://github.com/Z3Prover/z3
synced 2025-12-31 16:29:52 +00:00
refactor
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
parent
3cff4d3410
commit
841775ffdd
4 changed files with 9 additions and 9 deletions
|
|
@ -52,8 +52,8 @@ namespace nlsat {
|
|||
// Since m_p_relation holds (lesser -> greater), we invert edges when populating dom: greater ▹ lesser.
|
||||
std::vector<std::vector<bool>> m_prop_dom;
|
||||
|
||||
assignment const& sample() const { return m_solver.get_assignment();}
|
||||
assignment & sample() { return m_solver.get_assignment(); }
|
||||
assignment const& sample() const { return m_solver.sample();}
|
||||
assignment & sample() { return m_solver.sample(); }
|
||||
|
||||
// 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)
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ namespace nlsat {
|
|||
bool m_add_zero_disc;
|
||||
bool m_cell_sample;
|
||||
|
||||
assignment const & sample() const { return m_solver.get_assignment(); }
|
||||
assignment & sample() { return m_solver.get_assignment(); }
|
||||
assignment const & sample() const { return m_solver.sample(); }
|
||||
assignment & sample() { return m_solver.sample(); }
|
||||
|
||||
struct todo_set {
|
||||
polynomial::cache & m_cache;
|
||||
|
|
@ -514,7 +514,7 @@ namespace nlsat {
|
|||
if (max_var(p) == max)
|
||||
elim_vanishing(p); // eliminate vanishing coefficients of max
|
||||
if (is_const(p) || max_var(p) < max) {
|
||||
int s = sign(p, m_solver.get_assignment(), m_am);
|
||||
int s = sign(p, m_solver.sample(), m_am);
|
||||
if (!is_const(p)) {
|
||||
SASSERT(max_var(p) != null_var);
|
||||
SASSERT(max_var(p) < max);
|
||||
|
|
|
|||
|
|
@ -4348,11 +4348,11 @@ namespace nlsat {
|
|||
nlsat_params::collect_param_descrs(d);
|
||||
}
|
||||
|
||||
const assignment &solver::get_assignment() const {
|
||||
const assignment &solver::sample() const {
|
||||
return m_imp->m_assignment;
|
||||
}
|
||||
|
||||
assignment &solver::get_assignment() {
|
||||
assignment &solver::sample() {
|
||||
return m_imp->m_assignment;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -244,8 +244,8 @@ namespace nlsat {
|
|||
// -----------------------
|
||||
void updt_params(params_ref const & p);
|
||||
static void collect_param_descrs(param_descrs & d);
|
||||
const assignment& get_assignment() const;
|
||||
assignment& get_assignment();
|
||||
const assignment& sample() const;
|
||||
assignment& sample();
|
||||
|
||||
void reset();
|
||||
void collect_statistics(statistics & st);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue