math-spec-mapping 0.3.7__py3-none-any.whl → 0.3.8__py3-none-any.whl

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/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"
@@ -104,8 +112,14 @@ 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("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", "")

{math_spec_mapping-0.3.7.dist-info → math_spec_mapping-0.3.8.dist-info}/METADATA

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

@@ -6,7 +6,7 @@ math_spec_mapping/Classes/Block.py,sha256=cGtIhNgRfoDZ0O3SxeXcNzNlHcdXIB89sT2uaZ
 math_spec_mapping/Classes/BoundaryAction.py,sha256=KuZqtvZwSHWDP7gFQXGnG-r3EuYJU_oU9wMCuqvRkzk,593
 math_spec_mapping/Classes/ControlAction.py,sha256=ysqpgANwdizVdwqtgZmnxXMpCqrzmVEF_6YT0M3l4Ho,526
 math_spec_mapping/Classes/Entity.py,sha256=fA0-b128_OHHxfCg4pzqyQV083EYev1HlVpy86S5igg,1226
-math_spec_mapping/Classes/MathSpec.py,sha256=YopqG_ca7nxgPPZxQR9b442C155ZJGfs73CDEIL5uMc,39038
+math_spec_mapping/Classes/MathSpec.py,sha256=6cBpp9OHmfU-XTqPI4Qjnj91cXRxfGtcAQnczOKxt-4,39892
 math_spec_mapping/Classes/Mechanism.py,sha256=2sLm3wYBIeTQaMBcsJ9btqIWsbS895Ra8NY6Y9_G_Dg,379
 math_spec_mapping/Classes/Metric.py,sha256=AhPgYppOP6q49xvR8S9STxQsXUKJlTWx7wI1LfZEtww,581
 math_spec_mapping/Classes/Parameter.py,sha256=ZuJ_w0sChvRElJ4sOnXZ2EV4Ell2xXFulKLjVOpgz2E,1237
@@ -19,7 +19,7 @@ math_spec_mapping/Classes/Type.py,sha256=2KFY8d3cv1PzJJ7SSMHJf1zcfQ3ZbqxotK2KgTa
 math_spec_mapping/Classes/__init__.py,sha256=0zxgOqns_9JybD74HKMVh6aw8ij8WVbfQ4Q_1uWzof0,761
 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/Convenience/starter.py,sha256=vflOgTVRvM5OMBB7kHnoLR-sGeukKxOJNJmJzQm9Ick,11649
 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=q-jxhu8FaKNjdOdexlK6f22GDgraGa1jnL5kEzQ7mJY,2625
@@ -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.7.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
-math_spec_mapping-0.3.7.dist-info/METADATA,sha256=Y4GIicxIeBa44LDgCxCdNAedQ7EZunZn-VD3JPMfFF4,6500
-math_spec_mapping-0.3.7.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-math_spec_mapping-0.3.7.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
-math_spec_mapping-0.3.7.dist-info/RECORD,,
+math_spec_mapping-0.3.8.dist-info/LICENSE,sha256=ObyEzSw8kgCaFbEfpu1zP4TrcAKLA0xhqHMZZfyh7N0,1069
+math_spec_mapping-0.3.8.dist-info/METADATA,sha256=Rcdfu5GQQlfA6GnvqZopFBd2zJGe2JpHKoWUXVf3yoY,6500
+math_spec_mapping-0.3.8.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+math_spec_mapping-0.3.8.dist-info/top_level.txt,sha256=AImhn9wgazkdV0a9vfiphtQR8uGe2nq-ZIOp-6yUk9o,18
+math_spec_mapping-0.3.8.dist-info/RECORD,,

{math_spec_mapping-0.3.7.dist-info → math_spec_mapping-0.3.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any