From 4490685aa64016b457756da440e09591cbad42b8 Mon Sep 17 00:00:00 2001 From: Kevin Davies Date: Wed, 21 May 2014 15:22:59 -1000 Subject: [PATCH] Updated interface to ModelicaRes --- buildingspy/io/outputfile.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildingspy/io/outputfile.py b/buildingspy/io/outputfile.py index 85547b01..8262e484 100644 --- a/buildingspy/io/outputfile.py +++ b/buildingspy/io/outputfile.py @@ -86,8 +86,8 @@ def integral(self, varName): return self._get(varName, integral) # Aliases: - min = SimRes.get_min - max = SimRes.get_max - mean = SimRes.get_mean - values = SimRes.get_tuple + min = lambda name: self[name].min() + max = lambda name: self[name].max() + mean = lambda name: self[name].mean() + values = lambda name: self[name].array() # TODO: Consider eliminating these and using the SimRes methods directly. diff --git a/setup.py b/setup.py index 93db6c98..e53272a2 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ def read(fname): keywords = "modelica dymola openmodelica mat", url = "http://simulationresearch.lbl.gov/modelica/", install_requires = ['scipy', 'modelicares'], - requires = ['scipy', 'modelicares (>=0.10.0)'], + requires = ['scipy', 'modelicares (>=0.11.0)'], packages = ['buildingspy', 'buildingspy/development', 'buildingspy/examples',