mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Code Activity

Use override rather than virtual.

Browse source
This commit is contained in:
Bruce Mitchener 2018-02-10 09:15:12 +07:00
parent ce123d9dbc
commit 7167fda1dc
220 changed files with 2546 additions and 2548 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/math/polynomial/algebraic_numbers.cpp
View file

@ -1932,9 +1932,9 @@ namespace algebraic_numbers {
imp & m_imp;
polynomial::var2anum const & m_x2v;
opt_var2basic(imp & i, polynomial::var2anum const & x2v):m_imp(i), m_x2v(x2v) {}
virtual unsynch_mpq_manager & m() const { return m_imp.qm(); }
virtual bool contains(polynomial::var x) const { return m_x2v.contains(x); }
virtual mpq const & operator()(polynomial::var x) const {
unsynch_mpq_manager & m() const override { return m_imp.qm(); }
bool contains(polynomial::var x) const override { return m_x2v.contains(x); }
mpq const & operator()(polynomial::var x) const override {
anum const & v = m_x2v(x);
if (!v.is_basic())
throw failed();
@ -1949,9 +1949,9 @@ namespace algebraic_numbers {
imp & m_imp;
polynomial::var2anum const & m_x2v;
var2basic(imp & i, polynomial::var2anum const & x2v):m_imp(i), m_x2v(x2v) {}
virtual unsynch_mpq_manager & m() const { return m_imp.qm(); }
virtual bool contains(polynomial::var x) const { return m_x2v.contains(x) && m_x2v(x).is_basic(); }
virtual mpq const & operator()(polynomial::var x) const {
unsynch_mpq_manager & m() const override { return m_imp.qm(); }
bool contains(polynomial::var x) const override { return m_x2v.contains(x) && m_x2v(x).is_basic(); }
mpq const & operator()(polynomial::var x) const override {
anum const & v = m_x2v(x);
SASSERT(v.is_basic());
TRACE("var2basic", tout << "getting value of x" << x << " -> " << m().to_string(m_imp.basic_value(v)) << "\n";);
@ -1966,9 +1966,9 @@ namespace algebraic_numbers {
imp & m_imp;
polynomial::var2anum const & m_x2v;
var2interval(imp & i, polynomial::var2anum const & x2v):m_imp(i), m_x2v(x2v) {}
virtual mpbqi_manager & m() const { return m_imp.bqim(); }
virtual bool contains(polynomial::var x) const { return m_x2v.contains(x) && !m_x2v(x).is_basic(); }
virtual mpbqi const & operator()(polynomial::var x) const {
mpbqi_manager & m() const override { return m_imp.bqim(); }
bool contains(polynomial::var x) const override { return m_x2v.contains(x) && !m_x2v(x).is_basic(); }
mpbqi const & operator()(polynomial::var x) const override {
anum const & v = m_x2v(x);
SASSERT(!v.is_basic());
return v.to_algebraic()->m_interval;
@ -2220,9 +2220,9 @@ namespace algebraic_numbers {
m_x(x),
m_v(v) {
}
virtual manager & m() const { return m_am; }
virtual bool contains(polynomial::var x) const { return x == m_x || m_x2v.contains(x); }
virtual anum const & operator()(polynomial::var x) const {
manager & m() const override { return m_am; }
bool contains(polynomial::var x) const override { return x == m_x || m_x2v.contains(x); }
anum const & operator()(polynomial::var x) const override {
if (x == m_x)
return m_v;
else
@ -2553,9 +2553,9 @@ namespace algebraic_numbers {
m_x2v(x2v),
m_v(v) {
}
virtual manager & m() const { return m_am; }
virtual bool contains(polynomial::var x) const { return true; }
virtual anum const & operator()(polynomial::var x) const {
manager & m() const override { return m_am; }
bool contains(polynomial::var x) const override { return true; }
anum const & operator()(polynomial::var x) const override {
if (m_x2v.contains(x))
return m_x2v(x);
else

12
src/math/polynomial/polynomial.cpp
View file

@ -6350,9 +6350,9 @@ namespace polynomial {
m_var_pos(buffer, xs_sz, xs),
m_vs(vs) {
}
virtual unsynch_mpq_manager & m() const { UNREACHABLE(); static unsynch_mpq_manager m; return m; }
virtual bool contains(var x) const { return m_var_pos(x) != UINT_MAX; }
virtual mpq const & operator()(var x) const { return m_vs[m_var_pos(x)]; }
unsynch_mpq_manager & m() const override { UNREACHABLE(); static unsynch_mpq_manager m; return m; }
bool contains(var x) const override { return m_var_pos(x) != UINT_MAX; }
mpq const & operator()(var x) const override { return m_vs[m_var_pos(x)]; }
};
polynomial * substitute(polynomial const * p, unsigned xs_sz, var const * xs, mpq const * vs) {
@ -6527,9 +6527,9 @@ namespace polynomial {
numeral const & m_val;
public:
single_var2value(numeral_manager & m, var x, numeral const & val):m_manager(m), m_x(x), m_val(val) {}
virtual numeral_manager & m() const { return m_manager; }
virtual bool contains(var x) const { return m_x == x; }
virtual numeral const & operator()(var x) const { SASSERT(m_x == x); return m_val; }
numeral_manager & m() const override { return m_manager; }
bool contains(var x) const override { return m_x == x; }
numeral const & operator()(var x) const override { SASSERT(m_x == x); return m_val; }
};
void univ_eval(polynomial const * p, var x, numeral const & val, numeral & r) {

2
src/math/polynomial/upolynomial_factorization_int.h
View file

@ -322,7 +322,7 @@ namespace upolynomial {
/**
\brief Filter the ones not in the degree set.
*/
bool filter_current() const {
bool filter_current() const override {
// select only the ones that have degrees in the degree set
if (!m_degree_set.in_set(current_degree())) {