treat output vals of both int and float as number

Author: softwareengineerprogrammer

src/geophires_x/Parameter.py

@@ -102,9 +102,9 @@ def __post_init__(self):
                 self.json_parameter_type = _JSON_PARAMETER_TYPE_STRING
             elif isinstance(self.value, bool):
                 self.json_parameter_type = _JSON_PARAMETER_TYPE_BOOLEAN
-            elif isinstance(self.value, int):
-                self.json_parameter_type = _JSON_PARAMETER_TYPE_INTEGER
-            elif isinstance(self.value, float):
+            elif isinstance(self.value, float) or isinstance(self.value, int):
+                # Default number values may not be representative of whether calculated values are integer-only,
+                # so we specify number type even if value is int.
                 self.json_parameter_type = _JSON_PARAMETER_TYPE_NUMBER
             elif isinstance(self.value, dict):
                 self.json_parameter_type = _JSON_PARAMETER_TYPE_OBJECT

tests/test_parameter.py

@@ -154,7 +154,8 @@ def test_output_parameter_with_preferred_units(self):
     def test_output_parameter_json_types(self):
         cases = [
             ('foo', 'string'),
-            (1, 'integer'),
+            (1, 'number'),
+            (44.4, 'number'),
             (True, 'boolean'),
             ([1, 2, 3], 'array'),
             ({4, 5, 6}, 'array'),