mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

Use override rather than virtual.

Browse source
This commit is contained in:
Bruce Mitchener 2018-02-09 21:15:02 +07:00
parent 2b847478a2
commit b7d1753843
138 changed files with 1621 additions and 1624 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/nlsat/nlsat_assignment.h
View file

@ -66,9 +66,9 @@ namespace nlsat {
void reset() { m_assigned.reset(); }
bool is_assigned(var x) const { return m_assigned.get(x, false); }
anum const & value(var x) const { return m_values[x]; }
virtual anum_manager & m() const { return am(); }
virtual bool contains(var x) const { return is_assigned(x); }
virtual anum const & operator()(var x) const { SASSERT(is_assigned(x)); return value(x); }
anum_manager & m() const override { return am(); }
bool contains(var x) const override { return is_assigned(x); }
anum const & operator()(var x) const override { SASSERT(is_assigned(x)); return value(x); }
void swap(var x, var y) {
SASSERT(x < m_values.size() && y < m_values.size());
std::swap(m_assigned[x], m_assigned[y]);
@ -95,9 +95,9 @@ namespace nlsat {
var m_y;
public:
undef_var_assignment(assignment const & a, var y):m_assignment(a), m_y(y) {}
virtual anum_manager & m() const { return m_assignment.am(); }
virtual bool contains(var x) const { return x != m_y && m_assignment.is_assigned(x); }
virtual anum const & operator()(var x) const { return m_assignment.value(x); }
anum_manager & m() const override { return m_assignment.am(); }
bool contains(var x) const override { return x != m_y && m_assignment.is_assigned(x); }
anum const & operator()(var x) const override { return m_assignment.value(x); }
};
};

4
src/nlsat/nlsat_solver.cpp
View file

@ -112,7 +112,7 @@ namespace nlsat {
m_perm(perm),
m_proc(0) {
}
std::ostream& operator()(std::ostream & out, var x) const {
std::ostream& operator()(std::ostream & out, var x) const override {
if (m_proc == 0)
m_default_display_var(out, x);
else
@ -2699,7 +2699,7 @@ namespace nlsat {
var m_x;
public:
mathematica_var_proc(var x):m_x(x) {}
virtual std::ostream& operator()(std::ostream & out, var x) const {
std::ostream& operator()(std::ostream & out, var x) const override {
if (m_x == x)
return out << "#1";
else

4
src/nlsat/tactic/goal2nlsat.cpp
View file

@ -41,11 +41,11 @@ struct goal2nlsat::imp {
m_solver(s) {
}
virtual bool is_int(polynomial::var x) const {
bool is_int(polynomial::var x) const override {
return m_solver.is_int(x);
}
virtual polynomial::var mk_var(bool is_int) {
polynomial::var mk_var(bool is_int) override {
return m_solver.mk_var(is_int);
}
};

26
src/nlsat/tactic/nlsat_tactic.cpp
View file

@ -32,7 +32,7 @@ class nlsat_tactic : public tactic {
ast_manager & m;
expr_ref_vector m_var2expr;
expr_display_var_proc(ast_manager & _m):m(_m), m_var2expr(_m) {}
virtual std::ostream& operator()(std::ostream & out, nlsat::var x) const {
std::ostream& operator()(std::ostream & out, nlsat::var x) const override {
if (x < m_var2expr.size())
return out << mk_ismt2_pp(m_var2expr.get(x), m);
else
@ -214,29 +214,29 @@ public:
m_imp = 0;
}
virtual tactic * translate(ast_manager & m) {
tactic * translate(ast_manager & m) override {
return alloc(nlsat_tactic, m_params);
}
virtual ~nlsat_tactic() {
~nlsat_tactic() override {
SASSERT(m_imp == 0);
}
virtual void updt_params(params_ref const & p) {
void updt_params(params_ref const & p) override {
m_params = p;
}
virtual void collect_param_descrs(param_descrs & r) {
void collect_param_descrs(param_descrs & r) override {
goal2nlsat::collect_param_descrs(r);
nlsat::solver::collect_param_descrs(r);
algebraic_numbers::manager::collect_param_descrs(r);
}
virtual void operator()(goal_ref const & in,
goal_ref_buffer & result,
model_converter_ref & mc,
proof_converter_ref & pc,
expr_dependency_ref & core) {
void operator()(goal_ref const & in,
goal_ref_buffer & result,
model_converter_ref & mc,
proof_converter_ref & pc,
expr_dependency_ref & core) override {
try {
imp local_imp(in->m(), m_params);
scoped_set_imp setter(*this, local_imp);
@ -251,13 +251,13 @@ public:
}
}
virtual void cleanup() {}
void cleanup() override {}
virtual void collect_statistics(statistics & st) const {
void collect_statistics(statistics & st) const override {
st.copy(m_stats);
}
virtual void reset_statistics() {
void reset_statistics() override {
m_stats.reset();
}
};