Test

OMPython/OMParser.py

@@ -892,3 +892,15 @@ def check_for_values(string):
             check_for_values(next_set)
 
     return result
+
+
+# TODO: hack to be able to use one entry point wich also resets the (global) variable results
+#       this should be checked such that the content of this file can be used as class with correct handling of
+#       variable usage
+def om_parser_basic(string: str):
+    result_return = check_for_values(string=string)
+
+    global result
+    result = {}
+
+    return result_return

OMPython/__init__.py

@@ -36,15 +36,17 @@
  CONDITIONS OF OSMC-PL.
 """
 
-from OMPython.OMCSession import OMCSessionBase, OMCSessionZMQ
-from OMPython.ModelicaSystem import ModelicaSystem, ModelicaSystemError, LinearizationResult
+from OMPython.OMCSession import OMCSessionCmd, OMCSessionZMQ, OMCSessionException
+from OMPython.ModelicaSystem import ModelicaSystem, ModelicaSystemCmd, ModelicaSystemError, LinearizationResult
 
 # global names imported if import 'from OMPython import *' is used
 __all__ = [
     'ModelicaSystem',
+    'ModelicaSystemCmd',
     'ModelicaSystemError',
     'LinearizationResult',
 
+    'OMCSessionException',
     'OMCSessionZMQ',
-    'OMCSessionBase',
+    'OMCSessionCmd',
 ]

tests/test_FMIExport.py

@@ -14,15 +14,16 @@ def __del__(self):
 
     def testCauerLowPassAnalog(self):
         print("testing Cauer")
-        mod = OMPython.ModelicaSystem(modelName="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog", lmodel="Modelica")
+        mod = OMPython.ModelicaSystem(modelName="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
+                                      lmodel=["Modelica"])
         self.tmp = mod.getWorkDirectory()
 
         fmu = mod.convertMo2Fmu(fileNamePrefix="CauerLowPassAnalog")
         self.assertEqual(True, os.path.exists(fmu))
 
     def testDrumBoiler(self):
         print("testing DrumBoiler")
-        mod = OMPython.ModelicaSystem(modelName="Modelica.Fluid.Examples.DrumBoiler.DrumBoiler", lmodel="Modelica")
+        mod = OMPython.ModelicaSystem(modelName="Modelica.Fluid.Examples.DrumBoiler.DrumBoiler", lmodel=["Modelica"])
         self.tmp = mod.getWorkDirectory()
 
         fmu = mod.convertMo2Fmu(fileNamePrefix="DrumBoiler")

tests/test_ModelicaSystem.py

@@ -35,7 +35,7 @@ def worker():
     def test_setParameters(self):
         omc = OMPython.OMCSessionZMQ()
         model_path = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels/"
-        mod = OMPython.ModelicaSystem(model_path + "BouncingBall.mo", "BouncingBall", raiseerrors=True)
+        mod = OMPython.ModelicaSystem(model_path + "BouncingBall.mo", "BouncingBall")
 
         # method 1
         mod.setParameters("e=1.234")
@@ -59,7 +59,7 @@ def test_setParameters(self):
     def test_setSimulationOptions(self):
         omc = OMPython.OMCSessionZMQ()
         model_path = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels/"
-        mod = OMPython.ModelicaSystem(model_path + "BouncingBall.mo", "BouncingBall", raiseerrors=True)
+        mod = OMPython.ModelicaSystem(model_path + "BouncingBall.mo", "BouncingBall")
 
         # method 1
         mod.setSimulationOptions("stopTime=1.234")
@@ -89,7 +89,7 @@ def test_relative_path(self):
             model_relative = str(model_file)
             assert "/" not in model_relative
 
-            mod = OMPython.ModelicaSystem(model_relative, "M", raiseerrors=True)
+            mod = OMPython.ModelicaSystem(model_relative, "M")
             assert float(mod.getParameters("a")[0]) == -1
         finally:
             # clean up the temporary file
@@ -99,17 +99,16 @@ def test_customBuildDirectory(self):
         filePath = (self.tmp / "M.mo").as_posix()
         tmpdir = self.tmp / "tmpdir1"
         tmpdir.mkdir()
-        m = OMPython.ModelicaSystem(filePath, "M", raiseerrors=True,
-                                    customBuildDirectory=tmpdir)
-        assert pathlib.Path(m.getWorkDirectory()).resolve() == tmpdir.resolve()
+        m = OMPython.ModelicaSystem(filePath, "M", customBuildDirectory=tmpdir)
+        assert m.getWorkDirectory().resolve() == tmpdir.resolve()
         result_file = tmpdir / "a.mat"
         assert not result_file.exists()
         m.simulate(resultfile="a.mat")
         assert result_file.is_file()
 
     def test_getSolutions(self):
         filePath = (self.tmp / "M.mo").as_posix()
-        mod = OMPython.ModelicaSystem(filePath, "M", raiseerrors=True)
+        mod = OMPython.ModelicaSystem(filePath, "M")
         x0 = 1
         a = -1
         tau = -1 / a
@@ -145,7 +144,7 @@ def test_getters(self):
   y = der(x);
 end M_getters;
 """)
