Skip to content

Commit 62a3bd8

Browse files
committed
[OMCSession] rename classes
1 parent d784e69 commit 62a3bd8

4 files changed

Lines changed: 77 additions & 71 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
import numpy as np
5050

5151
from OMPython.OMCSession import (
52-
OMCSessionException,
53-
OMCSessionRunData,
52+
OMCProcessException,
53+
OMCProcessRunData,
5454
OMCProcess,
5555
OMCProcessLocal,
5656
OMCPath,
@@ -263,7 +263,7 @@ def get_cmd_args(self) -> list[str]:
263263

264264
return cmdl
265265

266-
def definition(self) -> OMCSessionRunData:
266+
def definition(self) -> OMCProcessRunData:
267267
"""
268268
Define all needed data to run the model executable. The data is stored in an OMCSessionRunData object.
269269
"""
@@ -272,7 +272,7 @@ def definition(self) -> OMCSessionRunData:
272272
if not isinstance(result_file, str):
273273
result_file = (self._runpath / f"{self._model_name}.mat").as_posix()
274274

275-
omc_run_data = OMCSessionRunData(
275+
omc_run_data = OMCProcessRunData(
276276
cmd_path=self._runpath.as_posix(),
277277
cmd_model_name=self._model_name,
278278
cmd_args=self.get_cmd_args(),
@@ -548,7 +548,7 @@ def buildModel(self, variableFilter: Optional[str] = None):
548548
def sendExpression(self, expr: str, parsed: bool = True) -> Any:
549549
try:
550550
retval = self._omc_process.sendExpression(expr, parsed)
551-
except OMCSessionException as ex:
551+
except OMCProcessException as ex:
552552
raise ModelicaSystemError(f"Error executing {repr(expr)}: {ex}") from ex
553553

554554
logger.debug(f"Result of executing {repr(expr)}: {textwrap.shorten(repr(retval), width=100)}")
@@ -1880,7 +1880,7 @@ def __init__(
18801880
self._parameters = {}
18811881

18821882
self._doe_def: Optional[dict[str, dict[str, Any]]] = None
1883-
self._doe_cmd: Optional[dict[str, OMCSessionRunData]] = None
1883+
self._doe_cmd: Optional[dict[str, OMCProcessRunData]] = None
18841884

18851885
def get_omc_process(self) -> OMCProcess:
18861886
"""
@@ -2000,7 +2000,7 @@ def get_doe_definition(self) -> Optional[dict[str, dict[str, Any]]]:
20002000
"""
20012001
return self._doe_def
20022002

2003-
def get_doe_command(self) -> Optional[dict[str, OMCSessionRunData]]:
2003+
def get_doe_command(self) -> Optional[dict[str, OMCProcessRunData]]:
20042004
"""
20052005
Get the definitions of simulations commands to run for this DoE.
20062006
"""

0 commit comments

Comments
 (0)