math-spec-mapping 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

math_spec_mapping/Convenience/__init__.py

@@ -1 +1,2 @@
-from .documentation import write_top_level_json_description
+# from .documentation import write_top_level_json_description
+from .starter import remove_dummy_repo_components

math_spec_mapping/Convenience/documentation.py

@@ -1,4 +1,4 @@
-from src import schema
+from src.math_spec_mapping import schema
 
 
 def write_json_description(schema, key, name):

math_spec_mapping/Convenience/starter.py

@@ -0,0 +1,271 @@
+import os
+
+
+def remove_dummy_repo_components(path):
+
+    directory_folders = os.listdir(path)
+
+    if "StatefulMetrics" in directory_folders:
+        path2 = path + "/StatefulMetrics"
+        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:
+                contents = f.read()
+                contents = contents.replace(
+                    "from .Dummy import dummy_stateful_metrics\n", ""
+                )
+                contents = contents.replace(
+                    "stateful_metrics.extend(dummy_stateful_metrics)\n", ""
+                )
+                contents = contents.replace(
+                    "stateful_metrics.extend(dummy_stateful_metrics)", ""
+                )
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "Metrics" in directory_folders:
+        path2 = path + "/Metrics"
+        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:
+                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)
+
+    """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:
+                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)"""
+
+    if "Wiring" in directory_folders:
+        path2 = path + "/Wiring"
+        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:
+                contents = f.read()
+                contents = contents.replace("from .Dummy import dummy_wiring\n", "")
+                contents = contents.replace("wiring.extend(dummy_wiring)\n", "")
+                contents = contents.replace("wiring.extend(dummy_wiring)", "")
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "Mechanisms" in directory_folders:
+        path2 = path + "/Mechanisms"
+        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:
+                contents = f.read()
+                contents = contents.replace("from .Dummy import dummy_mechanisms\n", "")
+                contents = contents.replace("mechanism.extend(dummy_mechanisms)\n", "")
+                contents = contents.replace("mechanism.extend(dummy_mechanisms)", "")
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "Policies" in directory_folders:
+        path2 = path + "/Policies"
+        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:
+                contents = f.read()
+                contents = contents.replace("from .Dummy import dummy_policies\n", "")
+                contents = contents.replace("policies.extend(dummy_policies)\n", "")
+                contents = contents.replace("policies.extend(dummy_policies)", "")
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "BoundaryActions" in directory_folders:
+        path2 = path + "/BoundaryActions"
+        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:
+                contents = f.read()
+                contents = contents.replace(
+                    "from .Dummy import dummy_boundary_action\n", ""
+                )
+                contents = contents.replace("dummy_boundary_action,\n", "")
+                contents = contents.replace("dummy_boundary_action,", "")
+                contents = contents.replace("dummy_boundary_action", "")
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "ControlActions" in directory_folders:
+        path2 = path + "/ControlActions"
+        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:
+                contents = f.read()
+                contents = contents.replace(
+                    "from .Dummy import dummy_control_action\n", ""
+                )
+                contents = contents.replace("dummy_control_action,\n", "")
+                contents = contents.replace("dummy_control_action,", "")
+                contents = contents.replace("dummy_control_action", "")
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+    if "Entities" in directory_folders:
+        path2 = path + "/Entities"
+        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:
+                contents = f.read()
+                contents = contents.replace("from .Dummy import dummy_entity\n", "")
+                contents = contents.replace("dummy_entity, ", "")
+                contents = contents.replace("dummy_entity,", "")
+                contents = contents.replace("dummy_entity", "")
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+    if "State" in directory_folders:
+        path2 = path + "/State"
+        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:
+                contents = f.read()
+                contents = contents.replace("from .Dummy import dummy_state\n", "")
+                contents = contents.replace("dummy_state, ", "")
+                contents = contents.replace("dummy_state,", "")
+                contents = contents.replace("dummy_state", "")
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "Parameters" in directory_folders:
+        path2 = path + "/Parameters"
+        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:
+                contents = f.read()
+                contents = contents.replace(
+                    "from .Dummy import dummy_parameter_sets", ""
+                )
+                contents = contents.replace(
+                    "parameters.extend(dummy_parameter_sets)", ""
+                )
+
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "Spaces" in directory_folders:
+        path2 = path + "/Spaces"
+        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:
+                contents = f.read()
+                contents = contents.replace("from .Dummy import dummy_spaces\n", "")
+                contents = contents.replace("spaces.extend(dummy_spaces)", "")
+
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "Types" in directory_folders:
+        path2 = path + "/Types"
+        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:
+                contents = f.read()
+                contents = contents.replace(
+                    "from .Dummy import DummyCompoundType, DummyType1, DummyType2\n", ""
+                )
+                contents = contents.replace(
+                    """    DummyType1,
+    DummyType2,
+    DummyCompoundType,""",
+                    "",
+                )
+                contents = contents.replace(
+                    """    DummyType1,
+    DummyType2,
+    DummyCompoundType""",
+                    "",
+                )
+
+            with open(path2 + "/__init__.py", "w") as f:
+                f.write(contents)
+
+    if "TypeMappings" in directory_folders:
+        path2 = path + "/TypeMappings"
+        contents = os.listdir(path2)
+
+        if "types.py" in contents:
+            with open(path2 + "/types.py", "r") as f:
+                contents = f.read()
+                contents = contents.replace(
+                    """    "DummyType1": str,
+    "DummyType2": int,
+    "DummyCompoundType": {"A": "Dummy Type 1", "B": "Dummy Type 2"},""",
+                    "",
+                )
+
+            with open(path2 + "/types.py", "w") as f:
+                f.write(contents)
+
+    if "TypeMappings" in directory_folders:
+        path2 = path + "/TypeMappings"
+        contents = os.listdir(path2)
+
+        if "types.py" in contents:
+            with open(path2 + "/types.jl", "r") as f:
+                contents = f.read()
+                contents = contents.replace(
+                    """const DummyType1 = String
+const DummyType2 = Integer
+struct DummyCompoundType
+    A::DummyType1
+    B::DummyType2
+end""",
+                    "",
+                )
+
+            with open(path2 + "/types.jl", "w") as f:
+                f.write(contents)
+
+    if "TypeMappings" in directory_folders:
+        path2 = path + "/TypeMappings"
+        contents = os.listdir(path2)
+
+        if "types.py" in contents:
+            with open(path2 + "/types.ts", "r") as f:
+                contents = f.read()
+                contents = contents.replace(
+                    """type DummyType1 = string
+type DummyType2 = number
+type DummyCompoundType = {"A": DummyType1, "B": DummyType2}""",
+                    "",
+                )
+
+            with open(path2 + "/types.ts", "w") as f:
+                f.write(contents)

