Skip to content

use readSimulationResultVars for getSolutions #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arun3688 merged 1 commit into from
Aug 16, 2023
Merged

use readSimulationResultVars for getSolutions #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions OMPython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,13 +1316,12 @@ def getSolutions(self, varList=None, resultfile=None): # 12
return
#exit()
else:
resultVars = self.getconn.sendExpression("readSimulationResultVars(\"" + resFile + "\")")
self.getconn.sendExpression("closeSimulationResultFile()")
if (varList == None):
# validSolution = ['time'] + self.__getInputNames() + self.__getContinuousNames() + self.__getParameterNames()
validSolution = self.getconn.sendExpression("readSimulationResultVars(\"" + resFile + "\")")
self.getconn.sendExpression("closeSimulationResultFile()")
return validSolution
return resultVars
elif (isinstance(varList,str)):
if (varList not in [l["name"] for l in self.quantitiesList] and varList!="time"):
if (varList not in resultVars and varList!="time"):
print('!!! ', varList, ' does not exist\n')
return
exp = "readSimulationResult(\"" + resFile + '",{' + varList + "})"
Expand All @@ -1336,7 +1335,7 @@ def getSolutions(self, varList=None, resultfile=None): # 12
for v in varList:
if v == "time":
continue
if v not in [l["name"] for l in self.quantitiesList]:
if v not in resultVars:
print('!!! ', v, ' does not exist\n')
return
variables = ",".join(varList)
Expand Down