From 5ab79f0c63f58c057ed9c9bf33e800f903618458 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Wed, 9 Nov 2022 22:50:54 -1000
Subject: [PATCH] feat: `quantity_equivalent_to` concept added

---
 src/core/include/units/concepts.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/core/include/units/concepts.h b/src/core/include/units/concepts.h
index 8a7d8e2e..afdfeb4f 100644
--- a/src/core/include/units/concepts.h
+++ b/src/core/include/units/concepts.h
@@ -110,9 +110,17 @@ inline constexpr bool is_quantity<quantity<R, Rep>> = true;
  * Satisfied by all quantities with a dimension being the instantiation derived from
  * the provided dimension type.
  */
-template<typename Q, auto V>
-concept quantity_of = Quantity<Q> && ((Dimension<std::remove_const_t<decltype(V)>> && Q::dimension == V) ||
-                                      (Reference<std::remove_const_t<decltype(V)>> && Q::dimension == V.dimension &&
-                                       Q::unit == V.unit));
+template<typename Q, Dimension auto D>
+concept quantity_of = Quantity<Q> && Dimension<std::remove_const_t<decltype(D)>> && (Q::dimension == D);
+
+/**
+ * @brief A concept matching all quantities with provided dimension or reference
+ *
+ * Satisfied by all quantities with a dimension being the instantiation derived from
+ * the provided dimension type.
+ */
+template<typename Q, Dimension auto D>
+concept quantity_equivalent_to = Quantity<Q> && Dimension<std::remove_const_t<decltype(D)>> &&
+                                 (interconvertible(Q::dimension, D));
 
 }  // namespace units