From cc00ed83a33de5e7c3b1fb9fbd91913a98d9e1ec Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sat, 4 May 2024 14:51:46 -0400
Subject: [PATCH] xo-unit: quantity: + addition for quantities

---
 include/xo/unit/quantity.hpp | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/include/xo/unit/quantity.hpp b/include/xo/unit/quantity.hpp
index 87f7b4ac..af8ee94f 100644
--- a/include/xo/unit/quantity.hpp
+++ b/include/xo/unit/quantity.hpp
@@ -232,6 +232,34 @@ namespace xo {
                                     r_int2x_type
                                     >(r_scale);
                 }
+
+                template <typename Q1, typename Q2>
+                requires(quantity_concept<Q1>
+                         && quantity_concept<Q2>
+                         && Q1::always_constexpr_unit
+                         && Q2::always_constexpr_unit)
+                static constexpr auto add(Q1 x, Q2 y) {
+                    using r_repr_type = std::common_type_t<typename Q1::repr_type,
+                                                           typename Q2::repr_type>;
+                    using r_int_type = std::common_type_t<typename Q1::ratio_int_type,
+                                                          typename Q2::ratio_int_type>;
+                    using r_int2x_type = std::common_type_t<typename Q1::ratio_int2x_type,
+                                                            typename Q2::ratio_int2x_type>;
+                    /* conversion to get y in same units as x: multiply by y/x */
+                    auto rr = detail::su_ratio<r_int_type, r_int2x_type>(y.unit(), x.unit());
+
+                    if (rr.natural_unit_.is_dimensionless()) {
+                        r_repr_type r_scale = (static_cast<r_repr_type>(x.scale())
+                                               + (::sqrt(rr.outer_scale_sq_)
+                                                  * rr.outer_scale_factor_.template convert_to<r_repr_type>()
+                                                  * static_cast<r_repr_type>(y.scale())));
+
+                        return quantity<x.s_unit, r_repr_type, r_int2x_type>(r_scale);
+                    } else {
+                        /* units don't match! */
+                        return quantity<x.s_unit, r_repr_type, r_int2x_type>(std::numeric_limits<r_repr_type>::quiet_NaN());
+                    }
+                }
             };
         } /*namespace detail*/
 
@@ -289,6 +317,19 @@ namespace xo {
             return detail::quantity_util::divide(x, y);
         }
 
+        /** note: won't have constexpr result w/ fractional dimension until c++26 (when ::sqrt(), ::pow() are constexpr)
+         **/
+        template <typename Q1, typename Q2>
+        requires (quantity_concept<Q1>
+                  && quantity_concept<Q2>
+                  && Q1::always_constexpr_unit
+                  && Q2::always_constexpr_unit)
+        constexpr auto
+        operator+ (const Q1 & x, const Q2 & y)
+        {
+            return detail::quantity_util::add(x, y);
+        }
+
         namespace qty {
             // ----- mass -----