-        mod = OMPython.ModelicaSystem(model_file.as_posix(), "M_getters", raiseerrors=True)
+        mod = OMPython.ModelicaSystem(model_file.as_posix(), "M_getters")
 
         q = mod.getQuantities()
         assert isinstance(q, list)
@@ -323,7 +322,7 @@ def test_simulate_inputs(self):
   y = x;
 end M_input;
 """)
-        mod = OMPython.ModelicaSystem(model_file.as_posix(), "M_input", raiseerrors=True)
+        mod = OMPython.ModelicaSystem(model_file.as_posix(), "M_input")
 
         mod.setSimulationOptions("stopTime=1.0")
 

tests/test_ModelicaSystemCmd.py

@@ -0,0 +1,42 @@
+import OMPython
+import pathlib
+import shutil
+import tempfile
+import unittest
+
+
+import logging
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+
+class ModelicaSystemCmdTester(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        super(ModelicaSystemCmdTester, self).__init__(*args, **kwargs)
+        self.tmp = pathlib.Path(tempfile.mkdtemp(prefix='tmpOMPython.tests'))
+        self.model = self.tmp / "M.mo"
+        with open(self.model, "w") as fout:
+            fout.write("""model M
+  Real x(start = 1, fixed = true);
+  parameter Real a = -1;
+equation
+  der(x) = x*a;
+end M;
+                   """)
+        self.mod = OMPython.ModelicaSystem(self.model.as_posix(), "M")
+
+    def __del__(self):
+        shutil.rmtree(self.tmp, ignore_errors=True)
+
+    def test_simflags(self):
+        mscmd = OMPython.ModelicaSystemCmd(runpath=self.mod.tempdir, modelname=self.mod.modelName)
+        mscmd.args_set(args={"noEventEmit": None, "noRestart": None, "override": {'b': 2}})
+        mscmd.args_set(args=mscmd.parse_simflags(simflags="-noEventEmit -noRestart -override=a=1,x=3"))
+
+        logger.info(mscmd.get_cmd())
+
+        assert mscmd.get_cmd() == [mscmd.get_exe().as_posix(), '-noEventEmit', '-noRestart', '-override=b=2,a=1,x=3']
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_OMSessionCmd.py

@@ -0,0 +1,22 @@
+import OMPython
+import unittest
+
+
+class OMCSessionCmdTester(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        super(OMCSessionCmdTester, self).__init__(*args, **kwargs)
+
+    def test_isPackage(self):
+        omczmq = OMPython.OMCSessionZMQ()
+        omccmd = OMPython.OMCSessionCmd(session=omczmq)
+        assert not omccmd.isPackage('Modelica')
+
+    def test_isPackage2(self):
+        mod = OMPython.ModelicaSystem(modelName="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
+                                      lmodel=["Modelica"])
+        omccmd = OMPython.OMCSessionCmd(session=mod.getconn)
+        assert omccmd.isPackage('Modelica')
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_linearization.py

@@ -61,7 +61,7 @@ def test_getters(self):
     y2 = phi + u1;
 end Pendulum;
 """)
-        mod = OMPython.ModelicaSystem(model_file.as_posix(), "Pendulum", ["Modelica"], raiseerrors=True)
+        mod = OMPython.ModelicaSystem(model_file.as_posix(), "Pendulum", ["Modelica"])
 
         d = mod.getLinearizationOptions()
         assert isinstance(d, dict)

tests/test_optimization.py

@@ -45,8 +45,7 @@ def test_example(self):
 end BangBang2021;
 """)
 
-        mod = OMPython.ModelicaSystem(model_file.as_posix(), "BangBang2021",
-                                      raiseerrors=True)
+        mod = OMPython.ModelicaSystem(model_file.as_posix(), "BangBang2021")
 
         mod.setOptimizationOptions(["numberOfIntervals=16", "stopTime=1",
                                     "stepSize=0.001", "tolerance=1e-8"])