PyOpenMagnetics 1.4.4__tar.gz → 1.4.5__tar.gz

{pyopenmagnetics-1.4.4 → pyopenmagnetics-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyOpenMagnetics
-Version: 1.4.4
+Version: 1.4.5
 Summary: Python wrapper for OpenMagnetics
 Author-Email: Alfonso Martinez <Alfonso_VII@hotmail.com>
 Classifier: Development Status :: 4 - Beta

{pyopenmagnetics-1.4.4 → pyopenmagnetics-1.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.4.4"
+version = "1.4.5"
 requires-python = ">=3.8"
 authors = [
   { name="Alfonso Martinez", email="Alfonso_VII@hotmail.com" },

{pyopenmagnetics-1.4.4 → pyopenmagnetics-1.4.5}/src/utils.cpp

@@ -2,9 +2,10 @@
 
 namespace PyMKF {
 
-double resolve_dimension_with_tolerance(json dimensionWithToleranceJson) {
+double resolve_dimension_with_tolerance(json dimensionWithToleranceJson, std::string preferredValue) {
     DimensionWithTolerance dimensionWithTolerance(dimensionWithToleranceJson);
-    return OpenMagnetics::resolve_dimensional_values(dimensionWithTolerance);
+    OpenMagnetics::DimensionalValues preferred = json(preferredValue).get<OpenMagnetics::DimensionalValues>();
+    return OpenMagnetics::resolve_dimensional_values(dimensionWithTolerance, preferred);
 }
 
 json calculate_basic_processed_data(json waveformJson) {
@@ -347,16 +348,19 @@ void register_utils_bindings(py::module& m) {
     m.def("resolve_dimension_with_tolerance", &resolve_dimension_with_tolerance,
         R"pbdoc(
         Resolve a dimension specification that may include tolerances.
-        
+
         Extracts a single value from dimension data that may contain
         nominal, minimum, and maximum values.
-        
+
         Args:
             dimension_json: JSON object with dimension specification.
-        
+            preferred: Which value to prefer when present — "Nominal" (default),
+                "Maximum", or "Minimum".
+
         Returns:
             Resolved dimension value as float.
-        )pbdoc");
+        )pbdoc",
+        py::arg("dimensionWithToleranceJson"), py::arg("preferredValue") = "Nominal");
     
     m.def("calculate_basic_processed_data", &calculate_basic_processed_data,
         R"pbdoc(

{pyopenmagnetics-1.4.4 → pyopenmagnetics-1.4.5}/src/utils.h

@@ -4,7 +4,7 @@
 namespace PyMKF {
 
 // Utility functions for processing and calculations
-double resolve_dimension_with_tolerance(json dimensionWithToleranceJson);
+double resolve_dimension_with_tolerance(json dimensionWithToleranceJson, std::string preferredValue = "Nominal");
 json calculate_basic_processed_data(json waveformJson);
 json calculate_harmonics(json waveformJson, double frequency);
 json calculate_sampled_waveform(json waveformJson, double frequency);