math-spec-mapping 0.1.2__tar.gz → 0.1.3__tar.gz

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math_spec_mapping
-Version: 0.1.2
+Version: 0.1.3
 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.1.2 → math_spec_mapping-0.1.3}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "math_spec_mapping"
-version = "0.1.2"
+version = "0.1.3"
 authors = [
   { name="Sean McOwen", email="Sean@Block.Science" },
 ]

math_spec_mapping-0.1.3/src/Classes/Space.py

@@ -0,0 +1,7 @@
+from typing import Dict
+
+
+class Space:
+    def __init__(self, data: Dict):
+        self.name = data["name"]
+        self.schema = data["schema"]

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Classes/__init__.py

@@ -8,4 +8,5 @@ from .Parameter import Parameter, ParameterSet, ParameterContainer
 from .Policy import Policy, PolicyOption
 from .StateUpdateTransmissionChannel import StateUpdateTransmissionChannel
 from .StatefulMetric import StatefulMetric, StatefulMetricSet
-from .ControlAction import ControlAction, ControlActionOption
+from .ControlAction import ControlAction, ControlActionOption
+from .Space import Space

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Load/action_transmission_channel.py

@@ -3,7 +3,9 @@ from ..Classes import ActionTransmissionChannel
 from .general import check_json_keys
 
 
-def convert_action_transmission_channel(data: Dict, ms: Dict) -> ActionTransmissionChannel:
+def convert_action_transmission_channel(
+    data: Dict, ms: Dict
+) -> ActionTransmissionChannel:
     """Function to convert dictionary to action transmission channel
 
     Args:
@@ -20,6 +22,8 @@ def convert_action_transmission_channel(data: Dict, ms: Dict) -> ActionTransmiss
     # Copy
     data = data.copy()
 
+    data["space"] = ms["Spaces"][data["space"]]
+
     # Assert that the origin is in the math spec and only once then convert
     origin = data["origin"]
     is_boundary = origin in ms["Boundary Actions"]
@@ -46,10 +50,8 @@ def convert_action_transmission_channel(data: Dict, ms: Dict) -> ActionTransmiss
         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"]))
+    data["origin"].calls.append((data["target"], data["optional"], data["space"]))
+    data["target"].called_by.append((data["origin"], data["optional"], data["space"]))
 
     # Build the action transmission channel object
     return ActionTransmissionChannel(data)

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Load/boundary_actions.py

@@ -30,10 +30,13 @@ def convert_boundary_action(data: Dict, ms: Dict) -> BoundaryAction:
     # Assert that the entities in called_by are in math spec
     if data["called_by"]:
         for name in data["called_by"]:
-            assert name in ms["Entities"], "{} entity not in entities dictionary".format(
-                name)
+            assert (
+                name in ms["Entities"]
+            ), "{} entity not in entities dictionary".format(name)
         data["called_by"] = [ms["Entities"][x] for x in data["called_by"]]
 
+    data["codomain"] = (ms["Spaces"][x] for x in data["codomain"])
+
     # Build the boundary action object
     return BoundaryAction(data)
 
@@ -49,6 +52,7 @@ def load_boundary_actions(ms: Dict, json: Dict) -> None:
     ms["Boundary Actions"] = {}
     for key in json["Boundary Actions"]:
         ms["Boundary Actions"][key] = convert_boundary_action(
-            json["Boundary Actions"][key], ms)
+            json["Boundary Actions"][key], ms
+        )
         for entity in ms["Boundary Actions"][key].called_by:
             entity.add_boundary_action(ms["Boundary Actions"][key])

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Load/control_actions.py

@@ -27,6 +27,8 @@ def convert_control_action(data: Dict, ms: Dict) -> ControlAction:
         new_cao.append(ControlActionOption(ca))
     data["control_action_options"] = new_cao
 
+    data["codomain"] = (ms["Spaces"][x] for x in data["codomain"])
+
     # Build the control action object
     return ControlAction(data)
 
@@ -42,4 +44,5 @@ def load_control_actions(ms: Dict, json: Dict) -> None:
     ms["Control Actions"] = {}
     for key in json["Control Actions"]:
         ms["Control Actions"][key] = convert_control_action(
-            json["Control Actions"][key], ms)
+            json["Control Actions"][key], ms
+        )

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Load/general.py

@@ -98,6 +98,7 @@ def check_json_keys(json: Dict, check_set_key: str) -> None:
             "domain",
             "parameter_class",
         ],
+        "Space": ["name", "schema"],
     }
 
     check_set = check_sets[check_set_key]

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Load/mechanism.py

@@ -3,7 +3,7 @@ from ..Classes import Mechanism
 from .general import check_json_keys
 
 
-def convert_mechanism(data: Dict) -> Mechanism:
+def convert_mechanism(data: Dict, ms: Dict) -> Mechanism:
     """Function to convert dictionary to mechanism object
 
     Args:
@@ -19,6 +19,8 @@ def convert_mechanism(data: Dict) -> Mechanism:
     # Copy
     data = data.copy()
 
+    data["domain"] = (ms["Spaces"][x] for x in data["domain"])
+
     # Build the action transmission channel object
     return Mechanism(data)
 
@@ -33,4 +35,4 @@ def load_mechanisms(ms: Dict, json: Dict) -> None:
 
     ms["Mechanisms"] = {}
     for key in json["Mechanisms"]:
-        ms["Mechanisms"][key] = convert_mechanism(json["Mechanisms"][key])
+        ms["Mechanisms"][key] = convert_mechanism(json["Mechanisms"][key], ms)

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Load/policy.py

@@ -25,7 +25,7 @@ def convert_policy_options(data: Dict) -> PolicyOption:
     return PolicyOption(data)
 
 
-def convert_policy(data: Dict) -> Policy:
+def convert_policy(data: Dict, ms: Dict) -> Policy:
     """Function to convert dictionary to policy object
 
     Args:
@@ -47,6 +47,9 @@ def convert_policy(data: Dict) -> Policy:
         policy_options.append(convert_policy_options(po))
     data["policy_options"] = policy_options
 
+    data["codomain"] = (ms["Spaces"][x] for x in data["codomain"])
+    data["domain"] = (ms["Spaces"][x] for x in data["domain"])
+
     # Build the policy object
     return Policy(data)
 
@@ -61,4 +64,4 @@ def load_policies(ms: Dict, json: Dict) -> None:
 
     ms["Policies"] = {}
     for key in json["Policies"]:
-        ms["Policies"][key] = convert_policy(json["Policies"][key])
+        ms["Policies"][key] = convert_policy(json["Policies"][key], ms)

math_spec_mapping-0.1.3/src/Load/spaces.py

@@ -0,0 +1,29 @@
+from typing import Dict
+from ..Classes import Space
+from .general import check_json_keys
+
+
+def convert_space(data: Dict) -> Space:
+    # Check the keys are correct
+    check_json_keys(data, "Space")
+
+    # Copy
+    data = data.copy()
+
+    # Build the space object
+    return Space(data)
+
+
+def load_spaces(ms: Dict, json: Dict) -> None:
+    """Function to load spaces into the new dictionary
+
+    Args:
+        ms (Dict): MathSpec dictionary
+        json (Dict): JSON version of MathSpec to load
+    """
+
+    # Placeholder for now
+    ms["Spaces"] = {}
+
+    for space in json["Spaces"]:
+        ms["Spaces"][space["name"]] = convert_space(space)

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Reports/html.py

@@ -54,7 +54,7 @@ def write_action_chain_reports(
         out += "<h2>State</h2>"
         out += write_local_state_variable_tables(all_nodes["State"])
 
-        out += write_out_spaces(ms, [x.__name__ for x in all_nodes["Spaces"]])
+        out += write_out_spaces(ms, [x.name for x in all_nodes["Spaces"]])
         out += write_out_boundary_actions(
             ms, [x.name for x in all_nodes["Boundary Actions"]]
         )
@@ -93,7 +93,7 @@ def write_entity_reports(ms: MathSpec, directory: str, entities: List[str]) -> N
         out += "<h2>State</h2>"
         out += write_local_state_variable_tables(all_nodes["State"])
 
-        out += write_out_spaces(ms, [x.__name__ for x in all_nodes["Spaces"]])
+        out += write_out_spaces(ms, [x.name for x in all_nodes["Spaces"]])
         out += write_out_boundary_actions(
             ms, [x.name for x in all_nodes["Boundary Actions"]]
         )

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Reports/mechanisms.py

@@ -15,25 +15,25 @@ def write_out_mechanism(mechanism: Mechanism) -> str:
     for i, x in enumerate(mechanism.called_by):
         x = x[0]
         out += "<p>"
-        out += "{}. {}".format(i+1, x.name)
+        out += "{}. {}".format(i + 1, x.name)
         out += "</p>"
 
     out += "<h4>Domain Spaces:</h4>\n"
     for i, x in enumerate(mechanism.domain):
         out += "<p>"
-        out += "{}. {}".format(i+1, x.__name__)
+        out += "{}. {}".format(i + 1, x.name)
         out += "</p>"
 
     out += "<h4>State Updates:</h4>\n"
     for i, x in enumerate(mechanism.updates):
         out += "<p>"
-        out += "{}. {}.{}".format(i+1, x[0].name, x[1].name)
+        out += "{}. {}.{}".format(i + 1, x[0].name, x[1].name)
         out += "</p>"
 
     out += "<h4>Constraints:</h4>\n"
     for i, x in enumerate(mechanism.constraints):
         out += "<p>"
-        out += "{}. {}\n".format(i+1, x)
+        out += "{}. {}\n".format(i + 1, x)
         out += "</p>"
 
     out += "<h4>Logic:</h4>\n"

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Reports/node_map.py

@@ -12,24 +12,19 @@ def create_action_chains_graph(ms, action_keys, name):
         graph.node(entity.name, entity.label, shape="cylinder", color="black")
 
     for ba in all_nodes["Boundary Actions"]:
-        graph.node(ba.name, ba.label, shape="diamond",
-                   color="orange", style='filled')
-    
+        graph.node(ba.name, ba.label, shape="diamond", color="orange", style="filled")
+
     for ca in all_nodes["Control Actions"]:
-        graph.node(ca.name, ca.label, shape="diamond",
-                   color="yellow", style='filled')
+        graph.node(ca.name, ca.label, shape="diamond", color="yellow", style="filled")
 
     for p in all_nodes["Policies"]:
-        graph.node(p.name, p.label, shape="rectangle",
-                   color="red", style='filled')
+        graph.node(p.name, p.label, shape="rectangle", color="red", style="filled")
 
     for m in all_nodes["Mechanisms"]:
-        graph.node(m.name, m.label, shape="oval",
-                   color="azure2", style='filled')
+        graph.node(m.name, m.label, shape="oval", color="azure2", style="filled")
 
     for entity in all_nodes["Entities2"]:
-        graph.node(entity.name+"_2", entity.label,
-                   shape="cylinder", color="black")
+        graph.node(entity.name + "_2", entity.label, shape="cylinder", color="black")
 
     for su in all_nodes["State Updates"]:
         label = "{}.{}".format(su[0].name, su[1].name)
@@ -41,7 +36,7 @@ def create_action_chains_graph(ms, action_keys, name):
             graph.edge(entity.name, ba.name)
         for call in ba.calls:
             optional_flag = call[1]
-            space = call[2].__name__
+            space = call[2].name
             space = wrap(space, 12)
             space = "\n".join(space)
             call = call[0]
@@ -50,7 +45,7 @@ def create_action_chains_graph(ms, action_keys, name):
     for ca in all_nodes["Control Actions"]:
         for call in ca.calls:
             optional_flag = call[1]
-            space = call[2].__name__
+            space = call[2].name
             space = wrap(space, 12)
             space = "\n".join(space)
             call = call[0]
@@ -58,15 +53,14 @@ def create_action_chains_graph(ms, action_keys, name):
 
     for p in all_nodes["Policies"]:
         for call in p.calls:
-            space = call[2].__name__
+            space = call[2].name
             space = wrap(space, 12)
             space = "\n".join(space)
-            #space = "\n".join(space.split(" "))
+            # space = "\n".join(space.split(" "))
             optional_flag = call[1]
             call = call[0]
             if optional_flag:
-                graph.edge(p.name, call.name, style="dashed",
-                           label=space)
+                graph.edge(p.name, call.name, style="dashed", label=space)
             else:
                 graph.edge(p.name, call.name, label=space)
 
@@ -78,7 +72,7 @@ def create_action_chains_graph(ms, action_keys, name):
 
     for su in all_nodes["State Updates"]:
         label1 = "{}.{}".format(su[0].name, su[1].name)
-        label2 = su[0].name+"_2"
+        label2 = su[0].name + "_2"
         graph.edge(label1, label2)
 
     return graph

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Reports/policies.py

@@ -15,39 +15,39 @@ def write_out_policy(policy: Policy) -> str:
     for i, x in enumerate(policy.called_by):
         x = x[0]
         out += "<p>"
-        out += "{}. {}".format(i+1, x.name)
+        out += "{}. {}".format(i + 1, x.name)
         out += "</p>"
 
     out += "<h4>Domain Spaces:</h4>\n"
     for i, x in enumerate(policy.domain):
         out += "<p>"
-        out += "{}. {}".format(i+1, x.__name__)
+        out += "{}. {}".format(i + 1, x.name)
         out += "</p>"
 
     out += "<h4>Followed By:</h4>\n"
     for i, x in enumerate(policy.calls):
         x = x[0]
         out += "<p>"
-        out += "{}. {}".format(i+1, x.name)
+        out += "{}. {}".format(i + 1, x.name)
         out += "</p>"
 
     out += "<h4>Codomain Spaces:</h4>\n"
     for i, x in enumerate(policy.codomain):
         out += "<p>"
-        out += "{}. {}".format(i+1, x.__name__)
+        out += "{}. {}".format(i + 1, x.name)
         out += "</p>"
 
     out += "<h4>Constraints:</h4>\n"
     for i, x in enumerate(policy.constraints):
         out += "<p>"
-        out += "{}. {}\n".format(i+1, x)
+        out += "{}. {}\n".format(i + 1, x)
         out += "</p>"
 
     if policy.policy_options:
         out += "<h4>Policy Options:</h4>\n"
         for i, x in enumerate(policy.policy_options):
             out += "<details>"
-            out += "<summary><b>{}. {}</b></summary>".format(i+1, x.name)
+            out += "<summary><b>{}. {}</b></summary>".format(i + 1, x.name)
             out += "<p>"
             out += x.description
             out += "</p>"

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Reports/spaces.py

@@ -5,11 +5,13 @@ from typing import List, TypedDict
 def write_out_space(space: TypedDict) -> str:
     out = ""
     out += "<h3>"
-    out += space.__name__
+    out += space.name
     out += "</h3>"
 
-    d = space.__annotations__
-    d = ",<br/>".join(["{}: {}".format(a, b.__name__) for a,b in zip(d.keys(), d.values())])
+    d = space.schema
+    d = ",<br/>".join(
+        ["{}: {}".format(a, b.__name__) for a, b in zip(d.keys(), d.values())]
+    )
     d = "{" + d + "}"
 
     out += "<p>"
@@ -24,4 +26,4 @@ def write_out_spaces(ms: MathSpec, spaces: List[str]) -> str:
     for name in spaces:
         out += write_out_space(ms.spaces[name])
 
-    return out
+    return out

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Reports/state.py

@@ -9,14 +9,18 @@ def write_state_variable_table(target_state):
       </tr>"""
 
     for var in target_state.variables:
-        table_vars = [var.name, var.description,
-                      var.type.__name__, var.symbol, var.domain]
+        table_vars = [
+            var.name,
+            var.description,
+            var.type.__name__,
+            var.symbol,
+            var.domain,
+        ]
         table += "<tr>"
         for tv in table_vars:
             table += "<td>"
             if tv:
-                table += "{}".format(tv).replace("<",
-                                                 "&lt").replace(">", "&gt")
+                table += "{}".format(tv).replace("<", "&lt").replace(">", "&gt")
             table += "</td>"
 
         table += "</tr>"
@@ -31,4 +35,4 @@ def write_local_state_variable_tables(states):
     for state in states:
         out += "<h4>{}</h4>".format(state.name)
         out += write_state_variable_table(state)
-    return out
+    return out

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/math_spec_mapping.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math_spec_mapping
-Version: 0.1.2
+Version: 0.1.3
 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.1.2 → math_spec_mapping-0.1.3}/src/math_spec_mapping.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/Classes/MathSpec.py
 src/Classes/Mechanism.py
 src/Classes/Parameter.py
 src/Classes/Policy.py
+src/Classes/Space.py
 src/Classes/State.py
 src/Classes/StateUpdateTransmissionChannel.py
 src/Classes/StatefulMetric.py

math_spec_mapping-0.1.2/src/Load/spaces.py

@@ -1,13 +0,0 @@
-from typing import Dict
-
-
-def load_spaces(ms: Dict, json: Dict) -> None:
-    """Function to load spaces into the new dictionary
-
-    Args:
-        ms (Dict): MathSpec dictionary
-        json (Dict): JSON version of MathSpec to load
-    """
-
-    # Placeholder for now
-    ms["Spaces"] = json["Spaces"]

{math_spec_mapping-0.1.2 → math_spec_mapping-0.1.3}/src/Load/load.py

@@ -30,6 +30,7 @@ def load_from_json(json: Dict) -> MathSpec:
     ms = {}
 
     # Do loading one by one to transfer the json
+    load_spaces(ms, json)
     load_states(ms, json)
     load_entities(ms, json)
     load_boundary_actions(ms, json)
@@ -37,7 +38,6 @@ def load_from_json(json: Dict) -> MathSpec:
     load_mechanisms(ms, json)
     load_parameters(ms, json)
     load_policies(ms, json)
-    load_spaces(ms, json)
     load_stateful_metrics(ms, json)
     load_action_transmission_channels(ms, json)
     load_state_update_transmission_channels(ms, json)