@@ -985,8 +985,8 @@ def getSolutions(self, varList=None, resultfile=None): # 12
985985 raise ModelicaSystemError ("Unhandled input for getSolutions()" )
986986
987987 @staticmethod
988- def _prepare_inputdata (
989- rawinput : str | list [str ] | dict [str , str | int | float ],
988+ def _prepare_input_data (
989+ raw_input : str | list [str ] | dict [str , str | int | float ],
990990 ) -> dict [str , str ]:
991991 """
992992 Convert raw input to a structured dictionary {'key1': 'value1', 'key2': 'value2'}.
@@ -1004,36 +1004,36 @@ def prepare_str(str_in: str) -> dict[str, str]:
10041004
10051005 input_data : dict [str , str ] = {}
10061006
1007- if isinstance (rawinput , str ):
1007+ if isinstance (raw_input , str ):
10081008 warnings .warn (message = "The definition of values to set should use a dictionary, "
10091009 "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
10101010 "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
10111011 category = DeprecationWarning ,
10121012 stacklevel = 3 )
1013- return prepare_str (rawinput )
1013+ return prepare_str (raw_input )
10141014
1015- if isinstance (rawinput , list ):
1015+ if isinstance (raw_input , list ):
10161016 warnings .warn (message = "The definition of values to set should use a dictionary, "
10171017 "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
10181018 "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
10191019 category = DeprecationWarning ,
10201020 stacklevel = 3 )
10211021
1022- for item in rawinput :
1022+ for item in raw_input :
10231023 input_data |= prepare_str (item )
10241024
10251025 return input_data
10261026
1027- if isinstance (rawinput , dict ):
1028- for key , val in rawinput .items ():
1027+ if isinstance (raw_input , dict ):
1028+ for key , val in raw_input .items ():
10291029 str_val = str (val )
10301030 if ' ' in key or ' ' in str_val :
10311031 raise ModelicaSystemError (f"Spaces not allowed in key/value pairs: { repr (key )} = { repr (val )} !" )
10321032 input_data [key ] = str_val
10331033
10341034 return input_data
10351035
1036- raise ModelicaSystemError (f"Invalid type of input: { type (rawinput )} " )
1036+ raise ModelicaSystemError (f"Invalid type of input: { type (raw_input )} " )
10371037
10381038 def _set_method_helper (
10391039 self ,
@@ -1105,7 +1105,7 @@ def setContinuous(self, cvals: str | list[str] | dict[str, str | int | float]) -
11051105 >>> setContinuous(["Name1=value1","Name2=value2"]) # depreciated
11061106 >>> setContinuous(cvals={"Name1": "value1", "Name2": "value2"})
11071107 """
1108- inputdata = self ._prepare_inputdata ( rawinput = cvals )
1108+ inputdata = self ._prepare_input_data ( raw_input = cvals )
11091109
11101110 return self ._set_method_helper (
11111111 inputdata = inputdata ,
@@ -1122,7 +1122,7 @@ def setParameters(self, pvals: str | list[str] | dict[str, str | int | float]) -
11221122 >>> setParameters(["Name1=value1","Name2=value2"]) # depreciated
11231123 >>> setParameters(pvals={"Name1": "value1", "Name2": "value2"})
11241124 """
1125- inputdata = self ._prepare_inputdata ( rawinput = pvals )
1125+ inputdata = self ._prepare_input_data ( raw_input = pvals )
11261126
11271127 return self ._set_method_helper (
11281128 inputdata = inputdata ,
@@ -1139,7 +1139,7 @@ def setSimulationOptions(self, simOptions: str | list[str] | dict[str, str | int
11391139 >>> setSimulationOptions(["Name1=value1","Name2=value2"]) # depreciated
11401140 >>> setSimulationOptions(simOptions={"Name1": "value1", "Name2": "value2"})
11411141 """
1142- inputdata = self ._prepare_inputdata ( rawinput = simOptions )
1142+ inputdata = self ._prepare_input_data ( raw_input = simOptions )
11431143
11441144 return self ._set_method_helper (
11451145 inputdata = inputdata ,
@@ -1156,7 +1156,7 @@ def setLinearizationOptions(self, linearizationOptions: str | list[str] | dict[s
11561156 >>> setLinearizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11571157 >>> setLinearizationOptions(linearizationOtions={"Name1": "value1", "Name2": "value2"})
11581158 """
1159- inputdata = self ._prepare_inputdata ( rawinput = linearizationOptions )
1159+ inputdata = self ._prepare_input_data ( raw_input = linearizationOptions )
11601160
11611161 return self ._set_method_helper (
11621162 inputdata = inputdata ,
@@ -1173,7 +1173,7 @@ def setOptimizationOptions(self, optimizationOptions: str | list[str] | dict[str
11731173 >>> setOptimizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11741174 >>> setOptimizationOptions(optimizationOptions={"Name1": "value1", "Name2": "value2"})
11751175 """
1176- inputdata = self ._prepare_inputdata ( rawinput = optimizationOptions )
1176+ inputdata = self ._prepare_input_data ( raw_input = optimizationOptions )
11771177
11781178 return self ._set_method_helper (
11791179 inputdata = inputdata ,
@@ -1190,7 +1190,7 @@ def setInputs(self, name: str | list[str] | dict[str, str | int | float]) -> boo
11901190 >>> setInputs(["Name1=value1","Name2=value2"]) # depreciated
11911191 >>> setInputs(name={"Name1": "value1", "Name2": "value2"})
11921192 """
1193- # inputdata = self._prepare_inputdata(rawinput =name)
1193+ # inputdata = self._prepare_input_data(raw_input =name)
11941194
11951195 if isinstance (name , str ):
11961196 name1 : str = name
0 commit comments