Extend the new python api (#983)

OpenModelica · Mar 9, 2021 · 5396e6b · 5396e6b
1 parent 3ff6a4b
commit 5396e6b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/src/OMSimulatorPython/Model.py b/src/OMSimulatorPython/Model.py
@@ -46,6 +46,29 @@ def terminate(self):
     if Types.Status(status) != Types.Status.OK:
       raise Exception('error {}'.format(Types.Status(status)))
 
+  def reset(self):
+    status = Scope._capi.reset(self.cref)
+    if Types.Status(status) != Types.Status.OK:
+      raise Exception('error {}'.format(Types.Status(status)))
+
+  def getBoolean(self, cref):
+    value, status = Scope._capi.getBoolean(self.cref + '.' + cref)
+    if Types.Status(status) != Types.Status.OK:
+      raise Exception('error {}'.format(Types.Status(status)))
+    return value
+
+  def getInteger(self, cref):
+    value, status = Scope._capi.getInteger(self.cref + '.' + cref)
+    if Types.Status(status) != Types.Status.OK:
+      raise Exception('error {}'.format(Types.Status(status)))
+    return value
+
+  def getReal(self, cref):
+    value, status = Scope._capi.getReal(self.cref + '.' + cref)
+    if Types.Status(status) != Types.Status.OK:
+      raise Exception('error {}'.format(Types.Status(status)))
+    return value
+
   @property
   def cref(self):
     return self._cref
@@ -99,3 +122,10 @@ def resultFile(self, file: str):
     status = Scope._capi.setResultFile(self.cref, file, bufferSize)
     if Types.Status(status) != Types.Status.OK:
       raise Exception('error {}'.format(Types.Status(status)))
+
+  @property
+  def modelState(self):
+    modelState, status = Scope._capi.getModelState(self.cref)
+    if Types.Status(status) != Types.Status.OK:
+      raise Exception('error {}'.format(Types.Status(status)))
+    return Types.ModelState(modelState)
diff --git a/src/OMSimulatorPython/Types.py b/src/OMSimulatorPython/Types.py
@@ -15,3 +15,12 @@ class System(Enum):
   TLM = 1 # TLM system
   WC = 2 # Weakly Coupled system
   SC = 3 # Strongly Coupled system
+
+class ModelState(Enum):
+  'oms_modelState_enu_t'
+  VIRGIN = 1
+  ENTERINSTANTIATION = 2
+  INSTANTIATED = 4
+  INITIALIZATION = 8
+  SIMULATION = 16
+  ERROR = 32
diff --git a/src/OMSimulatorPython/capi.py b/src/OMSimulatorPython/capi.py
@@ -66,6 +66,8 @@ def __init__(self):
     self.obj.oms_getFixedStepSize.restype = ctypes.c_int
     self.obj.oms_getInteger.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_int)]
     self.obj.oms_getInteger.restype = ctypes.c_int
+    self.obj.oms_getModelState.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_int)]
+    self.obj.oms_getModelState.restype = ctypes.c_int
     self.obj.oms_getReal.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_double)]
     self.obj.oms_getReal.restype = ctypes.c_int
     self.obj.oms_getResultFile.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_char_p), ctypes.POINTER(ctypes.c_int)]
@@ -218,6 +220,10 @@ def getInteger(self, cref):
     value = ctypes.c_int()
     status = self.obj.oms_getInteger(cref.encode(), ctypes.byref(value))
     return [value.value, status]
+  def getModelState(self, cref):
+    value = ctypes.c_int()
+    status = self.obj.oms_getModelState(cref.encode(), ctypes.byref(value))
+    return [value.value, status]
   def getReal(self, cref):
     value = ctypes.c_double()
     status = self.obj.oms_getReal(cref.encode(), ctypes.byref(value))