math-spec-mapping 0.3.18__tar.gz → 0.3.19__tar.gz

{math_spec_mapping-0.3.18/src/math_spec_mapping.egg-info → math_spec_mapping-0.3.19}/PKG-INFO

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

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

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Classes/Block.py

@@ -172,6 +172,9 @@ class Block:
         out = list(set(out))
         return out
 
+    def __repr__(self):
+        return "<{}>".format(self.name)
+
 
 class ParallelBlock(Block):
     def __init__(self, data: Dict):

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Classes/MathSpec.py

@@ -439,7 +439,14 @@ class MathSpec:
 
         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]
+        self._unused_spaces = [
+            self.spaces[x]
+            for x in self.spaces
+            if x not in us_names and x not in ["Terminating Space", "Empty Space"]
+        ]
+
+        if len(self._unused_spaces) > 0:
+            print("The following spaces are not used: {}".format(self._unused_spaces))
 
     def _add_spec_tree(self, tree):
         self.tree = tree
@@ -535,8 +542,17 @@ class MathSpec:
                             component
                         ]
             elif folder == "Displays":
-                print("Displays not implemented")
-                # keys = [x["name"] for x in ms.displays["Wiring"]]
+
+                for component in self.displays["Wiring"]:
+                    if component["name"] not in tree:
+                        print(
+                            "Can't find component code source in {} for {}".format(
+                                folder, component["name"]
+                            )
+                        )
+                        component["Source Code Location"] = None
+                    else:
+                        component["Source Code Location"] = tree[component["name"]]
             elif folder == "Spaces":
                 for component in self.spaces:
                     if component in ["Terminating Space", "Empty Space"]:
@@ -1010,6 +1026,14 @@ class MathSpecImplementation:
                     )
                 else:
                     control_actions[ca.name] = opt.implementations["python"]
+
+                for opt_i in [x for x in ca.control_action_options if x != opt]:
+                    if "python" not in opt_i.implementations:
+                        print(
+                            "No python implementation for {} / {}. To fix this, go to Implementations/Python/ControlActions and add {}".format(
+                                ca.name, opt_i.name, opt_i.name
+                            )
+                        )
         return control_actions
 
     def load_boundary_actions(self):
@@ -1041,6 +1065,14 @@ class MathSpecImplementation:
                     )
                 else:
                     boundary_actions[ba.name] = opt.implementations["python"]
+
+                for opt_i in [x for x in ba.boundary_action_options if x != opt]:
+                    if "python" not in opt_i.implementations:
+                        print(
+                            "No python implementation for {} / {}. To fix this, go to Implementations/Python/BoundaryActions and add {}".format(
+                                ba.name, opt_i.name, opt_i.name
+                            )
+                        )
         return boundary_actions
 
     def load_mechanisms(self):
@@ -1137,6 +1169,14 @@ class MathSpecImplementation:
                     )
                 else:
                     policies[p.name] = opt.implementations["python"]
+            for opt_i in [x for x in p.policy_options if x != opt]:
+                if "python" not in opt_i.implementations:
+                    print(
+                        "No python implementation for {} / {}. To fix this, go to Implementations/Python/Policies and add {}".format(
+                            p.name, opt_i.name, opt_i.name
+                        )
+                    )
+
         return policies
 
     def load_stateful_metrics(self):

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Load/action_transmission_channel.py

@@ -50,8 +50,14 @@ def convert_action_transmission_channel(
         data["target"] = ms["Mechanisms"][target]
 
     # Add in called by and called here with origin and target
-    data["origin"].calls.append((data["target"], data["optional"], data["space"]))
-    data["target"].called_by.append((data["origin"], data["optional"], data["space"]))
+    if (data["target"], data["optional"], data["space"]) not in data["origin"].calls:
+        data["origin"].calls.append((data["target"], data["optional"], data["space"]))
+    if (data["origin"], data["optional"], data["space"]) not in data[
+        "target"
+    ].called_by:
+        data["target"].called_by.append(
+            (data["origin"], data["optional"], data["space"])
+        )
 
     # Build the action transmission channel object
     return ActionTransmissionChannel(data)

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Load/boundary_actions.py

@@ -1,6 +1,6 @@
 from typing import Dict
 from ..Classes import BoundaryAction, BoundaryActionOption
-from .general import check_json_keys
+from .general import check_json_keys, check_domain_codomain_spaces
 
 
 def convert_boundary_action(data: Dict, ms: Dict) -> BoundaryAction:
@@ -24,6 +24,8 @@ def convert_boundary_action(data: Dict, ms: Dict) -> BoundaryAction:
         data["name"]
     )
 
+    check_domain_codomain_spaces(data, ms)
+
     if len(data["codomain"]) == 0:
         data["codomain"] = ("Empty Space",)
 

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Load/control_actions.py

@@ -1,6 +1,6 @@
 from typing import Dict
 from ..Classes import ControlAction, ControlActionOption
