fix python dimension conversion

Author: phlptp

python/units_python.cpp

@@ -732,7 +732,7 @@ NB_MODULE(units_llnl_ext, mod)
                             units::precise::generate_custom_count_unit(
                                   static_cast<std::uint16_t>(value));
                     } else {
-                        def = def * (units::unit_from_string(key).pow(value));
+                        def = def * (units::default_unit(key).pow(value));
                     }
                 }
                 new (dim) Dimension{def};

test/python/test_dimensions.py

@@ -78,15 +78,16 @@ def test_dimensions_decompose1():
     d1 = Dimension("volume")
     decomposition = d1.decompose()
 
-    assert decomposition["meters"] == 3
+    assert decomposition["Length"] == 3
 
 
 def test_dimensions_decompose2():
     u1 = Unit("$ per watt radian")
     dim = u1.dimension
     decomposition = dim.decompose()
-
+    print(f"dim={decomposition}")
     dim2 = Dimension(decomposition)
+    print(f"dim2={dim2.decompose()}")
     assert dim2 == dim
     assert dim2.default_unit == u1
 

units/units.cpp

@@ -6121,6 +6121,9 @@ precise_unit default_unit(std::string unit_type)
     if (unit_type.compare(0, 10, "quantityof") == 0) {
         return default_unit(unit_type.substr(10));
     }
+    if (unit_type.compare(0, 9, "measureof") == 0) {
+        return default_unit(unit_type.substr(9));
+    }
     if (unit_type.compare(0, 6, "rateof") == 0) {
         return default_unit(unit_type.substr(6)) / precise::s;
     }
@@ -6171,6 +6174,11 @@ precise_unit default_unit(std::string unit_type)
                    unit_type.substr(0, unit_type.size() - strlen("rate"))) /
             precise::s;
     }
+    auto retunit=unit_from_string(unit_type);
+    if (is_valid(retunit))
+    {
+        return precise_unit(retunit.base_units());
+    }
     return precise::invalid;
 }
 

units/units_conversion_maps.hpp

@@ -3248,7 +3248,7 @@ std::array<std::pair<const char*, precise_unit>, 233>
 
 // Mostly from https://en.wikipedia.org/wiki/International_System_of_Units
 UNITS_CPP14_CONSTEXPR_OBJECT
-std::array<std::pair<const char*, precise_unit>, 247> defined_measurement_types{
+std::array<std::pair<const char*, precise_unit>, 251> defined_measurement_types{
     {
         {"", precise::defunit},
         {"arb", precise::defunit},
@@ -3283,8 +3283,8 @@ std::array<std::pair<const char*, precise_unit>, 247> defined_measurement_types{
         {"temp", precise::K},
         {"thermodynamictemperature", precise::K},
         {"thermalconductivity", precise::W / precise::m / precise::K},
-        {"amount", precise::mol},
         {"amountofsubstance", precise::mol},
+        {"amount", precise::mol},
         {"substance", precise::mol},
         {"sub", precise::mol},
         {"luminousintensity", precise::cd},
@@ -3498,5 +3498,9 @@ std::array<std::pair<const char*, precise_unit>, 247> defined_measurement_types{
         {"information", precise::bit},
         {"unitless", precise::one},
         {"numeric", precise::one},
+        {"currency",precise::currency},
+        {"value",precise::currency},
+        {"money",precise::currency},
+        {"count",precise::count},
     }};
 }  // namespace UNITS_NAMESPACE