math-spec-mapping 0.3.9.1__tar.gz → 0.3.11__tar.gz

{math_spec_mapping-0.3.9.1/src/math_spec_mapping.egg-info → math_spec_mapping-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math-spec-mapping
-Version: 0.3.9.1
+Version: 0.3.11
 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 → math_spec_mapping-0.3.11}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "math-spec-mapping"
-version = "0.3.9.1"
+version = "0.3.11"
 authors = [
   { name="Sean McOwen", email="Sean@Block.Science" },
 ]

{math_spec_mapping-0.3.9.1 → math_spec_mapping-0.3.11}/src/math_spec_mapping/Classes/MathSpec.py

@@ -8,6 +8,7 @@ import os
 from copy import deepcopy
 import shutil
 import pandas as pd
+from inspect import signature, getsource
 
 
 class MathSpec:
@@ -47,6 +48,7 @@ class MathSpec:
         self._build_functional_parameters()
         self._build_parameter_types()
         self._crawl_spaces()
+        self._set_source_code()
 
     def _check_dictionary_names(self):
         for key in self.boundary_actions:
@@ -765,6 +767,15 @@ using .Spaces: generate_space_type
     def build_implementation(self, params):
         return MathSpecImplementation(self, params)
 
+    def _set_source_code(self):
+        if "python" not in self.implementations:
+            self.source_code = None
+            return
+        self.source_code = deepcopy(self.implementations["python"])
+        for x in self.source_code:
+            for y in self.source_code[x]:
+                self.source_code[x][y] = getsource(self.source_code[x][y])
+
 
 class MathSpecImplementation:
     def __init__(self, ms: MathSpec, params):
@@ -775,8 +786,10 @@ 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()
+        self.load_source_files()
 
     def load_control_actions(self):
         control_actions = {}
@@ -951,6 +964,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,15 +1055,30 @@ 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)
+                if len(signature(f).parameters) == 1:
+                    state = f(state)
+                elif len(signature(f).parameters) == 2:
+                    state = f(state, params)
+                else:
+                    assert (
+                        False
+                    ), "Incorrect number of parameters for the state preperation function"
                 assert (
                     state is not None
                 ), "A state must be returned from the state preperation functions"
         if parameter_preperation_functions:
             for f in parameter_preperation_functions:
-                params = f(params)
+                if len(signature(f).parameters) == 1:
+                    params = f(params)
+                elif len(signature(f).parameters) == 2:
+                    params = f(params, state)
+                else:
+                    assert (
+                        False
+                    ), "Incorrect number of parameters for the state preperation function"
                 assert (
                     params is not None
                 ), "A parameter set must be returned from the parameter preperation functions"
@@ -1052,3 +1096,16 @@ class MathSpecImplementation:
         for block in blocks:
             self.components[block](state, params, [])
         return state
+
+    def load_source_files(self):
+        self.source_files = {}
+        for key in self.components:
+            self.source_files[key] = getsource(self.components[key])
+
+    def print_source_code_files(self, keys=None):
+        if not keys:
+            keys = list(self.source_files.keys())
+        for key in keys:
+            print("-" * 20 + key + "-" * 20)
+            print(self.source_files[key])
+            print("\n\n\n")

{math_spec_mapping-0.3.9.1 → math_spec_mapping-0.3.11}/src/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-0.3.9.1 → math_spec_mapping-0.3.11}/src/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-0.3.9.1 → math_spec_mapping-0.3.11}/src/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 → math_spec_mapping-0.3.11/src/math_spec_mapping.egg-info}/PKG-INFO

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