math-spec-mapping 0.2.4__tar.gz → 0.2.6__tar.gz

{math_spec_mapping-0.2.4/src/math_spec_mapping.egg-info → math_spec_mapping-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math_spec_mapping
-Version: 0.2.4
+Version: 0.2.6
 Summary: A library for easy mapping of mathematical specifications.
 Author-email: Sean McOwen <Sean@Block.Science>
 Classifier: Programming Language :: Python :: 3
@@ -23,6 +23,10 @@ It uses block diagram wirings and spaces to represent the actions in complex sys
 
 One good example is the [wiring report](https://github.com/SeanMcOwen/Root-Finding-Simulation/blob/main/MSML/reports/Simulation%20Block.md) for the Root Finding Simulation canonical example.
 
+## Installing the library
+
+To install the library, simply pip install by running "pip install math_spec_mapping"
+
 ## Why MSML?
 
 Writing mathematical specifications can be a difficult process, especially when variable names are changed or new mechanisms are introduced. MSML seeks to streamline the process with automations as well as enhance the abilities of static math specs to deliver deeper insights. Because it is automated, one can write specifications at different levels of details or for different purposes.

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/README.md

@@ -8,6 +8,10 @@ It uses block diagram wirings and spaces to represent the actions in complex sys
 
 One good example is the [wiring report](https://github.com/SeanMcOwen/Root-Finding-Simulation/blob/main/MSML/reports/Simulation%20Block.md) for the Root Finding Simulation canonical example.
 
+## Installing the library
+
+To install the library, simply pip install by running "pip install math_spec_mapping"
+
 ## Why MSML?
 
 Writing mathematical specifications can be a difficult process, especially when variable names are changed or new mechanisms are introduced. MSML seeks to streamline the process with automations as well as enhance the abilities of static math specs to deliver deeper insights. Because it is automated, one can write specifications at different levels of details or for different purposes.

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "math_spec_mapping"
-version = "0.2.4"
+version = "0.2.6"
 authors = [
   { name="Sean McOwen", email="Sean@Block.Science" },
 ]
@@ -19,4 +19,6 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
-]
+]
+[tool.setuptools.packages.find]
+where = ["src"]

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/Classes/Block.py

@@ -141,6 +141,18 @@ class Block:
                     self.all_updates.extend(x.all_updates)
         self.all_updates = list(set(self.all_updates))
 
+    def components_full(self):
+        q = [self]
+        out = []
+        while len(q) > 0:
+            cur = q.pop()
+            if hasattr(cur, "components"):
+                q.extend(cur.components)
+            else:
+                out.append(cur)
+        out = list(set(out))
+        return out
+
 
 class ParallelBlock(Block):
     def __init__(self, data: Dict):

math_spec_mapping-0.2.6/src/Convenience/__init__.py

@@ -0,0 +1 @@
+from .documentation import write_top_level_json_description

math_spec_mapping-0.2.6/src/Convenience/documentation.py

@@ -0,0 +1,49 @@
+from src import schema
+
+
+def write_json_description(schema, key, name):
+    out = "- **{}**: ".format(name)
+
+    out += schema["definitions"][key]["description"]
+    out += "\n"
+    return out
+
+
+def write_top_level_json_description(indent_level):
+
+    out = "#{} MSML Components".format("#" * indent_level)
+    out += "\n\n"
+    out += "MSML extends GDS with multiple types of blocks and other enhancements. Below are the definitions of top level components."
+    out += "\n\n"
+
+    out += "##{} Types & Spaces".format("#" * indent_level)
+    out += "\n\n"
+
+    out += write_json_description(schema, "Type", "Type")
+    out += write_json_description(schema, "Space", "Space")
+
+    out += "\n"
+
+    out += "##{} Entities, States, Parameters & Metrics".format("#" * indent_level)
+    out += "\n\n"
+
+    out += write_json_description(schema, "Entity", "Entity")
+    out += write_json_description(schema, "State", "State")
+    out += write_json_description(schema, "StatefulMetric", "Stateful Metric")
+    out += write_json_description(schema, "Parameter", "Parameter")
+    out += write_json_description(schema, "Metric", "Metric")
+
+    out += "\n"
+
+    out += "##{} Blocks & Wiring".format("#" * indent_level)
+    out += "\n\n"
+
+    out += write_json_description(schema, "BoundaryAction", "Boundary Action")
+    out += write_json_description(schema, "ControlAction", "Control Action")
+    out += write_json_description(schema, "Policy", "Policy")
+    out += write_json_description(schema, "Mechanism", "Mechanism")
+    out += write_json_description(schema, "Wiring", "Wiring")
+
+    out += "\n"
+
+    return out

math_spec_mapping-0.2.6/src/Load/implementations.py

@@ -0,0 +1,16 @@
+import os
+
+
+def load_implementations(ms):
+    implementations = {}
+    python_path = "src/Implementations/Python/__init__.py"
+    if os.path.exists(python_path):
+        implementations["python"] = load_python_implementations()
+
+    ms["Implementations"] = implementations
+
+
+def load_python_implementations():
+    from src.Implementations.Python import implementation
+
+    return implementation

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/Load/load.py

@@ -16,6 +16,7 @@ from .wiring import load_wiring
 from .type import load_types, load_type_keys
 from .metrics import load_metrics
 from .displays import load_displays
+from .implementations import load_implementations
 
 
 def load_from_json(json: Dict) -> MathSpec:
@@ -39,6 +40,7 @@ def load_from_json(json: Dict) -> MathSpec:
     # Do loading one by one to transfer the json
 
     load_type_keys(ms)
+    load_implementations(ms)
     load_types(ms, json)
     load_spaces(ms, json)
     load_states(ms, json)

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/Load/stateful_metrics.py

@@ -55,5 +55,9 @@ def load_stateful_metrics(ms: Dict, json: Dict) -> None:
     """
 
     ms["Stateful Metrics"] = {}
+    check = []
     for sm in json["Stateful Metrics"]:
         ms["Stateful Metrics"][sm["name"]] = convert_stateful_metric(ms, sm)
+        for x in ms["Stateful Metrics"][sm["name"]].metrics:
+            assert x.name not in check, "{} stateful metric name is repeated"
+            check.append(x)

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/Load/type.py

@@ -37,9 +37,14 @@ def convert_type(data, ms):
                 data["type_name"]["python"] = data["type"]["python"].__repr__()
             else:
                 data["type_name"]["python"] = data["type"]["python"].__name__
+    if "typescript" in ms["Type Keys"]:
         if type_name in ms["Type Keys"]["typescript"]:
             data["type"]["typescript"] = ms["Type Keys"]["typescript"][type_name]
             data["type_name"]["typescript"] = ms["Type Keys"]["typescript"][type_name]
+    if "julia" in ms["Type Keys"]:
+        if type_name in ms["Type Keys"]["julia"]:
+            data["type"]["julia"] = ms["Type Keys"]["julia"][type_name]
+            data["type_name"]["julia"] = ms["Type Keys"]["julia"][type_name]
 
     # Build the type object
     return Type(data)
@@ -88,13 +93,40 @@ def load_typescript_type_key(path):
     return type_definitions
 
 
-def load_type_keys(ms) -> dict:
+def load_julia_type_key(path):
+    with open(path, "r") as file:
+        type_definitions = file.read()
+    type_definitions = type_definitions.split("end")
+    type_definitions = [x.strip() for x in type_definitions]
+    type_definitions = [x for x in type_definitions if len(x) > 0]
+
+    hold = type_definitions[:]
+    type_definitions = {}
+    for x in hold:
+        name = x
+        if x.startswith("abstract type"):
+            name = name[14:]
+            name = name[: name.index("<:")].strip()
+        elif x.startswith("struct"):
+            name = name[7:]
+            name = name[: name.index("\n")].strip()
+        else:
+            assert False
+
+        type_definitions[name] = x
+    return type_definitions
+
+
+def load_type_keys(ms):
     type_keys = {}
     python_path = "src/TypeMappings/types.py"
     typescript_path = "src/TypeMappings/types.ts"
+    julia_path = "src/TypeMappings/types.jl"
     if os.path.exists(python_path):
         type_keys["python"] = load_python_type_key()
     if os.path.exists(typescript_path):
         type_keys["typescript"] = load_typescript_type_key(typescript_path)
+    if os.path.exists(julia_path):
+        type_keys["julia"] = load_julia_type_key(julia_path)
 
     ms["Type Keys"] = type_keys

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/Reports/html.py

@@ -147,11 +147,18 @@ def write_spec_tree(
     out += symbol1 + "**Stateful Metrics**\n"
     for name in ms.stateful_metrics.keys():
         if linking:
-            out += symbol2 + "[[{}]]".format(name) + "\n"
+            out += symbol2 + "{}".format(name) + "\n"
         else:
             out += symbol2 + name + "\n"
         for var in ms.stateful_metrics[name].metrics:
-            out += symbol3 + var.name + "\n"
+            out += symbol3 + "[[{}]]".format(var.name) + "\n"
+
+    out += symbol1 + "**Types**\n"
+    for name in ms.types.keys():
+        if linking:
+            out += symbol2 + "[[{}]]".format(name) + "\n"
+        else:
+            out += symbol2 + name + "\n"
 
     out += symbol1 + "**Spaces**\n"
     for name in ms.spaces.keys():
@@ -162,11 +169,11 @@ def write_spec_tree(
     out += symbol1 + "**Parameters**\n"
     for name in ms.parameters.data.keys():
         if linking:
-            out += symbol2 + "[[{}]]".format(name) + "\n"
+            out += symbol2 + "{}".format(name) + "\n"
         else:
             out += symbol2 + name + "\n"
         for param in [x.name for x in ms.parameters.data[name].parameters]:
-            out += symbol3 + param + "\n"
+            out += symbol3 + "[[{}]]".format(param) + "\n"
 
     out += symbol1 + "**Boundary Actions**\n"
     for name in ms.boundary_actions.keys():

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/Reports/markdown.py

@@ -99,6 +99,10 @@ def write_types_markdown_report(ms, path, t, add_metadata=True):
         out += "### Typescript Type\n"
         out += t.type_name["typescript"]
         out += "\n"
+    if "julia" in t.type:
+        out += "### Julia Type\n"
+        out += t.type_name["julia"]
+        out += "\n"
     out += "\n"
     out += "## Notes"
     out += "\n\n"
@@ -135,6 +139,12 @@ def write_boundary_action_markdown_report(ms, path, boundary_action, add_metadat
         out += "\n"
     out += "\n"
 
+    out += "## Followed By\n"
+    for i, x in enumerate([x[0] for x in boundary_action.calls]):
+        out += "{}. [[{}]]".format(i + 1, x.label)
+        out += "\n"
+    out += "\n"
+
     out += "## Constraints"
     for i, x in enumerate(boundary_action.constraints):
         out += "{}. {}".format(i + 1, x)
@@ -342,6 +352,12 @@ def write_control_action_markdown_report(ms, path, control_action, add_metadata=
     out += control_action.description
     out += "\n"
 
+    out += "## Followed By\n"
+    for i, x in enumerate([x[0] for x in control_action.calls]):
+        out += "{}. [[{}]]".format(i + 1, x.label)
+        out += "\n"
+    out += "\n"
+
     out += "## Constraints"
     for i, x in enumerate(control_action.constraints):
         out += "{}. {}".format(i + 1, x)
@@ -406,7 +422,14 @@ def write_wiring_markdown_report(ms, path, wiring, add_metadata=True):
 
     out += "\n"
 
-    out += "## Constraints"
+    out += "## All Blocks\n"
+    for i, x in enumerate(wiring.components_full()):
+        out += "{}. [[{}]]".format(i + 1, x.name)
+        out += "\n"
+
+    out += "\n"
+
+    out += "## Constraints\n"
     for i, x in enumerate(wiring.constraints):
         out += "{}. {}".format(i + 1, x)
         out += "\n"
@@ -510,7 +533,7 @@ def write_stateful_metrics_markdown_report(ms, path, metric, add_metadata=True):
 
     out += "## Variables Used\n"
     for i, x in enumerate(metric.variables_used):
-        out += "{}. {}.{}".format(i + 1, x[0], x[1])
+        out += "{}. [[{}]].{}".format(i + 1, x[0], x[1])
         out += "\n"
     out += "\n"
 
@@ -544,12 +567,18 @@ def write_metrics_markdown_report(ms, path, metric, add_metadata=True):
     out += "## Parameters Used\n"
     for i, x in enumerate(metric.parameters_used):
         out += "{}. [[{}]]".format(i + 1, x)
+        var = ms.parameters.parameter_map[x]
+        if var.symbol:
+            out += " , symbol: {}".format(var.symbol)
         out += "\n"
     out += "\n"
 
     out += "## Variables Used\n"
     for i, x in enumerate(metric.variables_used):
         out += "{}. {}.{}".format(i + 1, x[0], x[1])
+        var = ms.state[x[0]].variable_map[x[1]]
+        if var.symbol:
+            out += " , symbol: {}".format(var.symbol)
         out += "\n"
     out += "\n"
 
@@ -603,7 +632,7 @@ def write_wiring_display_markdown_report(ms, path, wiring, add_metadata=True):
     out += "\n"
 
     out += "## Unique Components Used\n"
-    components = [set(x.components) for x in wirings]
+    components = [set(x.components_full()) for x in wirings]
     components = set().union(*components)
     for i, x in enumerate(components):
         out += "{}. [[{}]]".format(i + 1, x.name)
@@ -638,7 +667,26 @@ def write_wiring_display_markdown_report(ms, path, wiring, add_metadata=True):
         f.write(out)
 
 
-def write_all_markdown_reports(ms, path):
+def write_all_markdown_reports(ms, path, clear_folders=False):
+    if clear_folders:
+        for x in [
+            "Metrics",
+            "Mechanisms",
+            "Types",
+            "Control Actions",
+            "Spaces",
+            ".obsidian",
+            "Boundary Actions",
+            "Policies",
+            "Wiring",
+            "States",
+            "Parameters",
+            "Entities",
+            "Stateful Metrics",
+        ]:
+            if os.path.exists("{}/{}".format(path, x)):
+                for y in os.listdir("{}/{}".format(path, x)):
+                    os.remove("{}/{}/{}".format(path, x, y))
 
     # Write entities
     entities = list(ms.entities.keys())

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/__init__.py

@@ -26,3 +26,5 @@ from .Reports import (
     write_all_markdown_reports,
 )
 from .schema import schema
+
+# from .Convenience import write_top_level_json_description

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6/src/math_spec_mapping.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math_spec_mapping
-Version: 0.2.4
+Version: 0.2.6
 Summary: A library for easy mapping of mathematical specifications.
 Author-email: Sean McOwen <Sean@Block.Science>
 Classifier: Programming Language :: Python :: 3
@@ -23,6 +23,10 @@ It uses block diagram wirings and spaces to represent the actions in complex sys
 
 One good example is the [wiring report](https://github.com/SeanMcOwen/Root-Finding-Simulation/blob/main/MSML/reports/Simulation%20Block.md) for the Root Finding Simulation canonical example.
 
+## Installing the library
+
+To install the library, simply pip install by running "pip install math_spec_mapping"
+
 ## Why MSML?
 
 Writing mathematical specifications can be a difficult process, especially when variable names are changed or new mechanisms are introduced. MSML seeks to streamline the process with automations as well as enhance the abilities of static math specs to deliver deeper insights. Because it is automated, one can write specifications at different levels of details or for different purposes.

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/math_spec_mapping.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ src/Classes/StatefulMetric.py
 src/Classes/Type.py
 src/Classes/__init__.py
 src/Convenience/__init__.py
+src/Convenience/documentation.py
 src/Convenience/starter.py
 src/Load/__init__.py
 src/Load/action_transmission_channel.py
@@ -28,6 +29,7 @@ src/Load/control_actions.py
 src/Load/displays.py
 src/Load/entities.py
 src/Load/general.py
+src/Load/implementations.py
 src/Load/load.py
 src/Load/mechanism.py
 src/Load/metrics.py

{math_spec_mapping-0.2.4 → math_spec_mapping-0.2.6}/src/math_spec_mapping.egg-info/top_level.txt

@@ -2,5 +2,3 @@ Classes
 Convenience
 Load
 Reports
-__init__
-schema