math-spec-mapping 0.3.11__tar.gz → 0.3.13__tar.gz

{math_spec_mapping-0.3.11/src/math_spec_mapping.egg-info → math_spec_mapping-0.3.13}/PKG-INFO

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

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

{math_spec_mapping-0.3.11 → math_spec_mapping-0.3.13}/src/math_spec_mapping/Load/implementations.py

@@ -4,7 +4,8 @@ import os
 def load_implementations(ms):
     implementations = {}
     python_path = "src/Implementations/Python/__init__.py"
-    if os.path.exists(python_path):
+    python_path2 = "../src/Implementations/Python/__init__.py"
+    if os.path.exists(python_path) or os.path.exists(python_path2):
         implementations["python"] = load_python_implementations()
 
     ms["Implementations"] = implementations

{math_spec_mapping-0.3.11 → math_spec_mapping-0.3.13}/src/math_spec_mapping/Load/type.py

@@ -134,4 +134,14 @@ def load_type_keys(ms):
     if os.path.exists(julia_path):
         type_keys["julia"] = load_julia_type_key(julia_path)
 
+    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.3.11 → math_spec_mapping-0.3.13}/src/math_spec_mapping/Reports/html.py

@@ -258,11 +258,22 @@ cssclasses:
         return out
 
 
-def write_overview(ms: MathSpec, name: str, file_path: str, summary: str = None):
+def write_overview(
+    ms: MathSpec,
+    name: str,
+    file_path: str,
+    summary: str = None,
+    base_folder: str = None,
+):
     out = "<h1>{}</h1>".format(name)
     if summary:
         out += "<h2>Summary</h2>"
         out += "<p>{}</p>".format(summary)
+    if base_folder:
+        with open(base_folder, "r") as file:
+            content = file.read()
+        out += content
+        out += "\n"
     out += "<h2>Specification Tree</h2>"
     out += write_spec_tree(ms, readme=True)
     with open(file_path, "w") as f:

{math_spec_mapping-0.3.11 → math_spec_mapping-0.3.13}/src/math_spec_mapping/Reports/parameters.py

@@ -15,7 +15,9 @@ def write_out_params(ms: MathSpec, params: List[str]) -> str:
     return out
 
 
-def write_parameter_table_markdown(ms, initial_values=None, links=False):
+def write_parameter_table_markdown(
+    ms, initial_values=None, links=False, compress_arrays=False
+):
     if initial_values:
         table = """| Name | Description | Parameter Class | Symbol | Domain | Initial Value |
 | --- | --- | --- | --- | --- | --- |
@@ -43,7 +45,16 @@ def write_parameter_table_markdown(ms, initial_values=None, links=False):
                     table += "{}".format(tv)
             table += "|"
         if initial_values:
-            table += " {} |".format(initial_values[var.name])
+            if compress_arrays:
+                iv = initial_values[var.name]
+                if type(iv) == list:
+                    if len(iv) > 4:
+                        iv = "[{}, {}, ... , {}, {}]".format(
+                            iv[0], iv[1], iv[-2], iv[-1]
+                        )
+                table += " {} |".format(iv)
+            else:
+                table += " {} |".format(initial_values[var.name])
 
         table += "\n"
 

{math_spec_mapping-0.3.11 → math_spec_mapping-0.3.13}/src/math_spec_mapping/Reports/state.py

@@ -33,7 +33,9 @@ def write_state_variable_table(target_state, links=False):
     return table
 
 
-def write_state_variable_table_markdown(target_state, initial_values=None, links=False):
+def write_state_variable_table_markdown(
+    target_state, initial_values=None, links=False, compress_arrays=False
+):
     if initial_values:
         table = """| Name | Description | Type | Symbol | Domain | Initial Value |
 | --- | --- | --- | --- | --- | --- |
@@ -62,18 +64,32 @@ def write_state_variable_table_markdown(target_state, initial_values=None, links
                     table += "{}".format(tv)
             table += "|"
         if initial_values:
-            table += " {} |".format(initial_values[var.name])
+            if compress_arrays:
+                iv = initial_values[var.name]
+                if type(iv) == list:
+                    if len(iv) > 4:
+                        iv = "[{}, {}, ... , {}, {}]".format(
+                            iv[0], iv[1], iv[-2], iv[-1]
+                        )
+                table += " {} |".format(iv)
+            else:
+                table += " {} |".format(initial_values[var.name])
 
         table += "\n"
 
     return table
 
 
-def write_initial_state_variables_tables(ms, initial_values, links=False):
+def write_initial_state_variables_tables(
+    ms, initial_values, links=False, compress_arrays=False
+):
     out = "### Global State"
     out += "\n\n"
     out += write_state_variable_table_markdown(
-        ms.state["Global State"], initial_values=initial_values, links=links
+        ms.state["Global State"],
+        initial_values=initial_values,
+        links=links,
+        compress_arrays=compress_arrays,
     )
     out += "\n"
     for x in ms.state:
@@ -82,7 +98,9 @@ def write_initial_state_variables_tables(ms, initial_values, links=False):
 
         out += "### {}".format(x)
         out += "\n\n"
-        out += write_state_variable_table_markdown(ms.state[x], links=links)
+        out += write_state_variable_table_markdown(
+            ms.state[x], links=links, compress_arrays=compress_arrays
+        )
         out += "\n"
 
     return out

{math_spec_mapping-0.3.11 → math_spec_mapping-0.3.13/src/math_spec_mapping.egg-info}/PKG-INFO

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