math-spec-mapping 0.3.7__tar.gz → 0.3.9__tar.gz

{math_spec_mapping-0.3.7/src/math_spec_mapping.egg-info → math_spec_mapping-0.3.9}/PKG-INFO

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

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

{math_spec_mapping-0.3.7 → math_spec_mapping-0.3.9}/src/math_spec_mapping/Classes/MathSpec.py

@@ -477,17 +477,23 @@ class MathSpec:
         state_base,
         post_processing_function,
         state_preperation_functions=None,
+        parameter_preperation_functions=None,
         metrics_functions=None,
     ):
         if experiment["Param Modifications"]:
             params_base = deepcopy(params_base)
             for key in experiment["Param Modifications"]:
                 params_base[key] = experiment["Param Modifications"][key]
+        if experiment["State Modifications"]:
+            state_base = deepcopy(state_base)
+            for key in experiment["State Modifications"]:
+                state_base[key] = experiment["State Modifications"][key]
         msi = self.build_implementation(params_base)
         state, params = msi.prepare_state_and_params(
             state_base,
             params_base,
             state_preperation_functions=state_preperation_functions,
+            parameter_preperation_functions=parameter_preperation_functions,
         )
 
         state = msi.execute_blocks(state, params, experiment["Blocks"])
@@ -510,6 +516,7 @@ class MathSpec:
         state_base,
         post_processing_function,
         state_preperation_functions=None,
+        parameter_preperation_functions=None,
         metrics_functions=None,
     ):
         state_l = []
@@ -524,6 +531,7 @@ class MathSpec:
                     state_base,
                     post_processing_function,
                     state_preperation_functions=state_preperation_functions,
+                    parameter_preperation_functions=parameter_preperation_functions,
                     metrics_functions=metrics_functions,
                 )
                 df["Monte Carlo Run"] = i + 1
@@ -1007,7 +1015,13 @@ class MathSpecImplementation:
             len(shouldnt_be_in_params) == 0
         ), "The following parameters are extra: {}".format(shouldnt_be_in_params)
 
-    def prepare_state_and_params(self, state, params, state_preperation_functions=None):
+    def prepare_state_and_params(
+        self,
+        state,
+        params,
+        state_preperation_functions=None,
+        parameter_preperation_functions=None,
+    ):
         self.validate_state_and_params(state, params)
         state = deepcopy(state)
         params = deepcopy(params)
@@ -1018,6 +1032,12 @@ class MathSpecImplementation:
                 assert (
                     state is not None
                 ), "A state must be returned from the state preperation functions"
+        if parameter_preperation_functions:
+            for f in parameter_preperation_functions:
+                params = f(params)
+                assert (
+                    params is not None
+                ), "A parameter set must be returned from the parameter preperation functions"
         return state, params
 
     def load_components(self):

{math_spec_mapping-0.3.7 → math_spec_mapping-0.3.9}/src/math_spec_mapping/Convenience/starter.py

@@ -39,19 +39,27 @@ def remove_dummy_repo_components(path):
             with open(path2 + "/__init__.py", "w") as f:
                 f.write(contents)
 
-    """if "Displays" in directory_folders:
+    if "Displays" in directory_folders:
         path2 = path + "/Displays"
         contents = os.listdir(path2)
-        if "Dummy.py" in contents:
-            os.remove(path2 + "/Dummy.py")
-        if "__init__.py" in contents:
-            with open(path2 + "/__init__.py", "r") as f:
+        if "wiring.py" in contents:
+            with open(path2 + "/wiring.py", "r") as f:
                 contents = f.read()
-                contents = contents.replace("from .Dummy import metrics_x\n", "")
-                contents = contents.replace("metrics.extend(metrics_x)\n", "")
-                contents = contents.replace("metrics.extend(metrics_x)", "")
-            with open(path2 + "/__init__.py", "w") as f:
-                f.write(contents)"""
+
+                contents = contents.replace('"Dummy Boundary Wiring 2",\n', "")
+                contents = contents.replace('"Dummy Boundary Wiring 2",', "")
+                contents = contents.replace('"Dummy Boundary Wiring 2"', "")
+
+                contents = contents.replace('"Dummy Boundary Wiring",\n', "")
+                contents = contents.replace('"Dummy Boundary Wiring",', "")
+                contents = contents.replace('"Dummy Boundary Wiring"', "")
+
+                contents = contents.replace('"Dummy Control Wiring",\n', "")
+                contents = contents.replace('"Dummy Control Wiring",', "")
+                contents = contents.replace('"Dummy Control Wiring"', "")
+
+            with open(path2 + "/wiring.py", "w") as f:
+                f.write(contents)
 
     if "Wiring" in directory_folders:
         path2 = path + "/Wiring"
