Merge pull request #30 from csdms/mcflugen/fix-float-as-int-parameter

Truncate floats when passed to IntParameter

Author: mcflugen

src/model_metadata/model_parameter.py

@@ -238,13 +238,13 @@ def __init__(
         if range_ is not None and len(range_) != 2:
             raise ValueError("range must be either None or (min, max)")
 
-        try:
-            value = int(value)
-        except ValueError:
-            value = float(value)
-        finally:
-            if not isinstance(value, (int, float)):
-                raise ValueError("value is not a number")
+        if isinstance(value, str):
+            try:
+                value = int(value)
+            except ValueError:
+                value = float(value)
+        if not isinstance(value, (int, float)):
+            raise ValueError("value is not a number")
 
         super().__init__(value, desc=desc)
 
@@ -382,6 +382,14 @@ def __init__(
         range: tuple[int, int] | None = None,
         units: str | None = None,
     ):
+        if isinstance(value, float):
+            warnings.warn(
+                f"{value}: floating point number passed as an integer parameter, value"
+                f" will be truncated to {int(value)}",
+                stacklevel=2,
+            )
+            value = int(value)
+
         if not isinstance(value, (int, str)):
             raise ValueError(
                 "value must be either an int or a string that can be converted to"

tests/parameter_test.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+import pytest
+from model_metadata.model_parameter import FloatParameter
+from model_metadata.model_parameter import IntParameter
+
+
+@pytest.mark.parametrize("value", (1973, 1973.0, 1973.5, "1973"))
+def test_int_parameter(value):
+    p = IntParameter(value)
+    assert isinstance(p.value, int)
+    assert p.value == 1973
+
+
+@pytest.mark.parametrize("value", (3.14, "3.14"))
+def test_float_parameter(value):
+    p = FloatParameter(value)
+    assert isinstance(p.value, float)
+    assert p.value == 3.14