@@ -976,8 +976,8 @@ def getSolutions(self, varList=None, resultfile=None): # 12
976976 raise ModelicaSystemError ("Unhandled input for getSolutions()" )
977977
978978 @staticmethod
979- def _prepare_inputdata (
980- rawinput : str | list [str ] | dict [str , str | int | float ],
979+ def _prepare_input_data (
980+ raw_input : str | list [str ] | dict [str , str | int | float ],
981981 ) -> dict [str , str ]:
982982 """
983983 Convert raw input to a structured dictionary {'key1': 'value1', 'key2': 'value2'}.
@@ -995,36 +995,36 @@ def prepare_str(str_in: str) -> dict[str, str]:
995995
996996 input_data : dict [str , str ] = {}
997997
998- if isinstance (rawinput , str ):
998+ if isinstance (raw_input , str ):
999999 warnings .warn (message = "The definition of values to set should use a dictionary, "
10001000 "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
10011001 "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
10021002 category = DeprecationWarning ,
10031003 stacklevel = 3 )
1004- return prepare_str (rawinput )
1004+ return prepare_str (raw_input )
10051005
1006- if isinstance (rawinput , list ):
1006+ if isinstance (raw_input , list ):
10071007 warnings .warn (message = "The definition of values to set should use a dictionary, "
10081008 "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
10091009 "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
10101010 category = DeprecationWarning ,
10111011 stacklevel = 3 )
10121012
1013- for item in rawinput :
1013+ for item in raw_input :
10141014 input_data |= prepare_str (item )
10151015
10161016 return input_data
10171017
1018- if isinstance (rawinput , dict ):
1019- for key , val in rawinput .items ():
1018+ if isinstance (raw_input , dict ):
1019+ for key , val in raw_input .items ():
10201020 str_val = str (val )
10211021 if ' ' in key or ' ' in str_val :
10221022 raise ModelicaSystemError (f"Spaces not allowed in key/value pairs: { repr (key )} = { repr (val )} !" )
10231023 input_data [key ] = str_val
10241024
10251025 return input_data
10261026
1027- raise ModelicaSystemError (f"Invalid type of input: { type (rawinput )} " )
1027+ raise ModelicaSystemError (f"Invalid type of input: { type (raw_input )} " )
10281028
10291029 def _set_method_helper (
10301030 self ,
@@ -1096,7 +1096,7 @@ def setContinuous(self, cvals: str | list[str] | dict[str, str | int | float]) -
10961096 >>> setContinuous(["Name1=value1","Name2=value2"]) # depreciated
10971097 >>> setContinuous(cvals={"Name1": "value1", "Name2": "value2"})
10981098 """
1099- inputdata = self ._prepare_inputdata ( rawinput = cvals )
1099+ inputdata = self ._prepare_input_data ( raw_input = cvals )
11001100
11011101 return self ._set_method_helper (
11021102 inputdata = inputdata ,
@@ -1113,7 +1113,7 @@ def setParameters(self, pvals: str | list[str] | dict[str, str | int | float]) -
11131113 >>> setParameters(["Name1=value1","Name2=value2"]) # depreciated
11141114 >>> setParameters(pvals={"Name1": "value1", "Name2": "value2"})
11151115 """
1116- inputdata = self ._prepare_inputdata ( rawinput = pvals )
1116+ inputdata = self ._prepare_input_data ( raw_input = pvals )
11171117
11181118 return self ._set_method_helper (
11191119 inputdata = inputdata ,
@@ -1130,7 +1130,7 @@ def setSimulationOptions(self, simOptions: str | list[str] | dict[str, str | int
11301130 >>> setSimulationOptions(["Name1=value1","Name2=value2"]) # depreciated
11311131 >>> setSimulationOptions(simOptions={"Name1": "value1", "Name2": "value2"})
11321132 """
1133- inputdata = self ._prepare_inputdata ( rawinput = simOptions )
1133+ inputdata = self ._prepare_input_data ( raw_input = simOptions )
11341134
11351135 return self ._set_method_helper (
11361136 inputdata = inputdata ,
@@ -1147,7 +1147,7 @@ def setLinearizationOptions(self, linearizationOptions: str | list[str] | dict[s
11471147 >>> setLinearizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11481148 >>> setLinearizationOptions(linearizationOtions={"Name1": "value1", "Name2": "value2"})
11491149 """
1150- inputdata = self ._prepare_inputdata ( rawinput = linearizationOptions )
1150+ inputdata = self ._prepare_input_data ( raw_input = linearizationOptions )
11511151
11521152 return self ._set_method_helper (
11531153 inputdata = inputdata ,
@@ -1164,7 +1164,7 @@ def setOptimizationOptions(self, optimizationOptions: str | list[str] | dict[str
11641164 >>> setOptimizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11651165 >>> setOptimizationOptions(optimizationOptions={"Name1": "value1", "Name2": "value2"})
11661166 """
1167- inputdata = self ._prepare_inputdata ( rawinput = optimizationOptions )
1167+ inputdata = self ._prepare_input_data ( raw_input = optimizationOptions )
11681168
11691169 return self ._set_method_helper (
11701170 inputdata = inputdata ,
@@ -1181,7 +1181,7 @@ def setInputs(self, name: str | list[str] | dict[str, str | int | float]) -> boo
11811181 >>> setInputs(["Name1=value1","Name2=value2"]) # depreciated
11821182 >>> setInputs(name={"Name1": "value1", "Name2": "value2"})
11831183 """
1184- # inputdata = self._prepare_inputdata(rawinput =name)
1184+ # inputdata = self._prepare_input_data(raw_input =name)
11851185
11861186 if isinstance (name , str ):
11871187 name1 : str = name
0 commit comments