From c1e2ea80f5f936df1fed4a1136a047054bd7c12b Mon Sep 17 00:00:00 2001 From: Jakob Rath Date: Mon, 22 Aug 2022 14:17:47 +0200 Subject: [PATCH] make explicit that we compare the concrete values --- src/math/polysat/interval.h | 2 +- src/math/polysat/viable.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/math/polysat/interval.h b/src/math/polysat/interval.h index 9bea56d41..8bebb4cec 100644 --- a/src/math/polysat/interval.h +++ b/src/math/polysat/interval.h @@ -96,7 +96,7 @@ namespace polysat { else return val < hi_val() || val >= lo_val(); } - bool contains(eval_interval const& other) const { + bool currently_contains(eval_interval const& other) const { if (is_full()) return true; // lo <= lo' <= hi' <= hi' diff --git a/src/math/polysat/viable.cpp b/src/math/polysat/viable.cpp index 99f1212d2..d8ec229a1 100644 --- a/src/math/polysat/viable.cpp +++ b/src/math/polysat/viable.cpp @@ -211,11 +211,11 @@ namespace polysat { else { entry* first = e; do { - if (e->interval.contains(ne->interval)) { + if (e->interval.currently_contains(ne->interval)) { m_alloc.push_back(ne); return false; } - while (ne->interval.contains(e->interval)) { + while (ne->interval.currently_contains(e->interval)) { entry* n = e->next(); remove_entry(e); if (!m_units[v]) { @@ -228,7 +228,7 @@ namespace polysat { } SASSERT(e->interval.lo_val() != ne->interval.lo_val()); if (e->interval.lo_val() > ne->interval.lo_val()) { - if (first->prev()->interval.contains(ne->interval)) { + if (first->prev()->interval.currently_contains(ne->interval)) { m_alloc.push_back(ne); return false; } @@ -729,7 +729,7 @@ namespace polysat { return false; auto* n = e->next(); - if (n != e && e->interval.contains(n->interval)) + if (n != e && e->interval.currently_contains(n->interval)) return false; if (n == first)