-from .general import check_json_keys
+from .general import check_json_keys, check_domain_codomain_spaces
 
 
 def convert_control_action(data: Dict, ms: Dict) -> ControlAction:
@@ -25,6 +25,8 @@ def convert_control_action(data: Dict, ms: Dict) -> ControlAction:
         data["name"]
     )
 
+    check_domain_codomain_spaces(data, ms)
+
     if len(data["codomain"]) == 0:
         data["codomain"] = ("Empty Space",)
 

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Load/general.py

@@ -159,3 +159,12 @@ def check_json_keys(json: Dict, check_set_key: str) -> None:
 
 def validate_json_schema(json):
     validate(json, schema)
+
+
+def check_domain_codomain_spaces(json: Dict, ms) -> None:
+    if "domain" in json:
+        for key in json["domain"]:
+            assert key in ms["Spaces"], "{} not in spaces".format(key)
+    if "codomain" in json:
+        for key in json["codomain"]:
+            assert key in ms["Spaces"], "{} not in spaces".format(key)

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Load/mechanism.py

@@ -1,6 +1,6 @@
 from typing import Dict
 from ..Classes import Mechanism
-from .general import check_json_keys
+from .general import check_json_keys, check_domain_codomain_spaces
 
 
 def convert_mechanism(data: Dict, ms: Dict) -> Mechanism:
@@ -26,6 +26,8 @@ def convert_mechanism(data: Dict, ms: Dict) -> Mechanism:
     if len(data["domain"]) == 0:
         data["domain"] = ("Empty Space",)
 
+    check_domain_codomain_spaces(data, ms)
+
     # Copy
     data = data.copy()
 

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Load/policy.py

@@ -2,7 +2,7 @@ from typing import Dict
 from ..Classes import Policy, PolicyOption
 
 
-from .general import check_json_keys
+from .general import check_json_keys, check_domain_codomain_spaces
 
 
 def convert_policy_options(data: Dict, ms) -> PolicyOption:
@@ -58,6 +58,7 @@ def convert_policy(data: Dict, ms: Dict) -> Policy:
     assert type(data["domain"]) == tuple, "{} domain is not a tuple".format(
         data["name"]
     )
+    check_domain_codomain_spaces(data, ms)
 
     if len(data["codomain"]) == 0:
         data["codomain"] = ("Empty Space",)

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Load/stateful_metrics.py

@@ -40,6 +40,12 @@ def convert_stateful_metric(ms, data: Dict) -> StatefulMetricSet:
                 x[1]
             )
 
+        assert (
+            var["type"] in ms["Types"]
+        ), "{} type referenced by {} is not present in math spec".format(
+            var["type"], var["name"]
+        )
+
         var["implementations"] = {}
         if "python" in ms["Implementations"]:
             if "stateful_metrics" in ms["Implementations"]["python"]:

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Reports/html.py

@@ -169,6 +169,13 @@ cssclasses:
             else:
                 out += symbol3 + "{}".format(var.name) + "\n"
 
+    out += symbol1 + "**Metrics**\n"
+    for name in ms.metrics.keys():
+        if linking:
+            out += symbol2 + "[[{}]]".format(name) + "\n"
+        else:
+            out += symbol2 + "{}".format(name) + "\n"
+
     out += symbol1 + "**Types**\n"
     for name in ms.types.keys():
         if linking:
@@ -221,6 +228,12 @@ cssclasses:
             out += symbol2 + "[[{}]]".format(name) + "\n"
         else:
             out += symbol2 + name + "\n"
+    out += symbol1 + "**Wirings**\n"
+    for name in ms.wiring.keys():
+        if linking:
+            out += symbol2 + "[[{}]]".format(name) + "\n"
+        else:
+            out += symbol2 + name + "\n"
 
     if add_tabbing:
         out = out.split("\n")

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19}/src/math_spec_mapping/Reports/markdown.py

@@ -67,7 +67,10 @@ def write_entity_markdown_report(ms, path, entity, add_metadata=True):
 
 
 def write_source_code_block(component, text, path):
-    file_path = component.source_code_location
+    if hasattr(component, "source_code_location"):
+        file_path = component.source_code_location
+    else:
+        file_path = component["Source Code Location"]
     if file_path:
         file_path = os.path.relpath(file_path, path)
         text += "## Spec Source Code Location\n\n"
@@ -939,7 +942,10 @@ def write_wiring_display_markdown_report(ms, path, wiring, add_metadata=True):
         out += "\n"
     out += "\n"
 
-    with open("{}/Displays/Wiring/{}.md".format(path, wiring["name"]), "w") as f:
+    path = "{}/Displays/Wiring/{}.md".format(path, wiring["name"])
+    out = write_source_code_block(wiring, out, path)
+
+    with open(path, "w") as f:
         f.write(out)
 
 

{math_spec_mapping-0.3.18 → math_spec_mapping-0.3.19/src/math_spec_mapping.egg-info}/PKG-INFO

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