@@ -78,6 +86,8 @@ def remove_dummy_repo_components(path):
                 contents = contents.replace("from .Dummy import dummy_mechanisms\n", "")
                 contents = contents.replace("mechanism.extend(dummy_mechanisms)\n", "")
                 contents = contents.replace("mechanism.extend(dummy_mechanisms)", "")
+                contents = contents.replace("mechanisms.extend(dummy_mechanisms)\n", "")
+                contents = contents.replace("mechanisms.extend(dummy_mechanisms)", "")
             with open(path2 + "/__init__.py", "w") as f:
                 f.write(contents)
 
@@ -104,8 +114,23 @@ def remove_dummy_repo_components(path):
             with open(path2 + "/__init__.py", "r") as f:
                 contents = f.read()
                 contents = contents.replace(
-                    "from .Dummy import dummy_boundary_action\n", ""
+                    "from .Dummy import dummy_boundary_action, dummy_boundary_action2\n",
+                    "",
+                )
+                contents = contents.replace(
+                    "from .Dummy import dummy_boundary_actions\n",
+                    "",
+                )
+
+                contents = contents.replace(
+                    "boundary_actions.extend(dummy_boundary_actions)",
+                    "",
                 )
+
+                contents = contents.replace("dummy_boundary_action2,\n", "")
+                contents = contents.replace("dummy_boundary_action2,", "")
+                contents = contents.replace("dummy_boundary_action2", "")
+
                 contents = contents.replace("dummy_boundary_action,\n", "")
                 contents = contents.replace("dummy_boundary_action,", "")
                 contents = contents.replace("dummy_boundary_action", "")
@@ -123,6 +148,13 @@ def remove_dummy_repo_components(path):
                 contents = contents.replace(
                     "from .Dummy import dummy_control_action\n", ""
                 )
+                contents = contents.replace(
+                    "from .Dummy import dummy_control_actions\n", ""
+                )
+                contents = contents.replace(
+                    "control_actions.extend(dummy_control_actions)", ""
+                )
+
                 contents = contents.replace("dummy_control_action,\n", "")
                 contents = contents.replace("dummy_control_action,", "")
                 contents = contents.replace("dummy_control_action", "")
@@ -200,6 +232,8 @@ def remove_dummy_repo_components(path):
                 contents = contents.replace(
                     "from .Dummy import DummyCompoundType, DummyType1, DummyType2\n", ""
                 )
