Skip to content

Commit 0d9cc00

Browse files
committed
f - [ModelicaSystemABC] additional checks for setInputs()
1 parent a57c291 commit 0d9cc00

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

OMPython/modelica_system_abc.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,13 +1039,6 @@ def setInputs(
10391039
f"got {repr(val_evaluated)}")
10401040

10411041
for item in val_evaluated:
1042-
if item[0] < float(self._simulate_options["startTime"]):
1043-
raise ModelicaSystemError(f"Time value in {repr(item)} of {repr(val_evaluated)} is less "
1044-
"than the simulation start time")
1045-
if len(item) != 2:
1046-
raise ModelicaSystemError(f"Value {repr(item)} of {repr(val_evaluated)} "
1047-
"is in incorrect format!")
1048-
10491042
try:
10501043
val_evaluated_checked.append((float(item[0]), float(item[1])))
10511044
except (ValueError, TypeError) as exc:
@@ -1054,6 +1047,13 @@ def setInputs(
10541047
f"found [{repr(item[0])}, {repr(item[1])}] with types "
10551048
f"[{type(item[0])}, {type(item[1])}]!") from exc
10561049

1050+
if len(item) != 2:
1051+
raise ModelicaSystemError(f"Value {repr(item)} of {repr(val_evaluated)} "
1052+
"is in incorrect format!")
1053+
if item[0] < float(self._simulate_options["startTime"]):
1054+
raise ModelicaSystemError(f"Time value in {repr(item)} of {repr(val_evaluated)} is less "
1055+
"than the simulation start time")
1056+
10571057
if val_evaluated_checked != sorted(val_evaluated_checked, key=lambda x: x[0]):
10581058
raise ModelicaSystemError("Time value should be in increasing order; "
10591059
f"got {repr(val_evaluated_checked)}")

0 commit comments

Comments
 (0)