[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

modelitool/simulate.py

@@ -104,11 +104,11 @@ def simulate(
             self.set_param_dict(parameter_dict)
 
         if simulation_options is not None:
-            if x is not None and 'x' in simulation_options:
+            if x is not None and "x" in simulation_options:
                 warnings.warn(
                     "Boundary file 'x' specified both in simulation_options and as a direct parameter."
                     " The 'x' provided in simulate() will be used.",
-                    UserWarning
+                    UserWarning,
                 )
 
             self._set_simulation_options(simulation_options)
@@ -179,20 +179,20 @@ def get_parameters(self):
 
     def _set_simulation_options(self, simulation_options):
         standard_options = {
-            'startTime': simulation_options.get('startTime'),
-            'stopTime': simulation_options.get('stopTime'),
-            'stepSize': simulation_options.get('stepSize'),
-            'tolerance': simulation_options.get('tolerance'),
-            'solver': simulation_options.get('solver'),
-            'outputFormat': simulation_options.get('outputFormat')
+            "startTime": simulation_options.get("startTime"),
+            "stopTime": simulation_options.get("stopTime"),
+            "stepSize": simulation_options.get("stepSize"),
+            "tolerance": simulation_options.get("tolerance"),
+            "solver": simulation_options.get("solver"),
+            "outputFormat": simulation_options.get("outputFormat"),
         }
 
-        options = [f'{k}={v}' for k, v in standard_options.items() if v is not None]
+        options = [f"{k}={v}" for k, v in standard_options.items() if v is not None]
         self.model.setSimulationOptions(options)
         self.simulation_options = simulation_options
 
-        if 'x' in simulation_options:
-            self._set_x(simulation_options['x'])
+        if "x" in simulation_options:
+            self._set_x(simulation_options["x"])
 
     def _set_x(self, df: pd.DataFrame):
         """Sets the input data for the simulation and updates the corresponding file."""
@@ -254,4 +254,3 @@ def library_contents(library_path):
         for file in files:
             file_path = os.path.join(root, file)
             print(file_path)
-

tests/test_simulate.py

@@ -1,5 +1,7 @@
 from pathlib import Path
+
 import pytest
+
 import numpy as np
 import pandas as pd
 
@@ -114,12 +116,19 @@ def test_set_boundaries_df(self):
         )
 
         simulation_options_with_x = simulation_options.copy()
-        simulation_options_with_x['x'] = x_options
+        simulation_options_with_x["x"] = x_options
         res1 = simu.simulate(simulation_options=simulation_options_with_x)
         res1 = res1.loc[:, ["Boundaries.y[1]", "Boundaries.y[2]"]]
         np.testing.assert_allclose(x_options.to_numpy(), res1.to_numpy())
-        assert np.all([x_options.index[i] == res1.index[i] for i in range(len(x_options.index))])
-        assert np.all([x_options.columns[i] == res1.columns[i] for i in range(len(x_options.columns))])
+        assert np.all(
+            [x_options.index[i] == res1.index[i] for i in range(len(x_options.index))]
+        )
+        assert np.all(
+            [
+                x_options.columns[i] == res1.columns[i]
+                for i in range(len(x_options.columns))
+            ]
+        )
 
         simu = OMModel(
             model_path="TestLib.boundary_test",
@@ -129,18 +138,29 @@ def test_set_boundaries_df(self):
         res2 = simu.simulate(simulation_options=simulation_options, x=x_direct)
         res2 = res2.loc[:, ["Boundaries.y[1]", "Boundaries.y[2]"]]
         np.testing.assert_allclose(x_direct.to_numpy(), res2.to_numpy())
-        assert np.all([x_direct.index[i] == res2.index[i] for i in range(len(x_direct.index))])
-        assert np.all([x_direct.columns[i] == res2.columns[i] for i in range(len(x_direct.columns))])
+        assert np.all(
+            [x_direct.index[i] == res2.index[i] for i in range(len(x_direct.index))]
+        )
+        assert np.all(
+            [
+                x_direct.columns[i] == res2.columns[i]
+                for i in range(len(x_direct.columns))
+            ]
+        )
 
         simu = OMModel(
             model_path="TestLib.boundary_test",
             package_path=PACKAGE_DIR / "package.mo",
             lmodel=["Modelica"],
         )
-        with pytest.warns(UserWarning,
-                          match="Boundary file 'x' specified both in simulation_options and as a direct parameter"):
-            res3 = simu.simulate(simulation_options=simulation_options_with_x, x=x_direct)
+        with pytest.warns(
+            UserWarning,
+            match="Boundary file 'x' specified both in simulation_options and as a direct parameter",
+        ):
+            res3 = simu.simulate(
+                simulation_options=simulation_options_with_x, x=x_direct
+            )
             res3 = res3.loc[:, ["Boundaries.y[1]", "Boundaries.y[2]"]]
             np.testing.assert_allclose(x_direct.to_numpy(), res3.to_numpy())
             with pytest.raises(AssertionError):
-                np.testing.assert_allclose(x_options.to_numpy(), res3.to_numpy())
+                np.testing.assert_allclose(x_options.to_numpy(), res3.to_numpy())