math-spec-mapping 0.3.9.1__py3-none-any.whl → 0.3.10__py3-none-any.whl

math_spec_mapping/Classes/MathSpec.py

@@ -775,6 +775,7 @@ class MathSpecImplementation:
         self.policies = self.load_policies()
         self.mechanisms = self.load_mechanisms()
         self.stateful_metrics = self.load_stateful_metrics()
+        self.metrics = self.load_metrics()
         self.load_wiring()
         self.load_components()
 
@@ -951,6 +952,22 @@ class MathSpecImplementation:
 
         return stateful_metrics
 
+    def load_metrics(self):
+        metrics = {}
+
+        for m in self.ms.metrics:
+            m = self.ms.metrics[m]
+            if "python" not in m.implementations:
+                print(
+                    "No python implementation for {}. To fix this, go to Implementations/Python/Metrics and add {}".format(
+                        m.name, m.name
+                    )
+                )
+            else:
+                metrics[m.name] = m.implementations["python"]
+
+        return metrics
+
     def load_wiring(
         self,
     ):
@@ -1026,6 +1043,7 @@ class MathSpecImplementation:
         state = deepcopy(state)
         params = deepcopy(params)
         state["Stateful Metrics"] = self.stateful_metrics
+        state["Metrics"] = self.metrics
         if state_preperation_functions:
             for f in state_preperation_functions:
                 state = f(state)

math_spec_mapping/Classes/Metric.py

@@ -15,3 +15,4 @@ class Metric:
         else:
             self.label = self.name
         self.metadata = data["metadata"]
+        self.implementations = data["implementations"]

math_spec_mapping/Load/metrics.py

@@ -50,6 +50,14 @@ def convert_metric(ms, data: Dict, stateful_metrics_map) -> Metric:
         for x in data["metrics_used"]
     )
 
+    data["implementations"] = {}
+    if "python" in ms["Implementations"]:
+        if "metrics" in ms["Implementations"]["python"]:
+            if data["name"] in ms["Implementations"]["python"]["metrics"]:
+                data["implementations"]["python"] = ms["Implementations"]["python"][
+                    "metrics"
+                ][data["name"]]
+
     # Build the metric object
     return Metric(data)
 
@@ -91,7 +99,9 @@ def load_metrics(ms: Dict, json: Dict, stateful_metrics_map) -> None:
             for z in y["metrics_used"]:
                 assert (
                     z in ms["Metrics"] or z in names or z in stateful_metrics_map
-                ), "{} is not defined in the spec".format(z)
+                ), "{} is not defined in the spec, but it is referenced in {}".format(
+                    z, y["name"]
+                )
         assert len(metrics) == 0, "There are circular references"
 
     # Load the metrics into the policies

math_spec_mapping/Load/spaces.py

@@ -13,8 +13,10 @@ def convert_space(ms, data: Dict) -> Space:
     data = data.copy()
 
     for x in data["schema"]:
