🔧 refactor parameter setting methods for use outside of simulate() method

Author: Tesshub

modelitool/corrai_connector.py

@@ -99,7 +99,7 @@ def function(self, x_dict):
             param[Parameter.NAME]: x_dict[param[Parameter.NAME]]
             for param in self.param_list
         }
-        self.om_model._set_param_dict(temp_dict)
+        self.om_model.set_param_dict(temp_dict)
         res = self.om_model.simulate()
 
         function_results = {}

modelitool/simulate.py

@@ -102,7 +102,7 @@ def simulate(
         """
 
         if parameter_dict is not None:
-            self._set_param_dict(parameter_dict)
+            self.set_param_dict(parameter_dict)
 
         if simulation_options is not None:
             self._set_simulation_options(simulation_options)
@@ -190,10 +190,10 @@ def _set_x(self, df: pd.DataFrame):
             new_bounds_path = self._simulation_path / "boundaries.txt"
             df_to_combitimetable(df, new_bounds_path)
             full_path = (self._simulation_path / "boundaries.txt").resolve().as_posix()
-            self._set_param_dict({f"{self.x_combitimetable_name}.fileName": full_path})
+            self.set_param_dict({f"{self.x_combitimetable_name}.fileName": full_path})
             self._x = df
 
-    def _set_param_dict(self, param_dict):
+    def set_param_dict(self, param_dict):
         self.model.setParameters([f"{item}={val}" for item, val in param_dict.items()])
 
 

tests/test_simulate.py

@@ -1,7 +1,5 @@
 from pathlib import Path
-
 import pytest
-
 import numpy as np
 import pandas as pd
 
@@ -42,7 +40,7 @@ def test_set_param_dict(self, simul):
             "y.k": 2.0,
         }
 
-        simul._set_param_dict(test_dict)
+        simul.set_param_dict(test_dict)
 
         for key in test_dict.keys():
             assert float(test_dict[key]) == float(simul.model.getParameters()[key])