To v0.3.1

Author: pgleeson

src/modelspec/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 from .base_types import Base, define, has, field, fields, optional, instance_of, in_
 

src/modelspec/utils.py

@@ -12,7 +12,7 @@
 from random import Random
 from typing import Union
 
-verbose = False
+verbose = True
 
 
 def load_json(filename: str):
@@ -320,6 +320,10 @@ def evaluate(
             if rng:
                 expr = expr.replace("random()", "rng.random()")
                 parameters["rng"] = rng
+            elif "random()" in expr:
+                raise Exception(
+                    "The expression [%s] contains a random() call, but a random number generator (rng) must be supplied to the evaluate() call when this expression string is to be evaluated"
+                )
 
             if type(expr) == str and "math." in expr:
                 parameters["math"] = math

tests/test_utils.py

@@ -60,6 +60,23 @@ def test_evaluate(self):
         assert AtimesB[0, 0] == 1
         assert AtimesB.shape == (2, 2)
 
+        assert evaluate("math.sin(1)", verbose=True) == 0.8414709848078965
+        assert evaluate("math.exp(1)+1", verbose=True) == 3.718281828459045
+
+        params = {"v": -0.070, "v_offset": -0.050, "MVOLT": 0.001}
+
+        assert (
+            evaluate(
+                "math.exp((13 - (v / MVOLT) + v_offset) / 4.0)", params, verbose=True
+            )
+            == 1014335951.1351416
+        )
+
+        params = {"x": 1}
+        params = {"x": np.array([1, 2])}
+        ee = evaluate("numpy.exp(x)+x", params, verbose=True)
+        assert ee[0] == 3.718281828459045
+
     def test_val_info_tuple(self):
         print(_val_info((1, 2)))
         print(_val_info((("test", 1), 2)))