From 73298734d64d68656aae2da687342761065ab4e2 Mon Sep 17 00:00:00 2001 From: koe Date: Sun, 18 Dec 2022 10:18:46 -0600 Subject: [PATCH] adjust is_sorted_and_unique() --- src/common/container_helpers.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/common/container_helpers.h b/src/common/container_helpers.h index 6ac94b51a..1865bd111 100644 --- a/src/common/container_helpers.h +++ b/src/common/container_helpers.h @@ -47,21 +47,20 @@ namespace tools { -/// use operator< to get operator== -/// WARNING: equality is not always implied by operator<, depending on implementation -struct equals_from_less final +/// test if a container is sorted and unique according to a comparison criteria (defaults to operator<) +template > +bool is_sorted_and_unique(const T &container, const ComparisonOpT &ComparisonOp = ComparisonOpT{}) { - template - bool operator()(const T &a, const T &b) { return !(a < b) && !(b < a); } -}; -/// note: test for sorted and uniqueness using the same criteria (operator<) -template -bool is_sorted_and_unique(const T& container) -{ - if (!std::is_sorted(container.begin(), container.end())) + if (!std::is_sorted(container.begin(), container.end(), ComparisonOp)) return false; - if (std::adjacent_find(container.begin(), container.end(), equals_from_less{}) != container.end()) + if (std::adjacent_find(container.begin(), + container.end(), + [&ComparisonOp](const typename T::value_type &a, const typename T::value_type &b) -> bool + { + return !ComparisonOp(a, b) && !ComparisonOp(b, a); + }) + != container.end()) return false; return true;