@@ -946,44 +946,13 @@ def getSolutions(self, varList=None, resultfile=None): # 12
946946
947947 @staticmethod
948948 def _prepare_input_data (
949- raw_input : str | list [ str ] | dict [str , Any ],
949+ raw_input : dict [str , Any ],
950950 ) -> dict [str , str ]:
951951 """
952952 Convert raw input to a structured dictionary {'key1': 'value1', 'key2': 'value2'}.
953953 """
954954
955- def prepare_str (str_in : str ) -> dict [str , str ]:
956- str_in = str_in .replace (" " , "" )
957- key_val_list : list [str ] = str_in .split ("=" )
958- if len (key_val_list ) != 2 :
959- raise ModelicaSystemError (f"Invalid 'key=value' pair: { str_in } " )
960-
961- input_data_from_str : dict [str , str ] = {key_val_list [0 ]: key_val_list [1 ]}
962-
963- return input_data_from_str
964-
965955 input_data : dict [str , str ] = {}
966-
967- if isinstance (raw_input , str ):
968- warnings .warn (message = "The definition of values to set should use a dictionary, "
969- "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
970- "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
971- category = DeprecationWarning ,
972- stacklevel = 3 )
973- return prepare_str (raw_input )
974-
975- if isinstance (raw_input , list ):
976- warnings .warn (message = "The definition of values to set should use a dictionary, "
977- "i.e. {'key1': 'val1', 'key2': 'val2', ...}. Please convert all cases which "
978- "use a string ('key=val') or list ['key1=val1', 'key2=val2', ...]" ,
979- category = DeprecationWarning ,
980- stacklevel = 3 )
981-
982- for item in raw_input :
983- input_data |= prepare_str (item )
984-
985- return input_data
986-
987956 if isinstance (raw_input , dict ):
988957 for key , val in raw_input .items ():
989958 # convert all values to strings to align it on one type: dict[str, str]
@@ -1058,13 +1027,11 @@ def isParameterChangeable(
10581027 return False
10591028 return True
10601029
1061- def setContinuous (self , cvals : str | list [ str ] | dict [str , Any ]) -> bool :
1030+ def setContinuous (self , cvals : dict [str , Any ]) -> bool :
10621031 """
10631032 This method is used to set continuous values. It can be called:
10641033 with a sequence of continuous name and assigning corresponding values as arguments as show in the example below:
10651034 usage
1066- >>> setContinuous("Name=value") # depreciated
1067- >>> setContinuous(["Name1=value1","Name2=value2"]) # depreciated
10681035 >>> setContinuous(cvals={"Name1": "value1", "Name2": "value2"})
10691036 """
10701037 inputdata = self ._prepare_input_data (raw_input = cvals )
@@ -1075,13 +1042,11 @@ def setContinuous(self, cvals: str | list[str] | dict[str, Any]) -> bool:
10751042 datatype = "continuous" ,
10761043 overwritedata = self .overridevariables )
10771044
1078- def setParameters (self , pvals : str | list [ str ] | dict [str , Any ]) -> bool :
1045+ def setParameters (self , pvals : dict [str , Any ]) -> bool :
10791046 """
10801047 This method is used to set parameter values. It can be called:
10811048 with a sequence of parameter name and assigning corresponding value as arguments as show in the example below:
10821049 usage
1083- >>> setParameters("Name=value") # depreciated
1084- >>> setParameters(["Name1=value1","Name2=value2"]) # depreciated
10851050 >>> setParameters(pvals={"Name1": "value1", "Name2": "value2"})
10861051 """
10871052 inputdata = self ._prepare_input_data (raw_input = pvals )
@@ -1092,13 +1057,11 @@ def setParameters(self, pvals: str | list[str] | dict[str, Any]) -> bool:
10921057 datatype = "parameter" ,
10931058 overwritedata = self .overridevariables )
10941059
1095- def setSimulationOptions (self , simOptions : str | list [ str ] | dict [str , Any ]) -> bool :
1060+ def setSimulationOptions (self , simOptions : dict [str , Any ]) -> bool :
10961061 """
10971062 This method is used to set simulation options. It can be called:
10981063 with a sequence of simulation options name and assigning corresponding values as arguments as show in the example below:
10991064 usage
1100- >>> setSimulationOptions("Name=value") # depreciated
1101- >>> setSimulationOptions(["Name1=value1","Name2=value2"]) # depreciated
11021065 >>> setSimulationOptions(simOptions={"Name1": "value1", "Name2": "value2"})
11031066 """
11041067 inputdata = self ._prepare_input_data (raw_input = simOptions )
@@ -1109,13 +1072,11 @@ def setSimulationOptions(self, simOptions: str | list[str] | dict[str, Any]) ->
11091072 datatype = "simulation-option" ,
11101073 overwritedata = self .simoptionsoverride )
11111074
1112- def setLinearizationOptions (self , linearizationOptions : str | list [ str ] | dict [str , Any ]) -> bool :
1075+ def setLinearizationOptions (self , linearizationOptions : dict [str , Any ]) -> bool :
11131076 """
11141077 This method is used to set linearization options. It can be called:
11151078 with a sequence of linearization options name and assigning corresponding value as arguments as show in the example below
11161079 usage
1117- >>> setLinearizationOptions("Name=value") # depreciated
1118- >>> setLinearizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11191080 >>> setLinearizationOptions(linearizationOtions={"Name1": "value1", "Name2": "value2"})
11201081 """
11211082 inputdata = self ._prepare_input_data (raw_input = linearizationOptions )
@@ -1126,13 +1087,11 @@ def setLinearizationOptions(self, linearizationOptions: str | list[str] | dict[s
11261087 datatype = "Linearization-option" ,
11271088 overwritedata = None )
11281089
1129- def setOptimizationOptions (self , optimizationOptions : str | list [ str ] | dict [str , Any ]) -> bool :
1090+ def setOptimizationOptions (self , optimizationOptions : dict [str , Any ]) -> bool :
11301091 """
11311092 This method is used to set optimization options. It can be called:
11321093 with a sequence of optimization options name and assigning corresponding values as arguments as show in the example below:
11331094 usage
1134- >>> setOptimizationOptions("Name=value") # depreciated
1135- >>> setOptimizationOptions(["Name1=value1","Name2=value2"]) # depreciated
11361095 >>> setOptimizationOptions(optimizationOptions={"Name1": "value1", "Name2": "value2"})
11371096 """
11381097 inputdata = self ._prepare_input_data (raw_input = optimizationOptions )
@@ -1143,15 +1102,13 @@ def setOptimizationOptions(self, optimizationOptions: str | list[str] | dict[str
11431102 datatype = "optimization-option" ,
11441103 overwritedata = None )
11451104
1146- def setInputs (self , name : str | list [ str ] | dict [str , Any ]) -> bool :
1105+ def setInputs (self , name : dict [str , Any ]) -> bool :
11471106 """
11481107 This method is used to set input values. It can be called with a sequence of input name and assigning
11491108 corresponding values as arguments as show in the example below. Compared to other set*() methods this is a
11501109 special case as value could be a list of tuples - these are converted to a string in _prepare_input_data()
11511110 and restored here via ast.literal_eval().
11521111
1153- >>> setInputs("Name=value") # depreciated
1154- >>> setInputs(["Name1=value1","Name2=value2"]) # depreciated
11551112 >>> setInputs(name={"Name1": "value1", "Name2": "value2"})
11561113 """
11571114 inputdata = self ._prepare_input_data (raw_input = name )
0 commit comments