Skip to content

Commit 997e9b6

Browse files
committed
Rename _overridevariables to _override_variables
1 parent 5930d67 commit 997e9b6

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ def __init__(
358358
# same for _continuous
359359
self._continuous: dict[str, Any] = {}
360360
self._simulate_options: dict[str, str] = {}
361-
self._overridevariables: dict[str, str] = {}
361+
self._override_variables: dict[str, str] = {}
362362
self._simoptionsoverride: dict[str, str] = {}
363363
self._linearOptions = {'startTime': 0.0, 'stopTime': 1.0, 'stepSize': 0.002, 'tolerance': 1e-8}
364364
self._optimizeOptions = {'startTime': 0.0, 'stopTime': 1.0, 'numberOfIntervals': 500, 'stepSize': 0.002,
@@ -534,8 +534,8 @@ def _xmlparse(self):
534534
scalar["unit"] = att.get('unit')
535535

536536
if scalar["variability"] == "parameter":
537-
if scalar["name"] in self._overridevariables:
538-
self._params[scalar["name"]] = self._overridevariables[scalar["name"]]
537+
if scalar["name"] in self._override_variables:
538+
self._params[scalar["name"]] = self._override_variables[scalar["name"]]
539539
else:
540540
self._params[scalar["name"]] = scalar["start"]
541541
if scalar["variability"] == "continuous":
@@ -958,8 +958,8 @@ def simulate(self,
958958
om_cmd.args_set(args=simargs)
959959

960960
overrideFile = self._tempdir / f"{self._modelName}_override.txt"
961-
if self._overridevariables or self._simoptionsoverride:
962-
tmpdict = self._overridevariables.copy()
961+
if self._override_variables or self._simoptionsoverride:
962+
tmpdict = self._override_variables.copy()
963963
tmpdict.update(self._simoptionsoverride)
964964
# write to override file
965965
with open(file=overrideFile, mode="w", encoding="utf-8") as fh:
@@ -1128,7 +1128,7 @@ def setContinuous(self, cvals): # 13
11281128
>>> setContinuous("Name=value")
11291129
>>> setContinuous(["Name1=value1","Name2=value2"])
11301130
"""
1131-
return self._setMethodHelper(cvals, self._continuous, "continuous", self._overridevariables)
1131+
return self._setMethodHelper(cvals, self._continuous, "continuous", self._override_variables)
11321132

11331133
def setParameters(self, pvals): # 14
11341134
"""
@@ -1138,7 +1138,7 @@ def setParameters(self, pvals): # 14
11381138
>>> setParameters("Name=value")
11391139
>>> setParameters(["Name1=value1","Name2=value2"])
11401140
"""
1141-
return self._setMethodHelper(pvals, self._params, "parameter", self._overridevariables)
1141+
return self._setMethodHelper(pvals, self._params, "parameter", self._override_variables)
11421142

11431143
def isParameterChangeable(self, name, value):
11441144
q = self.getQuantities(name)
@@ -1407,7 +1407,7 @@ def load_module_from_path(module_name, file_path):
14071407
overrideLinearFile = self._tempdir / f'{self._modelName}_override_linear.txt'
14081408

14091409
with open(file=overrideLinearFile, mode="w", encoding="utf-8") as fh:
1410-
for key, value in self._overridevariables.items():
1410+
for key, value in self._override_variables.items():
14111411
fh.write(f"{key}={value}\n")
14121412
for key, value in self._linearOptions.items():
14131413
fh.write(f"{key}={value}\n")

0 commit comments

Comments
 (0)