Units and uncertainties now parse.

toastedcrumpets · Sep 16, 2021 · b21bd23 · b21bd23
1 parent f4bc72b
commit b21bd23
Show file tree

Hide file tree

Showing 10 changed files with 703 additions and 480 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -176,6 +176,8 @@ if(GTest_FOUND)
   stator_test(symbolic_ad_test)
   stator_test(symbolic_array_test)
   stator_test(symbolic_interval_test)
+  stator_test(symbolic_units_test)
+  stator_test(symbolic_uncertainty_test)
   #stator_test(symbolic_integration_test)
 else()
   message(WARNING "Cannot find GTest library, disabling unit tests!")

diff --git a/stator/symbolic/binary_ops.hpp b/stator/symbolic/binary_ops.hpp
@@ -60,6 +60,7 @@ namespace sym {
       static constexpr auto associativity = Associativity::LEFT;
       static constexpr bool commutative = true;
       static constexpr bool associative = true;
+      static constexpr bool wrapped = false;
       typedef Null left_identity;
       typedef Null right_identity;
       typedef NoIdentity left_zero;
@@ -80,6 +81,7 @@ namespace sym {
       static constexpr auto associativity = Associativity::LEFT;
       static constexpr bool commutative = false;
       static constexpr bool associative = false;
+      static constexpr bool wrapped = false;
       typedef NoIdentity left_identity;
       typedef Null right_identity;
       typedef NoIdentity left_zero;
@@ -99,6 +101,7 @@ namespace sym {
       static constexpr auto associativity = Associativity::LEFT;
       static constexpr bool commutative = true;
       static constexpr bool associative = true;
+      static constexpr bool wrapped = false;
       typedef Unity left_identity;
       typedef Unity right_identity;
       typedef Null left_zero;
@@ -118,6 +121,7 @@ namespace sym {
       static constexpr auto associativity = Associativity::LEFT;
       static constexpr bool commutative = false;
       static constexpr bool associative = false;
+      static constexpr bool wrapped = false;
       typedef NoIdentity left_identity;
       typedef Unity right_identity;
       typedef Null left_zero;
@@ -137,6 +141,7 @@ namespace sym {
       static constexpr auto associativity = Associativity::RIGHT;
       static constexpr bool commutative = false;
       static constexpr bool associative = false;
+      static constexpr bool wrapped = false;
       static inline std::string l_repr() { return ""; }
       static inline std::string repr() { return "^"; }
       static inline std::string r_repr() { return ""; }
@@ -160,6 +165,7 @@ namespace sym {
       static constexpr auto associativity = Associativity::RIGHT;
       static constexpr bool commutative = false;
       static constexpr bool associative = false;
+      static constexpr bool wrapped = false;
       typedef NoIdentity left_identity;
       typedef NoIdentity right_identity;
       typedef NoIdentity left_zero;
@@ -181,6 +187,7 @@ namespace sym {
       static constexpr auto associativity = Associativity::LEFT;
       static constexpr bool commutative = false;
       static constexpr bool associative = false;
+      static constexpr bool wrapped = true;
       static inline std::string l_repr() { return ""; }
       static inline std::string repr() { return "["; }
       static inline std::string r_repr() { return "]"; }
@@ -446,7 +453,7 @@ namespace sym {
       LHS_repr = detail::paren_wrap<Config>(LHS_repr);
 
     std::string RHS_repr = repr<Config>(op._r);
-    if (this_BP.second > RHS_BP.first || Config::Force_parenthesis)
+    if (((this_BP.second > RHS_BP.first) && !Op::wrapped) || Config::Force_parenthesis)
       RHS_repr = detail::paren_wrap<Config>(RHS_repr);
 
     return (Config::Latex_output ? Op::l_latex_repr() : Op::l_repr())