math-spec-mapping 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

math_spec_mapping/Classes/Block.py

@@ -37,6 +37,7 @@ class Block:
                 )
             ]
         )
+        self.domain_blocks2 = self.domain_blocks[:]
         self.codomain_blocks = tuple(
             [
                 self
@@ -191,6 +192,9 @@ class ParallelBlock(Block):
         self.domain_blocks = tuple(
             [i for x in self.components for i in x.domain_blocks]
         )
+        self.domain_blocks2 = tuple(
+            [x for x in self.components for i in x.domain_blocks2]
+        )
         self.codomain_blocks = tuple(
             [i for x in self.components for i in x.codomain_blocks]
         )
@@ -320,6 +324,7 @@ class StackBlock(Block):
         )
 
         self.domain_blocks = self.components[0].domain_blocks
+        self.domain_blocks2 = self.components[0].domain_blocks2
         self.codomain_blocks = self.components[-1].codomain_blocks
         self.domain_blocks_empty = self.components[0].domain_blocks_empty
         self.codomain_blocks_empty = self.components[-1].codomain_blocks_empty

math_spec_mapping/Classes/MathSpec.py

@@ -45,6 +45,7 @@ class MathSpec:
         self._check_dictionary_names()
         self._build_functional_parameters()
         self._build_parameter_types()
+        self._crawl_spaces()
 
     def _check_dictionary_names(self):
         for key in self.boundary_actions:
@@ -371,7 +372,7 @@ class MathSpec:
         )
         opts.extend(
             [
-                (x, x.control_actions)
+                (x, x.control_action_options)
                 for x in self.control_actions.values()
                 if len(x.control_action_options) > 1
             ]
@@ -406,6 +407,18 @@ class MathSpec:
         self.behavioral_parameters_types = behavioral_parameters_types
         self.functional_parameters_types = functional_parameters_types
 
+    def _crawl_spaces(self):
+        self._used_spaces = []
+        self._used_spaces.extend([x.codomain for x in self.control_actions.values()])
+        self._used_spaces.extend([x.codomain for x in self.boundary_actions.values()])
+        self._used_spaces.extend([x.domain for x in self.policies.values()])
+        self._used_spaces.extend([x.codomain for x in self.policies.values()])
+        self._used_spaces.extend([x.domain for x in self.mechanisms.values()])
+
+        self._used_spaces = list(set().union(*self._used_spaces))
+        us_names = [y.name for y in self._used_spaces]
+        self._unused_spaces = [self.spaces[x] for x in self.spaces if x not in us_names]
+
     def metaprogramming_python_types(self, model_directory, overwrite=False):
         path = model_directory + "/types.py"
         if not overwrite:
@@ -683,6 +696,7 @@ class MathSpecImplementation:
         self.boundary_actions = self.load_boundary_actions()
         self.policies = self.load_policies()
         self.mechanisms = self.load_mechanisms()
+        self.stateful_metrics = self.load_stateful_metrics()
         self.load_wiring()
 
     def load_control_actions(self):
@@ -729,7 +743,7 @@ class MathSpecImplementation:
                     assert (
                         "FP {}".format(ba.name) in self.params
                     ), "No functional parameterization for {}. To fix this error, add {} to the parameters passed to ms.build_implementation. Option can be: {}".format(
-                        ba.name, ba.name, [x.name for x in opts]
+                        ba.name, "FP " + ba.name, [x.name for x in opts]
                     )
 
                     opt = self.ms.functional_parameters["FP {}".format(ba.name)][
@@ -761,6 +775,7 @@ class MathSpecImplementation:
         return mechanisms
 
     def load_single_wiring(self, wiring):
+        hold = wiring
         components = [x.name for x in wiring.components]
         if wiring.block_type == "Stack Block":
 
@@ -772,16 +787,25 @@ class MathSpecImplementation:
         elif wiring.block_type == "Parallel Block":
 
             spaces_mapping = {}
-            for x in wiring.components:
-                spaces_mapping[x.name] = []
 
-            for i, x in enumerate([x.name for x in wiring.domain_blocks]):
+            for y in [x.name for x in wiring.domain_blocks2]:
+                spaces_mapping[y] = []
+
+            for i, x in enumerate([x.name for x in wiring.domain_blocks2]):
                 spaces_mapping[x].append(i)
 
             def wiring(state, params, spaces):
                 codomain = []
                 for component in components:
-                    spaces_i = [spaces[i] for i in spaces_mapping[component]]
+                    if component in spaces_mapping:
+                        spaces_i = [spaces[i] for i in spaces_mapping[component]]
+                    else:
+                        assert component in [
+                            x.name for x in hold.domain_blocks_empty
+                        ], "{} not in domain_blocks_empty of wiring {}".format(
+                            component, hold
+                        )
+                        spaces_i = []
                     spaces_i = self.blocks[component](state, params, spaces_i)
                     if spaces_i:
                         codomain.extend(spaces_i)
@@ -806,7 +830,7 @@ class MathSpecImplementation:
                     assert (
                         "FP {}".format(p.name) in self.params
                     ), "No functional parameterization for {}. To fix this error, add {} to the parameters passed to ms.build_implementation. Option can be: {}".format(
-                        p.name, p.name, [x.name for x in opts]
+                        p.name, "FP " + p.name, [x.name for x in opts]
                     )
                     opt = self.ms.functional_parameters["FP {}".format(p.name)][
                         self.params["FP {}".format(p.name)]
@@ -822,6 +846,22 @@ class MathSpecImplementation:
                     policies[p.name] = opt.implementations["python"]
         return policies
 
+    def load_stateful_metrics(self):
+        stateful_metrics = {}
+
+        for sm in self.ms.stateful_metrics_map:
+            sm = self.ms.stateful_metrics_map[sm]
+            if "python" not in sm.implementations:
+                print(
+                    "No python implementation for {}. To fix this, go to Implementations/Python/StatefulMetrics and add {}".format(
+                        sm.name, sm.name
+                    )
+                )
+            else:
+                stateful_metrics[sm.name] = sm.implementations["python"]
+
+        return stateful_metrics
+
     def load_wiring(
         self,
     ):
@@ -857,3 +897,38 @@ class MathSpecImplementation:
         if len(wiring) > 0:
             wiring = [x.name for x in wiring]
             print("The following wirings were not loading: {}".format(wiring))
+
+    def validate_state_and_params(self, state, parameters):
+
+        k1 = state.keys()
+        k2 = [x.name for x in self.ms.state["Global State"].variables]
+
+        not_in_state = [x for x in k2 if x not in k1]
+        shouldnt_be_in_state = [x for x in k1 if x not in k2]
+        assert (
+            len(not_in_state) == 0
+        ), "The following state variables are missing: {}".format(not_in_state)
+        assert (
+            len(shouldnt_be_in_state) == 0
+        ), "The following state variables are extra: {}".format(shouldnt_be_in_state)
+
+        k1 = parameters.keys()
+        k2 = self.ms.parameters.all_parameters + list(
+            self.ms.functional_parameters.keys()
+        )
+
+        not_in_params = [x for x in k2 if x not in k1]
+        shouldnt_be_in_params = [x for x in k1 if x not in k2]
+        assert (
+            len(not_in_params) == 0
+        ), "The following parameters are missing: {}".format(not_in_params)
+        assert (
+            len(shouldnt_be_in_params) == 0
+        ), "The following parameters are extra: {}".format(shouldnt_be_in_params)
+
+    def prepare_state_and_params(self, state, params):
+        self.validate_state_and_params(state, params)
+        state = deepcopy(state)
+        params = deepcopy(params)
+        state["Stateful Metrics"] = self.stateful_metrics
+        return state, params

math_spec_mapping/Classes/StatefulMetric.py

@@ -16,6 +16,7 @@ class StatefulMetric:
         else:
             self.label = self.name
         self.metadata = data["metadata"]
+        self.implementations = data["implementations"]
 
 
 class StatefulMetricSet:

math_spec_mapping/Load/stateful_metrics.py

@@ -39,6 +39,15 @@ def convert_stateful_metric(ms, data: Dict) -> StatefulMetricSet:
             ), "Variable '{}' not in variable map for stateful metrics variables used".format(
                 x[1]
             )
+
+    var["implementations"] = {}
+
+    if "python" in ms["Implementations"]:
+        if "stateful_metrics" in ms["Implementations"]["python"]:
+            if var["name"] in ms["Implementations"]["python"]["stateful_metrics"]:
+                var["implementations"]["python"] = ms["Implementations"]["python"][
+                    "stateful_metrics"
+                ][var["name"]]
         new_variables.append(StatefulMetric(var))
     data["metrics"] = new_variables
 

math_spec_mapping/Reports/html.py

@@ -164,7 +164,10 @@ cssclasses:
         else:
             out += symbol2 + name + "\n"
         for var in ms.stateful_metrics[name].metrics:
-            out += symbol3 + "[[{}]]".format(var.name) + "\n"
+            if linking:
+                out += symbol3 + "[[{}]]".format(var.name) + "\n"
+            else:
+                out += symbol3 + "{}".format(var.name) + "\n"
 
     out += symbol1 + "**Types**\n"
     for name in ms.types.keys():
@@ -186,7 +189,10 @@ cssclasses:
         else:
             out += symbol2 + name + "\n"
         for param in [x.name for x in ms.parameters.data[name].parameters]:
-            out += symbol3 + "[[{}]]".format(param) + "\n"
+            if linking:
+                out += symbol3 + "[[{}]]".format(param) + "\n"
+            else:
+                out += symbol3 + "{}".format(param) + "\n"
 
     out += symbol1 + "**Boundary Actions**\n"
     for name in ms.boundary_actions.keys():

math_spec_mapping/Reports/markdown.py

@@ -538,7 +538,7 @@ def write_stateful_metrics_markdown_report(ms, path, metric, add_metadata=True):
     out += "Domain: {}\n\n".format(metric.domain)
 
     out += "## Parameters Used\n"
-    for i, x in enumerate(sorted(metric.parameters_used, key=lambda x: x.name)):
+    for i, x in enumerate(sorted(metric.parameters_used, key=lambda x: x)):
         out += "{}. [[{}]]".format(i + 1, x)
         out += "\n"
     out += "\n"

{math_spec_mapping-0.3.4.dist-info → math_spec_mapping-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math-spec-mapping
-Version: 0.3.4
+Version: 0.3.6
 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.4.dist-info → math_spec_mapping-0.3.6.dist-info}/RECORD

@@ -2,11 +2,11 @@ math_spec_mapping/__init__.py,sha256=CzT9KycdX5nuiUzDFmLXVeAIr8v8UKGbXsEQF8vjl1c
 math_spec_mapping/schema.py,sha256=6mrRqzEnTTSXjb19xJ63MBp0KjKH0s7i6TfT4MkAY9k,233
 math_spec_mapping/schema.schema.json,sha256=hJP2TcV5WPFPmx4u_A5U1xtnpkE1LeYaTeYOXadTot0,30916
 math_spec_mapping/Classes/ActionTransmissionChannel.py,sha256=zWMo5QsgPh5WGIWXl-xOrZNMXYJXmK6Vejw1dQvi0og,246
-math_spec_mapping/Classes/Block.py,sha256=OsWM1ZAi6ZvavDhMFJi_H7w8ZF9LqJIKR3ZLTXnts9w,17437
+math_spec_mapping/Classes/Block.py,sha256=cGtIhNgRfoDZ0O3SxeXcNzNlHcdXIB89sT2uaZct8LY,17667
 math_spec_mapping/Classes/BoundaryAction.py,sha256=KuZqtvZwSHWDP7gFQXGnG-r3EuYJU_oU9wMCuqvRkzk,593
 math_spec_mapping/Classes/ControlAction.py,sha256=ysqpgANwdizVdwqtgZmnxXMpCqrzmVEF_6YT0M3l4Ho,526
 math_spec_mapping/Classes/Entity.py,sha256=fA0-b128_OHHxfCg4pzqyQV083EYev1HlVpy86S5igg,1226
-math_spec_mapping/Classes/MathSpec.py,sha256=AcfqbhYWhqpm3ybK3LmBClQ0mEMmIX9k2S1Snha-aDQ,32143
+math_spec_mapping/Classes/MathSpec.py,sha256=qH0F43SjytPDmxM1Hy3-8z9HzfRqNca-5X-6Vc5Sv8M,35294
 math_spec_mapping/Classes/Mechanism.py,sha256=2sLm3wYBIeTQaMBcsJ9btqIWsbS895Ra8NY6Y9_G_Dg,379
 math_spec_mapping/Classes/Metric.py,sha256=AhPgYppOP6q49xvR8S9STxQsXUKJlTWx7wI1LfZEtww,581
 math_spec_mapping/Classes/Parameter.py,sha256=ZuJ_w0sChvRElJ4sOnXZ2EV4Ell2xXFulKLjVOpgz2E,1237
@@ -14,7 +14,7 @@ math_spec_mapping/Classes/Policy.py,sha256=fzV85tB3QScjiYGfhw_dyQt9L1BYYfTyTIQQc
 math_spec_mapping/Classes/Space.py,sha256=QsahxoUfRsDWQLBL683KnGx72MAmRxv7CDE7TMgCG-E,472
 math_spec_mapping/Classes/State.py,sha256=U40DoF2qlx_k9gvqQiP1S3C9ZLk3cW_-jmJn71TiCxg,1599
 math_spec_mapping/Classes/StateUpdateTransmissionChannel.py,sha256=3hBLvD1lE64PkwqksBXAfFWv7foOZzGQLAFQWy42tOA,257
-math_spec_mapping/Classes/StatefulMetric.py,sha256=UCis1BJ7fsajHHxFF05ZiyDean2D4s4a95uYYW1Mjq4,749
+math_spec_mapping/Classes/StatefulMetric.py,sha256=plMFMAFEk1y2t4DR5lA2SRC9UrYArsx_W33l3mZSdgE,804
 math_spec_mapping/Classes/Type.py,sha256=2KFY8d3cv1PzJJ7SSMHJf1zcfQ3ZbqxotK2KgTaLZdM,289
 math_spec_mapping/Classes/__init__.py,sha256=0zxgOqns_9JybD74HKMVh6aw8ij8WVbfQ4Q_1uWzof0,761
 math_spec_mapping/Convenience/__init__.py,sha256=z2W-E5Wg1CNEkDI5UqH3qIVBqp-3A1e63f3u9fA-N7w,112
@@ -35,7 +35,7 @@ math_spec_mapping/Load/parameters.py,sha256=W4utm7to3s2fo4z3XgLH0TM1agaIad1qfM2I
 math_spec_mapping/Load/policy.py,sha256=HvlhGHGJTweVs7DOI2HSL_2_diECr8ukDUmzoFLQELo,2444
 math_spec_mapping/Load/spaces.py,sha256=7zgGA57Te7T4hfuCCDElffiidWgn1lKm5E14e1yjt8M,1116
 math_spec_mapping/Load/state_update_transmission_channels.py,sha256=FJWp5n4HdtHAfof5BUQ6BnRakljatL2h8dWCapaVSc0,2238
-math_spec_mapping/Load/stateful_metrics.py,sha256=uGSTc6x6lld5xptgSUMHrO0Vg0QDRIL14C6zTg33S8o,1977
+math_spec_mapping/Load/stateful_metrics.py,sha256=pX2w3MvX2akFAOo6XWybkRE_X-v5BqchV2jTx0EekF0,2356
 math_spec_mapping/Load/states.py,sha256=3YurI7eTNkN6nrXRFVrc58wH0VfM22XOuWE07HVpR7Y,1365
 math_spec_mapping/Load/type.py,sha256=z6cBdBNjWed7cRyA0Bj7Jd5PmtemVVh07n3mWFj_5U4,4356
 math_spec_mapping/Load/wiring.py,sha256=1dR94U5N1W_WI5rL6lYBltH25ZvApB2pIpq9r5Opkug,3083
@@ -43,8 +43,8 @@ math_spec_mapping/Reports/__init__.py,sha256=W27I6S9Ro1hWeHmnxIokCA06awB__eYey7P
 math_spec_mapping/Reports/boundary_actions.py,sha256=45BPp4QjWdD-3E9ZWwqgj_nI2-YdcI2ZZ19_Qv_K7Qk,1410
 math_spec_mapping/Reports/control_actions.py,sha256=NksekZKIPFSIkubttFstKFthc5AU9B9PWRLSl9j1wWs,1216
 math_spec_mapping/Reports/general.py,sha256=WOOn6Wlb8M4fsdN49FlKLwOka6vJPQ9aCUy88TL2ki0,1610
-math_spec_mapping/Reports/html.py,sha256=tqydmwFWz_1Bg_J_avG4t9LtE-DUGbOKAPNuwg6lgRI,9007
-math_spec_mapping/Reports/markdown.py,sha256=t6C2D6pk3Y9K9vOR0IC6rLe18tBm3JFgJ3rC9tnvt_Q,22871
+math_spec_mapping/Reports/html.py,sha256=uUXxMgGoL2yQelSg7CmJjIsU84SbZarqPg2d9x7Z13k,9220
+math_spec_mapping/Reports/markdown.py,sha256=SdhgOMpMBnGKWDG0cimk-LI_UqjQDPy87IxTb-PrBQ0,22866
 math_spec_mapping/Reports/mechanisms.py,sha256=d2Rxt3JBYvqAOAYUynl0buYVoXEHrO8EGq7GK6hK8NA,1322
 math_spec_mapping/Reports/node_map.py,sha256=FdSMDQG16NX6n9sZcH-T5xwsvgjrV9OqBHc9J_VlNK0,3129
 math_spec_mapping/Reports/parameters.py,sha256=yizNG4lNGrgrlzYYcHMGfXKDFlPw4PMDYshDqZ3YARs,535
@@ -53,8 +53,8 @@ math_spec_mapping/Reports/spaces.py,sha256=-76hR5wQBv4lsG000ypBJ-OprjsNjI-rNRMYd
 math_spec_mapping/Reports/state.py,sha256=RkqfSonar74KVC8PpA9GgI2xaHX6BrkNdAuWMZlYQfI,2321
 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.4.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
-math_spec_mapping-0.3.4.dist-info/METADATA,sha256=YxnBIW_L8GLJvqyioONJHgj3DyILY0idwpjj-G-McnE,6012
-math_spec_mapping-0.3.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-math_spec_mapping-0.3.4.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
-math_spec_mapping-0.3.4.dist-info/RECORD,,
+math_spec_mapping-0.3.6.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
+math_spec_mapping-0.3.6.dist-info/METADATA,sha256=j1RD4vS3rk4E76cXbVAPsdYAKBjT2o6wpCNIQvKG1Ag,6012
+math_spec_mapping-0.3.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+math_spec_mapping-0.3.6.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
+math_spec_mapping-0.3.6.dist-info/RECORD,,