Skip to content

Commit c0cadae

Browse files
committed
f - [ModelicaSystemABC] additional checks for setInputs()
1 parent b85b53c commit c0cadae

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

OMPython/modelica_system_abc.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,9 +1037,6 @@ def setInputs(
10371037
if not all(isinstance(item, tuple) for item in val_evaluated):
10381038
raise ModelicaSystemError("Value for setInput() must be in tuple format; "
10391039
f"got {repr(val_evaluated)}")
1040-
if val_evaluated != sorted(val_evaluated, key=lambda x: x[0]):
1041-
raise ModelicaSystemError("Time value should be in increasing order; "
1042-
f"got {repr(val_evaluated)}")
10431040

10441041
for item in val_evaluated:
10451042
if item[0] < float(self._simulate_options["startTime"]):
@@ -1057,6 +1054,10 @@ def setInputs(
10571054
f"found [{repr(item[0])}, {repr(item[1])}] with types "
10581055
f"[{type(item[0])}, {type(item[1])}]!") from exc
10591056

1057+
if val_evaluated_checked != sorted(val_evaluated_checked, key=lambda x: x[0]):
1058+
raise ModelicaSystemError("Time value should be in increasing order; "
1059+
f"got {repr(val_evaluated_checked)}")
1060+
10601061
self._inputs[key] = val_evaluated_checked
10611062
else:
10621063
raise ModelicaSystemError(f"Data cannot be evaluated for {repr(key)}: {repr(val)}")

0 commit comments

Comments
 (0)