Skip to content

Commit 60f865d

Browse files
authored
Added boolean to return statement for setMethodHelper (#225)
1 parent c6a204e commit 60f865d

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

OMPython/__init__.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ def setMethodHelper(self,args1,args2,args3,args4=None,verbose=None):
13751375
args3 - function name (eg; continuous, parameter, simulation, linearization,optimization)
13761376
args4 - dict() which stores the new override variables list,
13771377
"""
1378-
if(isinstance(args1,str)):
1378+
def apply_single(args1):
13791379
args1=self.strip_space(args1)
13801380
value=args1.split("=")
13811381
if value[0] in args2:
@@ -1387,24 +1387,24 @@ def setMethodHelper(self,args1,args2,args3,args4=None,verbose=None):
13871387
args2[value[0]]=value[1]
13881388
if(args4!=None):
13891389
args4[value[0]]=value[1]
1390+
1391+
return True
1392+
13901393
else:
1391-
print("\"" + value[0] + "\"" + " is not a" + args3 + " variable")
1392-
return
1394+
print("\"" + value[0] + "\"" + " is not a " + args3 + " variable")
1395+
return False
1396+
1397+
result = []
1398+
if (isinstance(args1, str)):
1399+
result = [apply_single(args1)]
1400+
13931401
elif(isinstance(args1,list)):
1402+
result = []
13941403
args1=self.strip_space(args1)
13951404
for var in args1:
1396-
value=var.split("=")
1397-
if value[0] in args2:
1398-
if (args3 == "parameter" and self.isParameterChangeable(value[0], value[1], verbose)):
1399-
args2[value[0]]=value[1]
1400-
if(args4!=None):
1401-
args4[value[0]]=value[1]
1402-
elif (args3 != "parameter"):
1403-
args2[value[0]]=value[1]
1404-
if(args4!=None):
1405-
args4[value[0]]=value[1]
1406-
else:
1407-
print("\"" + value[0] + "\"" + " is not a "+ args3 + " variable")
1405+
result.append(apply_single(var))
1406+
1407+
return all(result)
14081408

14091409
def setContinuous(self, cvals): # 13
14101410
"""

0 commit comments

Comments
 (0)