From 965bee5801e95054d74d62a9749ba031e6179999 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Sat, 2 Dec 2023 19:52:59 -0800 Subject: [PATCH] fix build --- src/sat/sat_extension.h | 2 +- src/sat/sat_solver.cpp | 2 +- src/sat/smt/euf_solver.cpp | 2 +- src/sat/smt/euf_solver.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sat/sat_extension.h b/src/sat/sat_extension.h index 3bb190cf4..b42cc33e2 100644 --- a/src/sat/sat_extension.h +++ b/src/sat/sat_extension.h @@ -87,7 +87,7 @@ namespace sat { virtual void init_search() {} virtual bool propagated(sat::literal l, sat::ext_constraint_idx idx) { UNREACHABLE(); return false; } virtual bool unit_propagate() = 0; - virtual bool should_propagate() { return false; } + virtual bool can_propagate() { return false; } virtual bool is_external(bool_var v) { return false; } virtual double get_reward(literal l, ext_constraint_idx idx, literal_occs_fun& occs) const { return 0; } virtual void get_antecedents(literal l, ext_justification_idx idx, literal_vector & r, bool probing) = 0; diff --git a/src/sat/sat_solver.cpp b/src/sat/sat_solver.cpp index ba5170c7f..96b3c13c4 100644 --- a/src/sat/sat_solver.cpp +++ b/src/sat/sat_solver.cpp @@ -1785,7 +1785,7 @@ namespace sat { } bool solver::should_propagate() const { - return !inconsistent() && (m_qhead < m_trail.size() || (m_ext && m_ext->should_propagate())); + return !inconsistent() && (m_qhead < m_trail.size() || (m_ext && m_ext->can_propagate())); } lbool solver::final_check() { diff --git a/src/sat/smt/euf_solver.cpp b/src/sat/smt/euf_solver.cpp index f4a563876..3ae4425fc 100644 --- a/src/sat/smt/euf_solver.cpp +++ b/src/sat/smt/euf_solver.cpp @@ -435,7 +435,7 @@ namespace euf { } - bool solver::should_propagate() { + bool solver::can_propagate() { return m_egraph.can_propagate(); } diff --git a/src/sat/smt/euf_solver.h b/src/sat/smt/euf_solver.h index 4121b68c9..db99ec512 100644 --- a/src/sat/smt/euf_solver.h +++ b/src/sat/smt/euf_solver.h @@ -348,7 +348,7 @@ namespace euf { bool is_external(bool_var v) override; bool propagated(literal l, ext_constraint_idx idx) override; bool unit_propagate() override; - bool should_propagate() override; + bool can_propagate() override; bool should_research(sat::literal_vector const& core) override; void add_assumptions(sat::literal_set& assumptions) override; bool tracking_assumptions() override;