From fcb03aa56c193c5d53baa4d65105e25aa3404c4a Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Tue, 10 Oct 2023 17:19:40 +0100 Subject: [PATCH] minor code simplification --- src/smt/smt_conflict_resolution.cpp | 2 +- src/util/approx_set.h | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/smt/smt_conflict_resolution.cpp b/src/smt/smt_conflict_resolution.cpp index 2561fbb5a..793243473 100644 --- a/src/smt/smt_conflict_resolution.cpp +++ b/src/smt/smt_conflict_resolution.cpp @@ -753,7 +753,7 @@ namespace smt { } else { if (j != i) { - m_lemma[j] = m_lemma[i]; + m_lemma[j] = l; m_lemma_atoms.set(j, m_lemma_atoms.get(i)); } j++; diff --git a/src/util/approx_set.h b/src/util/approx_set.h index aa6f8d383..a1835be6f 100644 --- a/src/util/approx_set.h +++ b/src/util/approx_set.h @@ -41,7 +41,7 @@ static_assert(sizeof(unsigned) == 4, "unsigned are 4 bytes"); template class approx_set_tpl : private T2U_Proc { protected: - R m_set; + R m_set = approx_set_traits::zero; unsigned e2u(T const & e) const { return T2U_Proc::operator()(e); } @@ -52,24 +52,17 @@ protected: static approx_set_tpl r2s(R const & s) { approx_set_tpl r; r.m_set = s; return r; } public: - approx_set_tpl(): - m_set(approx_set_traits::zero) { - } + approx_set_tpl() = default; explicit approx_set_tpl(T const & e): m_set(e2s(e)) { } - approx_set_tpl(unsigned sz, T const * es): - m_set(approx_set_traits::zero) { + approx_set_tpl(unsigned sz, T const * es) { for (unsigned i = 0; i < sz; i++) insert(es[i]); } - approx_set_tpl(approx_set_tpl const & s): - m_set(s.m_set) { - } - void set(R s) { m_set = s; } R get() const { return m_set; }