unitforge 0.3.15__tar.gz → 0.3.16__tar.gz

{unitforge-0.3.15 → unitforge-0.3.16}/Cargo.lock

@@ -369,7 +369,7 @@ checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 
 [[package]]
 name = "unitforge"
-version = "0.3.15"
+version = "0.3.16"
 dependencies = [
  "ndarray",
  "num-traits",
@@ -384,7 +384,7 @@ dependencies = [
 
 [[package]]
 name = "unitforge_macros"
-version = "0.3.15"
+version = "0.3.16"
 dependencies = [
  "regex",
 ]

{unitforge-0.3.15 → unitforge-0.3.16}/Cargo.toml

@@ -4,7 +4,7 @@ crate-type = ["cdylib", "rlib"]
 
 [package]
 name = "unitforge"
-version = "0.3.15"
+version = "0.3.16"
 edition = "2021"
 authors = ["Dr.Q team <info@askdrq.com>", "Henrik Stromberg <henrik@askdrq.com>"]
 description = "A library for unit and quantity consistent computations in Rust"
@@ -23,7 +23,7 @@ pyo3 = { version = "0.26.0", features = ["extension-module", "auto-initialize",
 numpy = { version = "0.26.0", optional = true }
 strum = { version = "0.28.0", optional = true }
 strum_macros = { version = "0.28.0", optional = true }
-unitforge_macros = { version = "0.3.15", path = "unitforge_macros" }
+unitforge_macros = { version = "0.3.16", path = "unitforge_macros" }
 
 [features]
 serde = ["dep:serde", "dep:serde_json", "ndarray/serde"]

{unitforge-0.3.15 → unitforge-0.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitforge
-Version: 0.3.15
+Version: 0.3.16
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: MIT License

{unitforge-0.3.15 → unitforge-0.3.16}/src/impl_macros.rs

@@ -3,11 +3,11 @@ macro_rules! impl_quantity {
     ($type:ident, $unit:ident, $display_units:expr) => {
         use ndarray::{Array1, Array2, ArrayView1, ArrayView2};
         use num_traits::Zero;
-        use std::collections::HashSet;
         use num_traits::{Float, FromPrimitive};
         #[cfg(feature = "serde")]
         use serde::{Deserialize, Serialize};
         use std::cmp::Ordering;
+        use std::collections::HashSet;
         use std::fmt;
         use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
         use $crate::prelude::*;
@@ -20,8 +20,6 @@ macro_rules! impl_quantity {
             IntoPyObject, Py, PyAny, PyRef, PyResult,
         };
 
-        #[cfg(feature = "strum")]
-        use strum::IntoEnumIterator;
         #[cfg(feature = "strum")]
         use strum_macros::EnumIter;
         use $crate::small_linalg::{Matrix3, Vector3};
@@ -594,35 +592,14 @@ macro_rules! impl_quantity {
             }
         }
 
-        #[cfg(feature = "strum")]
-        impl $type {
-            pub fn optimal_unit(
-                &self,
-                choices: impl Into<Option<HashSet<$unit>>>,
-            ) -> Option<$unit> {
-                let choices = choices.into().unwrap_or_else(|| $unit::iter().collect());
-                let mut min_value = f64::INFINITY;
-                let mut best_unit = None;
-                for unit in choices {
-                    let deviation = (self.to(unit).abs() - 1.).abs();
-                    if deviation < min_value {
-                        min_value = deviation;
-                        best_unit = Some(unit);
-                    }
-                }
-                best_unit
-            }
-        }
-
-        #[cfg(not(feature = "strum"))]
         impl $type {
             pub fn optimal_unit(&self, choices: HashSet<$unit>) -> Option<$unit> {
-                let mut min_value = f64::INFINITY;
+                let mut min_value = i32::MAX;
                 let mut best_unit = None;
                 for unit in choices {
-                    let deviation = (self.to(unit).abs() - 1.).abs();
-                    if deviation < min_value {
-                        min_value = deviation;
+                    let difference = (self.power - unit.base_per_x().1).abs();
+                    if difference < min_value {
+                        min_value = difference;
                         best_unit = Some(unit);
                     }
                 }

{unitforge-0.3.15 → unitforge-0.3.16}/src/tests/quantity_unit_tests.rs

@@ -101,22 +101,6 @@ mod tests {
         assert!((result.to(ForceStressUnit::Nsq_msq) - 6.0).abs() < 1E-12);
     }
 
-    #[cfg(feature = "strum")]
-    #[test]
-    fn test_optimal_unit() {
-        let area = Area::new(0.0001, AreaUnit::msq);
-        let optimal_unit = area.optimal_unit(None).unwrap();
-        assert_eq!(optimal_unit, AreaUnit::cmsq)
-    }
-
-    #[cfg(feature = "strum")]
-    #[test]
-    fn test_optimal_unit_with_selection_strum() {
-        let area = Area::new(0.0001, AreaUnit::msq);
-        let optimal_unit = area.optimal_unit(Some(vec![AreaUnit::kmsq, AreaUnit::cmsq, AreaUnit::nmsq].into_iter().collect())).unwrap();
-        assert_eq!(optimal_unit, AreaUnit::cmsq)
-    }
-
     #[test]
     fn test_optimal_unit_with_selection() {
         let area = Area::new(0.0001, AreaUnit::msq);

{unitforge-0.3.15 → unitforge-0.3.16}/unitforge_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "unitforge_macros"
-version = "0.3.15"
+version = "0.3.16"
 edition = "2021"
 authors = ["Dr.Q team <info@askdrq.com>", "Henrik Stromberg <henrik@askdrq.com>"]
 description = "Proc macros for generating units, quantities, and Python bindings in unitforge"

{unitforge-0.3.15 → unitforge-0.3.16}/unitforge_macros/src/lib.rs

@@ -241,7 +241,9 @@ fn parse_unit_variants(files: &[String], unit_name: &str) -> Result<Vec<String>,
         }
     }
 
-    Err(format!("Enum {unit_name} not found in quantity source files"))
+    Err(format!(
+        "Enum {unit_name} not found in quantity source files"
+    ))
 }
 
 fn fnv1a32(input: &str) -> u32 {
@@ -443,12 +445,10 @@ fn write_quantity_code(
         let mut id_to_variant_match = String::new();
         for variant_name in unit_variant_list {
             let variant_id = stable_unit_variant_id(&unit_name, variant_name);
-            variant_to_id_match += &format!(
-                "            {struct_name}Unit::{variant_name} => {variant_id},\n"
-            );
-            id_to_variant_match += &format!(
-                "            {variant_id} => Some({struct_name}Unit::{variant_name}),\n"
-            );
+            variant_to_id_match +=
+                &format!("            {struct_name}Unit::{variant_name} => {variant_id},\n");
+            id_to_variant_match +=
+                &format!("            {variant_id} => Some({struct_name}Unit::{variant_name}),\n");
         }
         unit_variant_id_impls += &format!(
             "impl pyo3_capsule_api::UnitVariantId for {struct_name}Unit {{\n    fn to_variant_id(self) -> i32 {{\n        match self {{\n{variant_to_id_match}        }}\n    }}\n    fn from_variant_id(variant_id: i32) -> Option<Self> {{\n        match variant_id {{\n{id_to_variant_match}            _ => None,\n        }}\n    }}\n}}\n"
@@ -559,7 +559,10 @@ fn write_quantity_code(
         .replace("// __UNIT_KIND_ID_IMPLS__", &unit_kind_id_impls)
         .replace("// __UNIT_VARIANT_ID_IMPLS__", &unit_variant_id_impls)
         .replace("// __QUANTITY_TO_REPR_MATCHES__", &quantity_to_repr_matches)
-        .replace("// __QUANTITY_FROM_REPR_MATCHES__", &quantity_from_repr_matches)
+        .replace(
+            "// __QUANTITY_FROM_REPR_MATCHES__",
+            &quantity_from_repr_matches,
+        )
         .replace("// __UNIT_TO_REPR_MATCHES__", &unit_to_repr_matches)
         .replace("// __UNIT_FROM_REPR_MATCHES__", &unit_from_repr_matches)
         .replace("// __UNIT_TO_PYOBJECT_MATCHES__", &unit_to_pyobject_matches))