math-spec-mapping 0.3.14__py3-none-any.whl → 0.3.15__py3-none-any.whl

math_spec_mapping/Classes/Block.py

@@ -11,6 +11,10 @@ class Block:
         self.codomain = data["codomain"]
         self.parameters_used = data["parameters_used"]
         self.metadata = data["metadata"]
+        if "metrics_used" in data:
+            self.metrics_used = data["metrics_used"]
+        else:
+            self.metrics_used = []
         if "label" in data:
             self.label = data["label"]
         else:
@@ -163,6 +167,10 @@ class ParallelBlock(Block):
         self.components = data["components"]
         self.description = data["description"]
         self.constraints = data["constraints"]
+        if "metrics_used" in data:
+            self.metrics_used = data["metrics_used"]
+        else:
+            self.metrics_used = []
         self.mermaid_show_name = data["mermaid_show_name"]
         self.domain = tuple(
             [
@@ -316,6 +324,10 @@ class StackBlock(Block):
         self.mermaid_show_name = data["mermaid_show_name"]
         self.optional_indices = data["optional_indices"]
         self.loop = data["loop"]
+        if "metrics_used" in data:
+            self.metrics_used = data["metrics_used"]
+        else:
+            self.metrics_used = []
         self._check_domain_mapping()
         self.domain = self.components[0].domain
         self.codomain = self.components[-1].codomain
@@ -470,6 +482,10 @@ class SplitBlock(Block):
         self.description = data["description"]
         self.constraints = data["constraints"]
         self.mermaid_show_name = data["mermaid_show_name"]
+        if "metrics_used" in data:
+            self.metrics_used = data["metrics_used"]
+        else:
+            self.metrics_used = []
         self.domain = tuple(
             [
                 i

math_spec_mapping/Classes/MathSpec.py

@@ -32,7 +32,9 @@ class MathSpec:
         ]
         self.stateful_metrics = ms_dict["Stateful Metrics"]
         self.wiring = ms_dict["Wiring"]
-        self.blocks = ms_dict["Blocks"]
+        # self.blocks = ms_dict["Blocks"]
+        self._load_blocks()
+        self._load_components()
         self.types = ms_dict["Types"]
         self.metrics = ms_dict["Metrics"]
         self.displays = ms_dict["Displays"]
@@ -206,6 +208,21 @@ class MathSpec:
 
         return out
 
+    def _load_blocks(self):
+        self.blocks = {}
+        self.blocks.update(self.control_actions)
+        self.blocks.update(self.boundary_actions)
+        self.blocks.update(self.policies)
+        self.blocks.update(self.mechanisms)
+        self.blocks.update(self.wiring)
+
+    def _load_components(self):
+        self.components = {}
+        self.components.update(self.control_actions)
+        self.components.update(self.boundary_actions)
+        self.components.update(self.policies)
+        self.components.update(self.mechanisms)
+
     def crawl_action_chains(self, action_keys: List[str]) -> dict:
         """Crawl the graph of the actions to find all policies, entities, edges, etc.
 

math_spec_mapping/Classes/Policy.py

@@ -15,4 +15,3 @@ class Policy(Block):
         super().__init__(data)
         self.policy_options: List[PolicyOption] = data["policy_options"]
         self.block_type = "Policy"
-        self.metrics_used = data["metrics_used"]

math_spec_mapping/Classes/Space.py

@@ -7,6 +7,8 @@ class Space:
         self.schema = data["schema"]
         self.metadata = data["metadata"]
         self.name_variable = self.name.replace(" ", "").replace("-", "_")
+        self.domain_blocks = []
+        self.codomain_blocks = []
 
     def __repr__(self):
         return self.name

math_spec_mapping/Load/boundary_actions.py

@@ -79,3 +79,9 @@ def load_boundary_actions(ms: Dict, json: Dict) -> None:
         ms["Boundary Actions"][key] = convert_boundary_action(ba, ms)
         for entity in ms["Boundary Actions"][key].called_by:
             entity.add_boundary_action(ms["Boundary Actions"][key])
+
+        for space in ms["Boundary Actions"][key].domain:
+            space.domain_blocks.append(ms["Boundary Actions"][key])
+
+        for space in ms["Boundary Actions"][key].codomain:
+            space.codomain_blocks.append(ms["Boundary Actions"][key])

math_spec_mapping/Load/control_actions.py

@@ -66,3 +66,10 @@ def load_control_actions(ms: Dict, json: Dict) -> None:
     ms["Control Actions"] = {}
     for ca in json["Control Actions"]:
         ms["Control Actions"][ca["name"]] = convert_control_action(ca, ms)
+
+        key = ca["name"]
+        for space in ms["Control Actions"][key].domain:
+            space.domain_blocks.append(ms["Control Actions"][key])
+
+        for space in ms["Control Actions"][key].codomain:
+            space.codomain_blocks.append(ms["Control Actions"][key])

math_spec_mapping/Load/load.py

@@ -78,4 +78,7 @@ def load_from_json(json: Dict) -> MathSpec:
     check_json_keys(ms, "Math Spec")
 
     ms = MathSpec(ms, json)
+    for space in ms.spaces.values():
+        space.domain_blocks = list(set(space.domain_blocks))
+        space.codomain_blocks = list(set(space.codomain_blocks))
     return ms

math_spec_mapping/Load/mechanism.py

@@ -68,4 +68,11 @@ def load_mechanisms(ms: Dict, json: Dict) -> None:
     for m in json["Mechanisms"]:
         ms["Mechanisms"][m["name"]], new_channels = convert_mechanism(m, ms)
         state_update_transmission_channels.extend(new_channels)
+
+        key = m["name"]
+        for space in ms["Mechanisms"][key].domain:
+            space.domain_blocks.append(ms["Mechanisms"][key])
+
+        for space in ms["Mechanisms"][key].codomain:
+            space.codomain_blocks.append(ms["Mechanisms"][key])
     return state_update_transmission_channels

math_spec_mapping/Load/metrics.py

@@ -105,14 +105,15 @@ def load_metrics(ms: Dict, json: Dict, stateful_metrics_map) -> None:
         assert len(metrics) == 0, "There are circular references"
 
     # Load the metrics into the policies
-    for key in ms["Policies"]:
-        policy = ms["Policies"][key]
-        hold = policy.metrics_used[:]
-        policy.metrics_used = []
+    for key in ms["Blocks"]:
+        block = ms["Blocks"][key]
+        hold = block.metrics_used[:]
+        block.metrics_used = []
         for x in hold:
             assert (
                 x in ms["Metrics"] or x in stateful_metrics_map
             ), "{} not a valid metric or stateful metric".format(x)
-            policy.metrics_used.append(
+            block.metrics_used.append(
                 ms["Metrics"][x] if x in ms["Metrics"] else stateful_metrics_map[x]
             )
+        block.metrics_used = sorted(block.metrics_used, key=lambda x: x.name)

math_spec_mapping/Load/policy.py

@@ -92,3 +92,10 @@ def load_policies(ms: Dict, json: Dict) -> None:
     ms["Policies"] = {}
     for policy in json["Policies"]:
         ms["Policies"][policy["name"]] = convert_policy(policy, ms)
+
+        key = policy["name"]
+        for space in ms["Policies"][key].domain:
+            space.domain_blocks.append(ms["Policies"][key])
+
+        for space in ms["Policies"][key].codomain:
+            space.codomain_blocks.append(ms["Policies"][key])

math_spec_mapping/Load/wiring.py

@@ -24,6 +24,11 @@ def load_single_wiring(data, ms):
     # Map components
     data["components"] = [ms["Blocks"][x] for x in data["components"]]
 
+    data["metrics_used"] = []
+    for x in data["components"]:
+        data["metrics_used"].extend(x.metrics_used)
+    data["metrics_used"] = list(set(data["metrics_used"]))
+
     # Map to the correct block
     if block_type == "Stack":
         block = StackBlock(data)

math_spec_mapping/Reports/markdown.py

@@ -157,6 +157,18 @@ def write_boundary_action_markdown_report(ms, path, boundary_action, add_metadat
         out += "\n"
     out += "\n"
 
+    out += "## Metrics Used\n"
+    for i, x in enumerate(boundary_action.metrics_used):
+        out += "{}. [[{}]]".format(i + 1, x.name)
+        out += "\n"
+    out += "\n"
+
+    out += "## Parameters Used\n"
+    for i, x in enumerate(sorted(boundary_action.parameters_used, key=lambda x: x)):
+        out += "{}. [[{}]]".format(i + 1, x)
+        out += "\n"
+    out += "\n"
+
     if boundary_action.boundary_action_options:
         out += "## Boundary Action Options:\n"
         for i, x in enumerate(boundary_action.boundary_action_options):
@@ -288,6 +300,18 @@ def write_mechanism_markdown_report(ms, path, mechanism, add_metadata=True):
         out += "{}. {}".format(i + 1, x)
         out += "\n"
 
+    out += "## Metrics Used\n"
+    for i, x in enumerate(mechanism.metrics_used):
+        out += "{}. [[{}]]".format(i + 1, x.name)
+        out += "\n"
+    out += "\n"
+
+    out += "## Parameters Used\n"
+    for i, x in enumerate(sorted(mechanism.parameters_used, key=lambda x: x)):
+        out += "{}. [[{}]]".format(i + 1, x)
+        out += "\n"
+    out += "\n"
+
     out += "## Logic\n"
     out += mechanism.logic
 
@@ -329,6 +353,20 @@ def write_space_markdown_report(ms, path, space, add_metadata=True):
     )
     d = "{" + d + "}"
     out += d
+    out += "\n\n"
+
+    out += "## Blocks with Space in Domain"
+    out += "\n"
+    for i, x in enumerate(space.domain_blocks):
+        out += "{}. [[{}]]".format(i + 1, x.name)
+        out += "\n"
+    out += "\n"
+
+    out += "## Blocks with Space in Codomain"
+    out += "\n"
+    for i, x in enumerate(space.codomain_blocks):
+        out += "{}. [[{}]]".format(i + 1, x.name)
+        out += "\n"
     out += "\n"
 
     with open("{}/Spaces/{}.md".format(path, space.name), "w") as f:
@@ -374,6 +412,12 @@ def write_control_action_markdown_report(ms, path, control_action, add_metadata=
         out += "\n"
     out += "\n"
 
+    out += "## Metrics Used\n"
+    for i, x in enumerate(control_action.metrics_used):
+        out += "{}. [[{}]]".format(i + 1, x.name)
+        out += "\n"
+    out += "\n"
+
     out += "## Parameters Used\n"
     for i, x in enumerate(sorted(control_action.parameters_used, key=lambda x: x)):
         out += "{}. [[{}]]".format(i + 1, x)
@@ -463,6 +507,12 @@ def write_wiring_markdown_report(ms, path, wiring, add_metadata=True):
         out += "\n"
     out += "\n"
 
+    out += "## Metrics Used\n"
+    for i, x in enumerate(wiring.metrics_used):
+        out += "{}. [[{}]]".format(i + 1, x.name)
+        out += "\n"
+    out += "\n"
+
     out += "## Parameters Used\n"
     for i, x in enumerate(sorted(wiring.parameters_used, key=lambda x: x)):
         out += "{}. [[{}]]".format(i + 1, x)

{math_spec_mapping-0.3.14.dist-info → math_spec_mapping-0.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math-spec-mapping
-Version: 0.3.14
+Version: 0.3.15
 Summary: A library for easy mapping of mathematical specifications.
 Author-email: Sean McOwen <Sean@Block.Science>
 Classifier: Programming Language :: Python :: 3
@@ -9,9 +9,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: graphviz >=0.20.1
-Requires-Dist: ipython >=7.7.0
-Requires-Dist: pandas >=1.4
+Requires-Dist: graphviz>=0.20.1
+Requires-Dist: ipython>=7.7.0
+Requires-Dist: pandas>=1.4
 
 # MSML
 

{math_spec_mapping-0.3.14.dist-info → math_spec_mapping-0.3.15.dist-info}/RECORD

@@ -2,16 +2,16 @@ math_spec_mapping/__init__.py,sha256=LvuIbfILQf3UGyHympLJyncfnnpZpEyvN5UDOpi8bWw
 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=cGtIhNgRfoDZ0O3SxeXcNzNlHcdXIB89sT2uaZct8LY,17667
+math_spec_mapping/Classes/Block.py,sha256=geaH3cNPJ-BOSj1pqccexFl6FqmolAFbrb7wpQQqaUE,18215
 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=MnQQQMAk8VojjTzao56MBN3rvO_fexQrkh5SAGmWpP8,42033
+math_spec_mapping/Classes/MathSpec.py,sha256=94cJsKpdcBj_jzlQhNYnNBJQyBVOI-RrNHuWHdbieUs,42637
 math_spec_mapping/Classes/Mechanism.py,sha256=2sLm3wYBIeTQaMBcsJ9btqIWsbS895Ra8NY6Y9_G_Dg,379
 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
+math_spec_mapping/Classes/Policy.py,sha256=Nso8QJMBDeyN66VkZ29nnZ1WjaMnReMn7SxKt_bRngU,481
+math_spec_mapping/Classes/Space.py,sha256=TpZ5m28xRzPIDZ98IYtdemgyAm34JuWkgBPNyHpEglg,538
 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=plMFMAFEk1y2t4DR5lA2SRC9UrYArsx_W33l3mZSdgE,804
@@ -23,29 +23,29 @@ math_spec_mapping/Convenience/github.py,sha256=mMOhIH3Nvh_91fNTOPjz1oQq1iDq2m5hN
 math_spec_mapping/Convenience/starter.py,sha256=9dBKU3EHscut2wA6Nx1XUmehrFIdr4dCjP9V1BbTF6s,12567
 math_spec_mapping/Load/__init__.py,sha256=_ga5nHi7U5rY5lCF36_XI9Qmybq4P8R4m5I5mmjLBk8,33
 math_spec_mapping/Load/action_transmission_channel.py,sha256=9Wer7g2s5SSOcUYuZ0PqSKUVVnW3EvGQJZNXJTwW__0,2561
-math_spec_mapping/Load/boundary_actions.py,sha256=ms3Oh09Dgur9sZrxOE5FrzNO4zN41cWPNOW563R0A5U,2677
-math_spec_mapping/Load/control_actions.py,sha256=W7kKLcA0UQ40m1ZExmvu0ujdxvJ8wH-uQ9PG8hbaYCo,2094
+math_spec_mapping/Load/boundary_actions.py,sha256=cDN0pjkkWfYY3HHmgSrD__-weGD4DXElnG8w1pRc5Lc,2933
+math_spec_mapping/Load/control_actions.py,sha256=Y9LeEJuVj2OwxdTfnHZ57UV48j6PYCfyQWux4uXp1Mo,2371
 math_spec_mapping/Load/displays.py,sha256=uQvs0Jhp8-9SXGex8SG3ibxHJu7ahAV3xLeBFbT8QEE,480
 math_spec_mapping/Load/entities.py,sha256=Ds7VQY_govWEn1vSHYVrLa8IadSNyOQzaCK18JPYPKk,1289
 math_spec_mapping/Load/general.py,sha256=2q6aGKxXhebiHHTZhtACvM4nWIkTben0o5rXuvfv2Vw,4463
 math_spec_mapping/Load/implementations.py,sha256=a8YvumnyQvrnCo-o52Rv4yU8D7nmkMrV1iIA15fr6Bw,490
-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=0XL-E7PUZg5PX_ZensoDpT2Z2xq893JncBEYbPzxeGo,3866
+math_spec_mapping/Load/load.py,sha256=oC-CuqbVqqhWw0kK7iiNKexAB_djgVNbjXSQfTsj2FA,2647
+math_spec_mapping/Load/mechanism.py,sha256=VRjkR2McsSJh2oq8n9JkeewirdlVjPRA-T5SRSKWPPQ,2293
+math_spec_mapping/Load/metrics.py,sha256=CcVM0_aN-aPnH5_AyEKzFCJGPbgMb0brw5nECsdNVeU,3936
 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/policy.py,sha256=QTIcslHKgdYjjG69cqkJbW20CPvEL-B8R5u51rd2Puo,2697
 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
 math_spec_mapping/Load/type.py,sha256=FbViE3wV1o1JTx7mUYyUpAvgIxDKDQYc6Iw50FrZ4nY,4808
-math_spec_mapping/Load/wiring.py,sha256=1dR94U5N1W_WI5rL6lYBltH25ZvApB2pIpq9r5Opkug,3083
+math_spec_mapping/Load/wiring.py,sha256=l1FhHNFRMKorn1oiRhsuMDsExcXnUmTjqQt5ElE-Bbk,3258
 math_spec_mapping/Reports/__init__.py,sha256=P3IuE1wiM1EO_yCSD73D4O0O6j7aVWmiwpKJM58ISEs,1121
 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=RpyQQON8pDnMmfcyxOsm8UAD5Ad8VKnnW-OyOarTmzA,9711
-math_spec_mapping/Reports/markdown.py,sha256=ZELi-p51k_sehFDHzDalOJstIi6nD2845DTqHp46hKU,23129
+math_spec_mapping/Reports/markdown.py,sha256=oLammMJMkWhZXmODKzCuZDdJpiJIs5P-84gVsYhs0Rw,24605
 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=-ucL71lolqU0xvV7yb0sXl4pFMRl5tXNWdoBfUjLOaQ,1944
@@ -54,8 +54,8 @@ math_spec_mapping/Reports/spaces.py,sha256=-76hR5wQBv4lsG000ypBJ-OprjsNjI-rNRMYd
 math_spec_mapping/Reports/state.py,sha256=QYeCvX5cHeZBrbvMeDsTqJcUDTuDFJSLvPbasjLspk8,3643
 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.14.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
-math_spec_mapping-0.3.14.dist-info/METADATA,sha256=pgCgjXjeObVD7rjGT4MWcg04e8CCvB6ThIqB9TGAVr0,6501
-math_spec_mapping-0.3.14.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-math_spec_mapping-0.3.14.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
-math_spec_mapping-0.3.14.dist-info/RECORD,,
+math_spec_mapping-0.3.15.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
+math_spec_mapping-0.3.15.dist-info/METADATA,sha256=H3FF0wDPZ2BUneG-JTOGfaGh8Z24tr2tgLlfOqe67Y4,6498
+math_spec_mapping-0.3.15.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+math_spec_mapping-0.3.15.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
+math_spec_mapping-0.3.15.dist-info/RECORD,,

{math_spec_mapping-0.3.14.dist-info → math_spec_mapping-0.3.15.dist-info}/WHEEL

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