[ModelicaSystem] split __init__() - update unittest

Author: syntron

tests/test_FMIExport.py

@@ -4,8 +4,11 @@
 
 
 def test_CauerLowPassAnalog():
-    mod = OMPython.ModelicaSystem(modelName="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
-                                  lmodel=["Modelica"])
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        model="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
+        libraries=["Modelica"],
+    )
     tmp = mod.getWorkDirectory()
     try:
         fmu = mod.convertMo2Fmu(fileNamePrefix="CauerLowPassAnalog")
@@ -15,7 +18,11 @@ def test_CauerLowPassAnalog():
 
 
 def test_DrumBoiler():
-    mod = OMPython.ModelicaSystem(modelName="Modelica.Fluid.Examples.DrumBoiler.DrumBoiler", lmodel=["Modelica"])
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        model="Modelica.Fluid.Examples.DrumBoiler.DrumBoiler",
+        libraries=["Modelica"],
+    )
     tmp = mod.getWorkDirectory()
     try:
         fmu = mod.convertMo2Fmu(fileNamePrefix="DrumBoiler")

tests/test_ModelicaSystem.py

@@ -22,17 +22,25 @@ def model_firstorder(tmp_path):
 def test_ModelicaSystem_loop(model_firstorder):
     def worker():
         filePath = model_firstorder.as_posix()
-        m = OMPython.ModelicaSystem(filePath, "M")
-        m.simulate()
-        m.convertMo2Fmu(fmuType="me")
+        mod = OMPython.ModelicaSystem()
+        mod.model_definition(
+            file=filePath,
+            model="M",
+        )
+        mod.simulate()
+        mod.convertMo2Fmu(fmuType="me")
     for _ in range(10):
         worker()
 
 
 def test_setParameters():
     omc = OMPython.OMCSessionZMQ()
     model_path = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels/"
-    mod = OMPython.ModelicaSystem(model_path + "BouncingBall.mo", "BouncingBall")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_path + "BouncingBall.mo",
+        model="BouncingBall",
+    )
 
     # method 1
     mod.setParameters(pvals={"e": 1.234})
@@ -61,7 +69,11 @@ def test_setParameters():
 def test_setSimulationOptions():
     omc = OMPython.OMCSessionZMQ()
     model_path = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels/"
-    mod = OMPython.ModelicaSystem(fileName=model_path + "BouncingBall.mo", modelName="BouncingBall")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_path + "BouncingBall.mo",
+        model="BouncingBall",
+    )
 
     # method 1
     mod.setSimulationOptions(simOptions={"stopTime": 1.234})
@@ -94,7 +106,11 @@ def test_relative_path(model_firstorder):
         model_relative = str(model_file)
         assert "/" not in model_relative
 
-        mod = OMPython.ModelicaSystem(fileName=model_relative, modelName="M")
+        mod = OMPython.ModelicaSystem()
+        mod.model_definition(
+            file=model_relative,
+            model="M",
+        )
         assert float(mod.getParameters("a")[0]) == -1
     finally:
         model_file.unlink()  # clean up the temporary file
@@ -104,17 +120,25 @@ def test_customBuildDirectory(tmp_path, model_firstorder):
     filePath = model_firstorder.as_posix()
     tmpdir = tmp_path / "tmpdir1"
     tmpdir.mkdir()
-    m = OMPython.ModelicaSystem(filePath, "M", customBuildDirectory=tmpdir)
-    assert m.getWorkDirectory().resolve() == tmpdir.resolve()
+    mod = OMPython.ModelicaSystem(customBuildDirectory=tmpdir)
+    mod.model_definition(
+        file=filePath,
+        model="M",
+    )
+    assert mod.getWorkDirectory().resolve() == tmpdir.resolve()
     result_file = tmpdir / "a.mat"
     assert not result_file.exists()
-    m.simulate(resultfile="a.mat")
+    mod.simulate(resultfile="a.mat")
     assert result_file.is_file()
 
 
 def test_getSolutions(model_firstorder):
     filePath = model_firstorder.as_posix()
-    mod = OMPython.ModelicaSystem(filePath, "M")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=filePath,
+        model="M",
+    )
     x0 = 1
     a = -1
     tau = -1 / a
@@ -151,7 +175,11 @@ def test_getters(tmp_path):
 y = der(x);
 end M_getters;
 """)
-    mod = OMPython.ModelicaSystem(fileName=model_file.as_posix(), modelName="M_getters")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_file.as_posix(),
+        model="M_getters",
+    )
 
     q = mod.getQuantities()
     assert isinstance(q, list)
@@ -343,7 +371,11 @@ def test_simulate_inputs(tmp_path):
 y = x;
 end M_input;
 """)
-    mod = OMPython.ModelicaSystem(fileName=model_file.as_posix(), modelName="M_input")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_file.as_posix(),
+        model="M_input",
+    )
 
     mod.setSimulationOptions(simOptions={"stopTime": 1.0})
 

tests/test_ModelicaSystemCmd.py

@@ -17,7 +17,11 @@ def model_firstorder(tmp_path):
 
 @pytest.fixture
 def mscmd_firstorder(model_firstorder):
-    mod = OMPython.ModelicaSystem(fileName=model_firstorder.as_posix(), modelName="M")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_firstorder.as_posix(),
+        model="M",
+    )
     mscmd = OMPython.ModelicaSystemCmd(runpath=mod.getWorkDirectory(), modelname=mod._model_name)
     return mscmd
 

tests/test_OMSessionCmd.py

@@ -8,8 +8,11 @@ def test_isPackage():
 
 
 def test_isPackage2():
-    mod = OMPython.ModelicaSystem(modelName="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
-                                  lmodel=["Modelica"])
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        model="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
+        libraries=["Modelica"],
+    )
     omccmd = OMPython.OMCSessionCmd(session=mod._getconn)
     assert omccmd.isPackage('Modelica')
 

tests/test_linearization.py

@@ -24,7 +24,11 @@ def model_linearTest(tmp_path):
 
 
 def test_example(model_linearTest):
-    mod = OMPython.ModelicaSystem(model_linearTest, "linearTest")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_linearTest,
+        model="linearTest",
+    )
     [A, B, C, D] = mod.linearize()
     expected_matrixA = [[-3, 2, 0, 0], [-7, 0, -5, 1], [-1, 0, -1, 4], [0, 1, -1, 5]]
     assert A == expected_matrixA, f"Matrix does not match the expected value. Got: {A}, Expected: {expected_matrixA}"
@@ -55,7 +59,12 @@ def test_getters(tmp_path):
 y2 = phi + u1;
 end Pendulum;
 """)
-    mod = OMPython.ModelicaSystem(fileName=model_file.as_posix(), modelName="Pendulum", lmodel=["Modelica"])
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_file.as_posix(),
+        model="Pendulum",
+        libraries=["Modelica"],
+    )
 
     d = mod.getLinearizationOptions()
     assert isinstance(d, dict)

tests/test_optimization.py

@@ -33,7 +33,11 @@ def test_optimization_example(tmp_path):
 end BangBang2021;
 """)
 
-    mod = OMPython.ModelicaSystem(fileName=model_file.as_posix(), modelName="BangBang2021")
+    mod = OMPython.ModelicaSystem()
+    mod.model_definition(
+        file=model_file.as_posix(),
+        model="BangBang2021",
+    )
 
     mod.setOptimizationOptions(optimizationOptions={"numberOfIntervals": 16,
                                                     "stopTime": 1,