math_spec_mapping/Load/parameters.py

@@ -18,7 +18,9 @@ def convert_parameter_set(ms, data: Dict) -> ParameterSet:
         if "metadata" not in param:
             param["metadata"] = {}
         check_json_keys(param, "Parameter")
-        assert param["variable_type"] in ms["Types"], "Type not in ms"
+        assert param["variable_type"] in ms["Types"], "Type of {} not in ms".format(
+            param["variable_type"]
+        )
         param["variable_type"] = ms["Types"][param["variable_type"]]
         new_parameters.append(Parameter(param))
     data["parameters"] = new_parameters

math_spec_mapping/Load/type.py

@@ -71,7 +71,8 @@ def load_typescript_type_key(path):
     type_definitions = [x for x in type_definitions if len(x) > 0]
     hold = type_definitions[:]
     type_definitions = []
-    type_definitions.append(hold.pop(0))
+    if len(hold) > 0:
+        type_definitions.append(hold.pop(0))
     while len(hold) > 0:
         curr = hold.pop(0)
         if "type" in curr or "interface" in curr:

math_spec_mapping/Reports/markdown.py

@@ -585,7 +585,7 @@ def write_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[0], x[1], x[1])
         var = ms.state[x[0]].variable_map[x[1]]
         if var.symbol:
             out += " , symbol: {}".format(var.symbol)

math_spec_mapping/__init__.py

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

math_spec_mapping/schema.schema.json

@@ -693,7 +693,8 @@
                     "items": {
                         "type": "integer"
                     }