-        assert data["schema"][x] in ms["Types"], "Type {} not in ms".format(
-            data["schema"][x]
+        assert (
+            data["schema"][x] in ms["Types"]
+        ), "Type {} not in ms for space {} at attribute {}".format(
+            data["schema"][x], data["name"], x
         )
         data["schema"][x] = ms["Types"][data["schema"][x]]
 

{math_spec_mapping-0.3.9.1.dist-info → math_spec_mapping-0.3.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math-spec-mapping
-Version: 0.3.9.1
+Version: 0.3.10
 Summary: A library for easy mapping of mathematical specifications.
 Author-email: Sean McOwen <Sean@Block.Science>
 Classifier: Programming Language :: Python :: 3

{math_spec_mapping-0.3.9.1.dist-info → math_spec_mapping-0.3.10.dist-info}/RECORD

@@ -6,9 +6,9 @@ math_spec_mapping/Classes/Block.py,sha256=cGtIhNgRfoDZ0O3SxeXcNzNlHcdXIB89sT2uaZ
 math_spec_mapping/Classes/BoundaryAction.py,sha256=_rFvEZ4LNxmlM59js4SuQ9n5CgVmITw4YWKs0-q0r-4,560
 math_spec_mapping/Classes/ControlAction.py,sha256=4AzMSA8fbnUf-fGlvMJXHJFbz32G1h1QVWf2yzrXrLA,493
 math_spec_mapping/Classes/Entity.py,sha256=fA0-b128_OHHxfCg4pzqyQV083EYev1HlVpy86S5igg,1226
-math_spec_mapping/Classes/MathSpec.py,sha256=6cBpp9OHmfU-XTqPI4Qjnj91cXRxfGtcAQnczOKxt-4,39892
+math_spec_mapping/Classes/MathSpec.py,sha256=8gU1EgVuiHjI7olVXJiPgFQlDUF2sEcjmGZ2cQv86k0,40475
 math_spec_mapping/Classes/Mechanism.py,sha256=2sLm3wYBIeTQaMBcsJ9btqIWsbS895Ra8NY6Y9_G_Dg,379
-math_spec_mapping/Classes/Metric.py,sha256=AhPgYppOP6q49xvR8S9STxQsXUKJlTWx7wI1LfZEtww,581
+math_spec_mapping/Classes/Metric.py,sha256=iQhH4g8Z60QlM22nPX9ytGmidOsZSiSs0KjqwmsScwU,636
 math_spec_mapping/Classes/Parameter.py,sha256=ZuJ_w0sChvRElJ4sOnXZ2EV4Ell2xXFulKLjVOpgz2E,1237
 math_spec_mapping/Classes/Policy.py,sha256=fzV85tB3QScjiYGfhw_dyQt9L1BYYfTyTIQQcxeT8ac,530
 math_spec_mapping/Classes/Space.py,sha256=QsahxoUfRsDWQLBL683KnGx72MAmRxv7CDE7TMgCG-E,472
@@ -30,10 +30,10 @@ math_spec_mapping/Load/general.py,sha256=2q6aGKxXhebiHHTZhtACvM4nWIkTben0o5rXuvf
 math_spec_mapping/Load/implementations.py,sha256=SGKZ_YXeNpJUTnw5fajQTXji7S2bNQo8sh-7YcIO6pk,395
 math_spec_mapping/Load/load.py,sha256=CLprDhJpbwm9RAzKM2Ghwr8eqBu0a-wvGDOCMmc01YE,2484
 math_spec_mapping/Load/mechanism.py,sha256=JBy-QpB4W0Z2OcNiakONjD4_RtEgxlFKtLXfDqfhR-0,2037
-math_spec_mapping/Load/metrics.py,sha256=EyCFEgHpyffBPKaqISdIeTyqUtPtu2xoS0gZjh-6i3U,3434
+math_spec_mapping/Load/metrics.py,sha256=0XL-E7PUZg5PX_ZensoDpT2Z2xq893JncBEYbPzxeGo,3866
 math_spec_mapping/Load/parameters.py,sha256=W4utm7to3s2fo4z3XgLH0TM1agaIad1qfM2I-lLMua4,1393
 math_spec_mapping/Load/policy.py,sha256=HvlhGHGJTweVs7DOI2HSL_2_diECr8ukDUmzoFLQELo,2444
-math_spec_mapping/Load/spaces.py,sha256=7zgGA57Te7T4hfuCCDElffiidWgn1lKm5E14e1yjt8M,1116
+math_spec_mapping/Load/spaces.py,sha256=5nJto38BVMED5KuMXOqavYj8gcSTKiNSTdMOOp5ThTA,1186
 math_spec_mapping/Load/state_update_transmission_channels.py,sha256=FJWp5n4HdtHAfof5BUQ6BnRakljatL2h8dWCapaVSc0,2238
 math_spec_mapping/Load/stateful_metrics.py,sha256=3Lq1ZGMaDd5OcGeqR2p5c_znkYw7ETTNPFjUVdZAHKk,2384
 math_spec_mapping/Load/states.py,sha256=3YurI7eTNkN6nrXRFVrc58wH0VfM22XOuWE07HVpR7Y,1365
@@ -53,8 +53,8 @@ math_spec_mapping/Reports/spaces.py,sha256=-76hR5wQBv4lsG000ypBJ-OprjsNjI-rNRMYd
 math_spec_mapping/Reports/state.py,sha256=EPiHz3cDCEPHnVjuFruVKaGJ2SclUfGUFvvOukiHPNg,3110
 math_spec_mapping/Reports/tables.py,sha256=O0CNuqh3LMECq5uLjBOoxMUk5hUvkUK660FNnwWUxDY,1505
 math_spec_mapping/Reports/wiring.py,sha256=u9SvKWy6T-WJUEgFI6-zgZanoOaTTs_2YwmEceDLsV8,1618
-math_spec_mapping-0.3.9.1.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
-math_spec_mapping-0.3.9.1.dist-info/METADATA,sha256=VV9OF55yc5n0xe5_JnFBq2hDAOQ0Eu1WMahCTjQqWRg,6502
-math_spec_mapping-0.3.9.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-math_spec_mapping-0.3.9.1.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
-math_spec_mapping-0.3.9.1.dist-info/RECORD,,
+math_spec_mapping-0.3.10.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
+math_spec_mapping-0.3.10.dist-info/METADATA,sha256=GeiDgMZu2pfRgBwMMI1hG4dioScjJ0C3qH8AhN9Ewm4,6501
+math_spec_mapping-0.3.10.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+math_spec_mapping-0.3.10.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
+math_spec_mapping-0.3.10.dist-info/RECORD,,

{math_spec_mapping-0.3.9.1.dist-info → math_spec_mapping-0.3.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any