@@ -930,44 +930,13 @@ def getSolutions(self, varList=None, resultfile=None): # 12
930930
931931 @staticmethod
932932 def _prepare_input_data (
933- raw_input : str | list [ str ] | dict [str , Any ],
933+ raw_input : dict [str , Any ],
934934 ) -> dict [str , str ]:
935935 """
936936 Convert raw input to a structured dictionary {'key1': 'value1', 'key2': 'value2'}.
937937 """
938938
939- def prepare_str (str_in : str ) -> dict [str , str ]:
940- str_in = str_in .replace (" " , "" )
941- key_val_list : list [str ] = str_in .split ("=" )
942- if len (key_val_list ) != 2 :
943- raise ModelicaSystemError (f"Invalid 'key=value' pair: { str_in } " )
944-
945- input_data_from_str : dict [str , str ] = {key_val_list [0 ]: key_val_list [1 ]}
946-
947- return input_data_from_str
948-
949939 input_data : dict [str , str ] = {}
950-
951- if isinstance (raw_input , str ):
952- warnings .warn (message = "The definition of values to set should use a dictionary, "
953- "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
954- "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
955- category = DeprecationWarning ,
956- stacklevel = 3 )
957- return prepare_str (raw_input )
958-
959- if isinstance (raw_input , list ):
960- warnings .warn (message = "The definition of values to set should use a dictionary, "
961- "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
962- "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
963- category = DeprecationWarning ,
964- stacklevel = 3 )
965-
966- for item in raw_input :
967- input_data |= prepare_str (item )
968-
969- return input_data
970-
971940 if isinstance (raw_input , dict ):
972941 for key , val in raw_input .items ():
973942 # convert all values to strings to align it on one type: dict[str, str]
@@ -1042,13 +1011,11 @@ def isParameterChangeable(
10421011 return False
10431012 return True
10441013
1045- def setContinuous (self , cvals : str | list [ str ] | dict [str , Any ]) -> bool :
1014+ def setContinuous (self , cvals : dict [str , Any ]) -> bool :
10461015 """
10471016 This method is used to set continuous values. It can be called:
10481017 with a sequence of continuous name and assigning corresponding values as arguments as show in the example below:
10491018 usage
1050- >>> setContinuous("Name=value") # depreciated
1051- >>> setContinuous(["Name1=value1","Name2=value2"]) # depreciated
10521019 >>> setContinuous(cvals={"Name1": "value1", "Name2": "value2"})
10531020 """
10541021 inputdata = self ._prepare_input_data (raw_input = cvals )
@@ -1059,13 +1026,11 @@ def setContinuous(self, cvals: str | list[str] | dict[str, Any]) -> bool:
10591026 datatype = "continuous" ,
10601027 overwritedata = self .overridevariables )
10611028
1062- def setParameters (self , pvals : str | list [ str ] | dict [str , Any ]) -> bool :
1029+ def setParameters (self , pvals : dict [str , Any ]) -> bool :
10631030 """
10641031 This method is used to set parameter values. It can be called:
10651032 with a sequence of parameter name and assigning corresponding value as arguments as show in the example below:
10661033 usage
1067- >>> setParameters("Name=value") # depreciated
1068- >>> setParameters(["Name1=value1","Name2=value2"]) # depreciated
10691034 >>> setParameters(pvals={"Name1": "value1", "Name2": "value2"})
10701035 """
10711036 inputdata = self ._prepare_input_data (raw_input = pvals )
@@ -1076,13 +1041,11 @@ def setParameters(self, pvals: str | list[str] | dict[str, Any]) -> bool:
10761041 datatype = "parameter" ,
10771042 overwritedata = self .overridevariables )
10781043
1079- def setSimulationOptions (self , simOptions : str | list [ str ] | dict [str , Any ]) -> bool :
1044+ def setSimulationOptions (self , simOptions : dict [str , Any ]) -> bool :
10801045 """
10811046 This method is used to set simulation options. It can be called:
10821047 with a sequence of simulation options name and assigning corresponding values as arguments as show in the example below:
10831048 usage
1084- >>> setSimulationOptions("Name=value") # depreciated
1085- >>> setSimulationOptions(["Name1=value1","Name2=value2"]) # depreciated
10861049 >>> setSimulationOptions(simOptions={"Name1": "value1", "Name2": "value2"})
10871050 """
10881051 inputdata = self ._prepare_input_data (raw_input = simOptions )
@@ -1093,13 +1056,11 @@ def setSimulationOptions(self, simOptions: str | list[str] | dict[str, Any]) ->
10931056 datatype = "simulation-option" ,
10941057 overwritedata = self .simoptionsoverride )
10951058
1096- def setLinearizationOptions (self , linearizationOptions : str | list [ str ] | dict [str , Any ]) -> bool :
1059+ def setLinearizationOptions (self , linearizationOptions : dict [str , Any ]) -> bool :
10971060 """
10981061 This method is used to set linearization options. It can be called:
10991062 with a sequence of linearization options name and assigning corresponding value as arguments as show in the example below
11001063 usage
1101- >>> setLinearizationOptions("Name=value") # depreciated
1102- >>> setLinearizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11031064 >>> setLinearizationOptions(linearizationOtions={"Name1": "value1", "Name2": "value2"})
11041065 """
11051066 inputdata = self ._prepare_input_data (raw_input = linearizationOptions )
@@ -1110,13 +1071,11 @@ def setLinearizationOptions(self, linearizationOptions: str | list[str] | dict[s
11101071 datatype = "Linearization-option" ,
11111072 overwritedata = None )
11121073
1113- def setOptimizationOptions (self , optimizationOptions : str | list [ str ] | dict [str , Any ]) -> bool :
1074+ def setOptimizationOptions (self , optimizationOptions : dict [str , Any ]) -> bool :
11141075 """
11151076 This method is used to set optimization options. It can be called:
11161077 with a sequence of optimization options name and assigning corresponding values as arguments as show in the example below:
11171078 usage
1118- >>> setOptimizationOptions("Name=value") # depreciated
1119- >>> setOptimizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11201079 >>> setOptimizationOptions(optimizationOptions={"Name1": "value1", "Name2": "value2"})
11211080 """
11221081 inputdata = self ._prepare_input_data (raw_input = optimizationOptions )
@@ -1127,15 +1086,13 @@ def setOptimizationOptions(self, optimizationOptions: str | list[str] | dict[str
11271086 datatype = "optimization-option" ,
11281087 overwritedata = None )
11291088
1130- def setInputs (self , name : str | list [ str ] | dict [str , Any ]) -> bool :
1089+ def setInputs (self , name : dict [str , Any ]) -> bool :
11311090 """
11321091 This method is used to set input values. It can be called with a sequence of input name and assigning
11331092 corresponding values as arguments as show in the example below. Compared to other set*() methods this is a
11341093 special case as value could be a list of tuples - these are converted to a string in _prepare_input_data()
11351094 and restored here via ast.literal_eval().
11361095
1137- >>> setInputs("Name=value") # depreciated
1138- >>> setInputs(["Name1=value1","Name2=value2"]) # depreciated
11391096 >>> setInputs(name={"Name1": "value1", "Name2": "value2"})
11401097 """
11411098 inputdata = self ._prepare_input_data (raw_input = name )
0 commit comments