-                }
+                },
+                "metadata": {"type": "object"}
             },
             "required": [
                 "components",

{math_spec_mapping-0.3.1.dist-info → math_spec_mapping-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: math-spec-mapping
-Version: 0.3.1
+Version: 0.3.2
 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.1.dist-info → math_spec_mapping-0.3.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-math_spec_mapping/__init__.py,sha256=k5KVhqX1_iIkGjTBHAHezWUeh0b3ilWpJaSIVSbKMcg,907
+math_spec_mapping/__init__.py,sha256=CzT9KycdX5nuiUzDFmLXVeAIr8v8UKGbXsEQF8vjl1c,961
 math_spec_mapping/schema.py,sha256=6mrRqzEnTTSXjb19xJ63MBp0KjKH0s7i6TfT4MkAY9k,233
-math_spec_mapping/schema.schema.json,sha256=gvKfsWNuxnwdwtLCdQPi4GYno_QfZfRNo86ThNUckF0,29352
+math_spec_mapping/schema.schema.json,sha256=5_DiubQzPo8koyx5PKFh_zIINyjtrhGWG_7N73s9b1Q,29400
 math_spec_mapping/Classes/ActionTransmissionChannel.py,sha256=zWMo5QsgPh5WGIWXl-xOrZNMXYJXmK6Vejw1dQvi0og,246
 math_spec_mapping/Classes/Block.py,sha256=hXQO221IP-TqZm_TwFKfURpEEjZm7L1TPZDCYlaOdho,17302
 math_spec_mapping/Classes/BoundaryAction.py,sha256=AOENCqCEfpjotnHhzUj_F2SOP0SGpkN1tNPr8Mtl6Tc,476
@@ -17,9 +17,9 @@ math_spec_mapping/Classes/StateUpdateTransmissionChannel.py,sha256=3hBLvD1lE64Pk
 math_spec_mapping/Classes/StatefulMetric.py,sha256=UCis1BJ7fsajHHxFF05ZiyDean2D4s4a95uYYW1Mjq4,749
 math_spec_mapping/Classes/Type.py,sha256=2KFY8d3cv1PzJJ7SSMHJf1zcfQ3ZbqxotK2KgTaLZdM,289
 math_spec_mapping/Classes/__init__.py,sha256=0zxgOqns_9JybD74HKMVh6aw8ij8WVbfQ4Q_1uWzof0,761
-math_spec_mapping/Convenience/__init__.py,sha256=-hNZVoaNSgTmZTiyZoMfWyg14xonC3ppz-diQk1VlUY,60
-math_spec_mapping/Convenience/documentation.py,sha256=Jf7-JJIk_vZkNBIGV4bs5LM3B0RVaCCtuwJ164thGfY,1607
-math_spec_mapping/Convenience/starter.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+math_spec_mapping/Convenience/__init__.py,sha256=z2W-E5Wg1CNEkDI5UqH3qIVBqp-3A1e63f3u9fA-N7w,112
+math_spec_mapping/Convenience/documentation.py,sha256=1ziWVJznbCUxeAAt03nAdEYtMlXNo5TeedHfgs0vSBU,1625
+math_spec_mapping/Convenience/starter.py,sha256=Pv0b5pHnv5Bxk3PkY8O9Nv62z2C_gxj5xcf8G9r4Pkw,11010
 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=WvEj2tqN0pUZtE4EiKUuGzMdAcWsMlLslJJeFjIu6gk,2058
@@ -31,20 +31,20 @@ math_spec_mapping/Load/implementations.py,sha256=SGKZ_YXeNpJUTnw5fajQTXji7S2bNQo
 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=EyCFEgHpyffBPKaqISdIeTyqUtPtu2xoS0gZjh-6i3U,3434
-math_spec_mapping/Load/parameters.py,sha256=aid_vqYub9643s82NDtMAXLRdV9BPQkri5MadA0L0eQ,1334
+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/spaces.py,sha256=7zgGA57Te7T4hfuCCDElffiidWgn1lKm5E14e1yjt8M,1116
 math_spec_mapping/Load/state_update_transmission_channels.py,sha256=FJWp5n4HdtHAfof5BUQ6BnRakljatL2h8dWCapaVSc0,2238
 math_spec_mapping/Load/stateful_metrics.py,sha256=uGSTc6x6lld5xptgSUMHrO0Vg0QDRIL14C6zTg33S8o,1977
 math_spec_mapping/Load/states.py,sha256=gAiCGxqc8_js8Gd0aRRrK4PeUW4jgZsgukR6e-5fcg4,1290
-math_spec_mapping/Load/type.py,sha256=wrzT3bmLn2ghvuy8hZhtQZ479HZNntKoLdIC2TcMrgw,4330
+math_spec_mapping/Load/type.py,sha256=z6cBdBNjWed7cRyA0Bj7Jd5PmtemVVh07n3mWFj_5U4,4356
 math_spec_mapping/Load/wiring.py,sha256=1dR94U5N1W_WI5rL6lYBltH25ZvApB2pIpq9r5Opkug,3083
 math_spec_mapping/Reports/__init__.py,sha256=W27I6S9Ro1hWeHmnxIokCA06awB__eYey7PvKD4Hc1s,933
 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=tqydmwFWz_1Bg_J_avG4t9LtE-DUGbOKAPNuwg6lgRI,9007
-math_spec_mapping/Reports/markdown.py,sha256=r9tHxuGvmwbUy92GVoChqcs7h8pvrGMwXgogAfla4O0,22479
+math_spec_mapping/Reports/markdown.py,sha256=JF4D95pocWfQFi5uFjMFewWabuo4MSlfKeoB-TUpWFk,22505
 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=yizNG4lNGrgrlzYYcHMGfXKDFlPw4PMDYshDqZ3YARs,535
@@ -53,8 +53,8 @@ math_spec_mapping/Reports/spaces.py,sha256=-76hR5wQBv4lsG000ypBJ-OprjsNjI-rNRMYd
 math_spec_mapping/Reports/state.py,sha256=RkqfSonar74KVC8PpA9GgI2xaHX6BrkNdAuWMZlYQfI,2321
 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.1.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
-math_spec_mapping-0.3.1.dist-info/METADATA,sha256=dhHFXSeznJ8iViRkPXM7IC0TOFEkuvSVX41dMIzpuT0,6012
-math_spec_mapping-0.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-math_spec_mapping-0.3.1.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
-math_spec_mapping-0.3.1.dist-info/RECORD,,
+math_spec_mapping-0.3.2.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
+math_spec_mapping-0.3.2.dist-info/METADATA,sha256=whpL8E0F7P53HUUVAYIMsMVTOBv8oFGSok6a6IHF2BM,6012
+math_spec_mapping-0.3.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+math_spec_mapping-0.3.2.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
+math_spec_mapping-0.3.2.dist-info/RECORD,,