+                contents = contents.replace("from .Dummy import dummy_types\n", "")
+                contents = contents.replace("types.extend(dummy_types)", "")
                 contents = contents.replace(
                     """    DummyType1,
     DummyType2,

{math_spec_mapping-0.3.7 → math_spec_mapping-0.3.9}/src/math_spec_mapping/Load/stateful_metrics.py

@@ -40,14 +40,14 @@ def convert_stateful_metric(ms, data: Dict) -> StatefulMetricSet:
                 x[1]
             )
 
-    var["implementations"] = {}
+        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"]]
 
-    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-0.3.7 → math_spec_mapping-0.3.9}/src/math_spec_mapping/Reports/__init__.py

@@ -7,6 +7,7 @@ from .html import (
     write_basic_report_full,
     write_action_chain_reports,
     write_spec_tree,
+    write_parameter_table,
     write_entity_reports,
     write_overview,
 )
@@ -26,3 +27,8 @@ from .markdown import (
     write_stateful_metrics_markdown_report,
     write_all_markdown_reports,
 )
+from .state import (
+    write_state_variable_table_markdown,
+    write_initial_state_variables_tables,
+)
+from .parameters import write_parameter_table_markdown

{math_spec_mapping-0.3.7 → math_spec_mapping-0.3.9}/src/math_spec_mapping/Reports/html.py

@@ -6,7 +6,7 @@ from .policies import write_out_policies
 from .mechanisms import write_out_mechanisms
 from .general import load_svg_graphviz, write_header
 from .node_map import create_action_chains_graph
-from .parameters import write_out_params
+from .parameters import write_out_params, write_parameter_table_markdown
 from .state import write_local_state_variable_tables, write_global_state_variable_table
 from typing import List
 import os
@@ -267,3 +267,12 @@ def write_overview(ms: MathSpec, name: str, file_path: str, summary: str = None)
     out += write_spec_tree(ms, readme=True)
     with open(file_path, "w") as f:
         f.write(out)
+
+
+def write_parameter_table(ms: MathSpec, path=None, linking=False) -> str:
+    out = write_parameter_table_markdown(ms, links=linking)
+    if path:
+        with open("{}/Paramter Table.md".format(path), "w") as f:
+            f.write(out)
+    else:
+        return out

math_spec_mapping-0.3.9/src/math_spec_mapping/Reports/parameters.py

@@ -0,0 +1,50 @@
+from ..Classes import MathSpec
+from typing import List
+
+
+def write_out_params(ms: MathSpec, params: List[str]) -> str:
+    out = "<h2>Parameters</h2>"
+    for name in params:
+        out += "<h3>{}</h3>".format(name)
+        param = ms.parameters.parameter_map[name]
+        out += "<p>Description: {}</p>".format(param.description)
+        out += "<p>Symbol: {}</p>".format(param.symbol)
+        out += "<p>Domain: {}</p>".format(param.domain)
+        out += "<p>Parameter Class: {}</p>".format(param.parameter_class)
+
+    return out
+
+
+def write_parameter_table_markdown(ms, initial_values=None, links=False):
+    if initial_values:
+        table = """| Name | Description | Parameter Class | Symbol | Domain | Initial Value |
+| --- | --- | --- | --- | --- | --- |
+"""
+    else:
+        table = """| Name | Description | Parameter Class | Symbol | Domain |
+| --- | --- | --- | --- | --- |
+"""
+
+    for name in ms.parameters.parameter_map:
+        var = ms.parameters.parameter_map[name]
+        table_vars = [
+            var.name,
+            var.description,
+            var.parameter_class,
+            var.symbol,
+            var.domain,
+        ]
+        table += "|"
+        for i, tv in enumerate(table_vars):
+            if tv:
+                if links and i == 0:
+                    table += "[[{}\|{}]]".format(tv, tv)
+                else:
+                    table += "{}".format(tv)
+            table += "|"
+        if initial_values:
+            table += " {} |".format(initial_values[var.name])
+
+        table += "\n"
+
+    return table

{math_spec_mapping-0.3.7 → math_spec_mapping-0.3.9}/src/math_spec_mapping/Reports/state.py

@@ -33,8 +33,13 @@ def write_state_variable_table(target_state, links=False):
     return table
 
 
-def write_state_variable_table_markdown(target_state, links=False):
-    table = """| Name | Description | Type | Symbol | Domain |
+def write_state_variable_table_markdown(target_state, initial_values=None, links=False):
+    if initial_values:
+        table = """| Name | Description | Type | Symbol | Domain | Initial Value |
+| --- | --- | --- | --- | --- | --- |
+"""
+    else:
+        table = """| Name | Description | Type | Symbol | Domain |
 | --- | --- | --- | --- | --- |
 """
 
@@ -56,12 +61,33 @@ def write_state_variable_table_markdown(target_state, links=False):
                 else:
                     table += "{}".format(tv)
             table += "|"
+        if initial_values:
+            table += " {} |".format(initial_values[var.name])
 
         table += "\n"
 
     return table
 
 
+def write_initial_state_variables_tables(ms, initial_values, links=False):
+    out = "### Global State"
+    out += "\n\n"
+    out += write_state_variable_table_markdown(
+        ms.state["Global State"], initial_values=initial_values, links=links
+    )
+    out += "\n"
+    for x in ms.state:
+        if x == "Global State":
+            continue
+
+        out += "### {}".format(x)
+        out += "\n\n"
+        out += write_state_variable_table_markdown(ms.state[x], links=links)
+        out += "\n"
+
+    return out
+
+
 def write_global_state_variable_table(state):
     out = ""
     out += "<h3>Global State</h3>"

{math_spec_mapping-0.3.7 → math_spec_mapping-0.3.9}/src/math_spec_mapping/__init__.py

@@ -8,6 +8,7 @@ from .Reports import (
     write_basic_report_full,
     write_action_chain_reports,
     write_spec_tree,
+    write_parameter_table,
     create_parameter_impact_table,
     write_entity_reports,
     write_wiring_report,
@@ -24,6 +25,9 @@ from .Reports import (
     write_parameter_markdown_report,
     write_stateful_metrics_markdown_report,
     write_all_markdown_reports,
+    write_state_variable_table_markdown,
+    write_initial_state_variables_tables,
+    write_parameter_table_markdown,
 )
 from .schema import schema
 from .Convenience import remove_dummy_repo_components

{math_spec_mapping-0.3.7 → math_spec_mapping-0.3.9/src/math_spec_mapping.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math-spec-mapping
-Version: 0.3.7
+Version: 0.3.9
 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.7/src/math_spec_mapping/Reports/parameters.py

@@ -1,15 +0,0 @@
-from ..Classes import MathSpec
-from typing import List
-
-
-def write_out_params(ms: MathSpec, params: List[str]) -> str:
-    out = "<h2>Parameters</h2>"
-    for name in params:
-        out += "<h3>{}</h3>".format(name)
-        param = ms.parameters.parameter_map[name]
-        out += "<p>Description: {}</p>".format(param.description)
-        out += "<p>Symbol: {}</p>".format(param.symbol)
-        out += "<p>Domain: {}</p>".format(param.domain)
-        out += "<p>Parameter Class: {}</p>".format(param.parameter_class)
-
-    return out