mirror of
https://github.com/Z3Prover/z3
synced 2026-04-15 16:54:11 +00:00
5ce8da8ade
- scaled_min: The mod-factor-propagation commit (#9235) added
add_bounded_division in the is_mod handler with ensure_nla(), which
unnecessarily created the NLA solver for problems without nonlinear
terms, causing the optimizer to return a finite value instead of
-infinity. Fix: use a separate m_mod_divisions vector for
check_mod_mult, only storing (x, y, r) tuples without creating the
idiv term. Register mod divisions lazily: buffer them when NLA is
not yet active, and flush when ensure_nla() creates the NLA solver.
- max_reg: The #if 0 in commit bb48e3a disabled 5 weighted-sum tests,
reducing active tests from 7 to 2, but the assertion was changed to
expect 6 instead of 2. Fix: update assertion to expect 2.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
62 lines
2.1 KiB
C++
62 lines
2.1 KiB
C++
/*++
|
|
Copyright (c) 2017 Microsoft Corporation
|
|
|
|
Author:
|
|
Lev Nachmanson (levnach)
|
|
Nikolaj Bjorner (nbjorner)
|
|
|
|
--*/
|
|
#pragma once
|
|
#include "util/vector.h"
|
|
#include "math/lp/lp_settings.h"
|
|
#include "util/rlimit.h"
|
|
#include "util/params.h"
|
|
#include "math/lp/lar_solver.h"
|
|
#include "math/lp/monic.h"
|
|
#include "math/lp/nla_core.h"
|
|
namespace nra {
|
|
class solver;
|
|
}
|
|
namespace nla {
|
|
class core;
|
|
// nonlinear integer incremental linear solver
|
|
class solver {
|
|
core* m_core;
|
|
public:
|
|
|
|
solver(lp::lar_solver& s, params_ref const& p, reslimit& limit);
|
|
~solver();
|
|
const auto& monics_with_changed_bounds() const { return m_core->monics_with_changed_bounds(); }
|
|
void add_monic(lpvar v, unsigned sz, lpvar const* vs);
|
|
void add_idivision(lpvar q, lpvar x, lpvar y, lpvar r);
|
|
void add_rdivision(lpvar q, lpvar x, lpvar y, lpvar r);
|
|
void add_bounded_division(lpvar q, lpvar x, lpvar y, lpvar r);
|
|
void add_mod_division(lpvar x, lpvar y, lpvar r);
|
|
void check_bounded_divisions();
|
|
void set_relevant(std::function<bool(lpvar)>& is_relevant);
|
|
void updt_params(params_ref const& p);
|
|
void push();
|
|
void pop(unsigned scopes);
|
|
bool need_check();
|
|
lbool check(unsigned level);
|
|
void propagate();
|
|
void simplify() { m_core->simplify(); }
|
|
lbool check_power(lpvar r, lpvar x, lpvar y);
|
|
bool is_monic_var(lpvar) const;
|
|
bool influences_nl_var(lpvar) const;
|
|
std::ostream& display(std::ostream& out) const;
|
|
bool use_nra_model() const;
|
|
core& get_core();
|
|
nlsat::anum_manager& am();
|
|
nlsat::anum const& am_value(lp::lpvar v) const;
|
|
scoped_anum& tmp1();
|
|
scoped_anum& tmp2();
|
|
vector<nla::ineq> const& literals() const;
|
|
vector<lp::fixed_equality> const& fixed_equalities() const;
|
|
vector<lp::equality> const& equalities() const;
|
|
bool should_check_feasible() const { return m_core->should_check_feasible(); }
|
|
|
|
const vector<nla::lemma>& lemmas() const;
|
|
|
|
};
|
|
}
|