@@ -992,8 +992,8 @@ def getSolutions(self, varList=None, resultfile=None): # 12
992992 return np_res
993993
994994 @staticmethod
995- def _prepare_inputdata (
996- rawinput : str | list [str ] | dict [str , str | int | float ],
995+ def _prepare_input_data (
996+ raw_input : str | list [str ] | dict [str , str | int | float ],
997997 ) -> dict [str , str ]:
998998 """
999999 Convert raw input to a structured dictionary {'key1': 'value1', 'key2': 'value2'}.
@@ -1011,36 +1011,36 @@ def prepare_str(str_in: str) -> dict[str, str]:
10111011
10121012 input_data : dict [str , str ] = {}
10131013
1014- if isinstance (rawinput , str ):
1014+ if isinstance (raw_input , str ):
10151015 warnings .warn (message = "The definition of values to set should use a dictionary, "
10161016 "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
10171017 "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
10181018 category = DeprecationWarning ,
10191019 stacklevel = 3 )
1020- return prepare_str (rawinput )
1020+ return prepare_str (raw_input )
10211021
1022- if isinstance (rawinput , list ):
1022+ if isinstance (raw_input , list ):
10231023 warnings .warn (message = "The definition of values to set should use a dictionary, "
10241024 "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
10251025 "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
10261026 category = DeprecationWarning ,
10271027 stacklevel = 3 )
10281028
1029- for item in rawinput :
1029+ for item in raw_input :
10301030 input_data |= prepare_str (item )
10311031
10321032 return input_data
10331033
1034- if isinstance (rawinput , dict ):
1035- for key , val in rawinput .items ():
1034+ if isinstance (raw_input , dict ):
1035+ for key , val in raw_input .items ():
10361036 str_val = str (val )
10371037 if ' ' in key or ' ' in str_val :
10381038 raise ModelicaSystemError (f"Spaces not allowed in key/value pairs: { repr (key )} = { repr (val )} !" )
10391039 input_data [key ] = str_val
10401040
10411041 return input_data
10421042
1043- raise ModelicaSystemError (f"Invalid type of input: { type (rawinput )} " )
1043+ raise ModelicaSystemError (f"Invalid type of input: { type (raw_input )} " )
10441044
10451045 def _set_method_helper (
10461046 self ,
@@ -1112,7 +1112,7 @@ def setContinuous(self, cvals: str | list[str] | dict[str, str | int | float]) -
11121112 >>> setContinuous(["Name1=value1","Name2=value2"]) # depreciated
11131113 >>> setContinuous(cvals={"Name1": "value1", "Name2": "value2"})
11141114 """
1115- inputdata = self ._prepare_inputdata ( rawinput = cvals )
1115+ inputdata = self ._prepare_input_data ( raw_input = cvals )
11161116
11171117 return self ._set_method_helper (
11181118 inputdata = inputdata ,
@@ -1129,7 +1129,7 @@ def setParameters(self, pvals: str | list[str] | dict[str, str | int | float]) -
11291129 >>> setParameters(["Name1=value1","Name2=value2"]) # depreciated
11301130 >>> setParameters(pvals={"Name1": "value1", "Name2": "value2"})
11311131 """
1132- inputdata = self ._prepare_inputdata ( rawinput = pvals )
1132+ inputdata = self ._prepare_input_data ( raw_input = pvals )
11331133
11341134 return self ._set_method_helper (
11351135 inputdata = inputdata ,
@@ -1146,7 +1146,7 @@ def setSimulationOptions(self, simOptions: str | list[str] | dict[str, str | int
11461146 >>> setSimulationOptions(["Name1=value1","Name2=value2"]) # depreciated
11471147 >>> setSimulationOptions(simOptions={"Name1": "value1", "Name2": "value2"})
11481148 """
1149- inputdata = self ._prepare_inputdata ( rawinput = simOptions )
1149+ inputdata = self ._prepare_input_data ( raw_input = simOptions )
11501150
11511151 return self ._set_method_helper (
11521152 inputdata = inputdata ,
@@ -1163,7 +1163,7 @@ def setLinearizationOptions(self, linearizationOptions: str | list[str] | dict[s
11631163 >>> setLinearizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11641164 >>> setLinearizationOptions(linearizationOtions={"Name1": "value1", "Name2": "value2"})
11651165 """
1166- inputdata = self ._prepare_inputdata ( rawinput = linearizationOptions )
1166+ inputdata = self ._prepare_input_data ( raw_input = linearizationOptions )
11671167
11681168 return self ._set_method_helper (
11691169 inputdata = inputdata ,
@@ -1180,7 +1180,7 @@ def setOptimizationOptions(self, optimizationOptions: str | list[str] | dict[str
11801180 >>> setOptimizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11811181 >>> setOptimizationOptions(optimizationOptions={"Name1": "value1", "Name2": "value2"})
11821182 """
1183- inputdata = self ._prepare_inputdata ( rawinput = optimizationOptions )
1183+ inputdata = self ._prepare_input_data ( raw_input = optimizationOptions )
11841184
11851185 return self ._set_method_helper (
11861186 inputdata = inputdata ,
@@ -1197,7 +1197,7 @@ def setInputs(self, name: str | list[str] | dict[str, str | int | float]) -> boo
11971197 >>> setInputs(["Name1=value1","Name2=value2"]) # depreciated
11981198 >>> setInputs(name={"Name1": "value1", "Name2": "value2"})
11991199 """
1200- # inputdata = self._prepare_inputdata(rawinput =name)
1200+ # inputdata = self._prepare_input_data(raw_input =name)
12011201
12021202 if isinstance (name , str ):
12031203 name1 : str = name
0 commit comments