[ModelicaSystem] rename model_definition() => definition()

Author: syntron

OMPython/ModelicaSystem.py

@@ -424,7 +424,7 @@ def __init__(
         self._file_name: Optional[os.PathLike]
         self._variable_filter: Optional[str] = None
 
-    def model_definition(
+    def definition(
             self,
             model: str,
             file: Optional[str | os.PathLike | pathlib.Path] = None,

tests/test_FMIExport.py

@@ -5,7 +5,7 @@
 
 def test_CauerLowPassAnalog():
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         model="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
         libraries=["Modelica"],
     )
@@ -19,7 +19,7 @@ def test_CauerLowPassAnalog():
 
 def test_DrumBoiler():
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         model="Modelica.Fluid.Examples.DrumBoiler.DrumBoiler",
         libraries=["Modelica"],
     )

tests/test_ModelicaSystem.py

@@ -23,7 +23,7 @@ def test_ModelicaSystem_loop(model_firstorder):
     def worker():
         filePath = model_firstorder.as_posix()
         mod = OMPython.ModelicaSystem()
-        mod.model_definition(
+        mod.definition(
             file=filePath,
             model="M",
         )
@@ -37,7 +37,7 @@ def test_setParameters():
     omc = OMPython.OMCSessionZMQ()
     model_path = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels/"
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_path + "BouncingBall.mo",
         model="BouncingBall",
     )
@@ -70,7 +70,7 @@ def test_setSimulationOptions():
     omc = OMPython.OMCSessionZMQ()
     model_path = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels/"
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_path + "BouncingBall.mo",
         model="BouncingBall",
     )
@@ -107,7 +107,7 @@ def test_relative_path(model_firstorder):
         assert "/" not in model_relative
 
         mod = OMPython.ModelicaSystem()
-        mod.model_definition(
+        mod.definition(
             file=model_relative,
             model="M",
         )
@@ -121,7 +121,7 @@ def test_customBuildDirectory(tmp_path, model_firstorder):
     tmpdir = tmp_path / "tmpdir1"
     tmpdir.mkdir()
     mod = OMPython.ModelicaSystem(customBuildDirectory=tmpdir)
-    mod.model_definition(
+    mod.definition(
         file=filePath,
         model="M",
     )
@@ -135,7 +135,7 @@ def test_customBuildDirectory(tmp_path, model_firstorder):
 def test_getSolutions(model_firstorder):
     filePath = model_firstorder.as_posix()
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=filePath,
         model="M",
     )
@@ -176,7 +176,7 @@ def test_getters(tmp_path):
 end M_getters;
 """)
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_file.as_posix(),
         model="M_getters",
     )
@@ -372,7 +372,7 @@ def test_simulate_inputs(tmp_path):
 end M_input;
 """)
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_file.as_posix(),
         model="M_input",
     )

tests/test_ModelicaSystemCmd.py

@@ -18,7 +18,7 @@ def model_firstorder(tmp_path):
 @pytest.fixture
 def mscmd_firstorder(model_firstorder):
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_firstorder.as_posix(),
         model="M",
     )

tests/test_OMSessionCmd.py

@@ -9,7 +9,7 @@ def test_isPackage():
 
 def test_isPackage2():
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         model="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
         libraries=["Modelica"],
     )

tests/test_linearization.py

@@ -25,7 +25,7 @@ def model_linearTest(tmp_path):
 
 def test_example(model_linearTest):
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_linearTest,
         model="linearTest",
     )
@@ -60,7 +60,7 @@ def test_getters(tmp_path):
 end Pendulum;
 """)
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_file.as_posix(),
         model="Pendulum",
         libraries=["Modelica"],

tests/test_optimization.py

@@ -34,7 +34,7 @@ def test_optimization_example(tmp_path):
 """)
 
     mod = OMPython.ModelicaSystem()
-    mod.model_definition(
+    mod.definition(
         file=model_file.as_posix(),
         model="BangBang2021",
     )