Cache _Rprofs and _Tseries EXTRA computations

Author: amorison

stagpy/_step.py

@@ -394,6 +394,7 @@ class _Rprofs:
     def __init__(self, step):
         self.step = step
         self._data = UNDETERMINED
+        self._cached_extra = {}
         self._centers = UNDETERMINED
         self._walls = UNDETERMINED
         self._bounds = UNDETERMINED
@@ -417,11 +418,14 @@ def __getitem__(self, name):
                 meta = phyvars.RPROF[name]
             else:
                 meta = phyvars.Varr(name, None, '1')
+        elif name in self._cached_extra:
+            rprof, rad, meta = self._cached_extra[name]
         elif name in phyvars.RPROF_EXTRA:
             meta = phyvars.RPROF_EXTRA[name]
             rprof, rad = meta.description(step)
             meta = phyvars.Varr(misc.baredoc(meta.description),
                                 meta.kind, meta.dim)
+            self._cached_extra[name] = rprof, rad, meta
         else:
             raise error.UnknownRprofVarError(name)
         rprof, _ = step.sdat.scale(rprof, meta.dim)

stagpy/stagyydata.py

@@ -180,6 +180,7 @@ class _Tseries:
     def __init__(self, sdat):
         self.sdat = sdat
         self._data = UNDETERMINED
+        self._cached_extra = {}
 
     @property
     def _tseries(self):
@@ -208,11 +209,14 @@ def __getitem__(self, name):
                 meta = phyvars.TIME[name]
             else:
                 meta = phyvars.Vart(name, None, '1')
+        elif name in self._cached_extra:
+            series, time, meta = self._cached_extra[name]
         elif name in phyvars.TIME_EXTRA:
             meta = phyvars.TIME_EXTRA[name]
             series, time = meta.description(self.sdat)
             meta = phyvars.Vart(misc.baredoc(meta.description),
                                 meta.kind, meta.dim)
+            self._cached_extra[name] = series, time, meta
         else:
             raise error.UnknownTimeVarError(name)
         series, _ = self.sdat.scale(series, meta.dim)

stagpy/time_series.py

@@ -32,9 +32,6 @@ def plot_time_series(sdat, lovs):
         conf.time.tstart: the starting time.
         conf.time.tend: the ending time.
     """
-    sovs = misc.set_of_vars(lovs)
-    tseries = {tvar: sdat.tseries[tvar] for tvar in sovs}
-
     time_marks = _collect_marks(sdat)
     for vfig in lovs:
         fig, axes = plt.subplots(nrows=len(vfig), sharex=True,
@@ -43,7 +40,7 @@ def plot_time_series(sdat, lovs):
         fname = ['time']
         for iplt, vplt in enumerate(vfig):
             ylabel = None
-            series_on_plt = (tseries[tvar] for tvar in vplt)
+            series_on_plt = (sdat.tseries[tvar] for tvar in vplt)
             fname.extend(vplt)
             for ivar, (series, time, meta) in enumerate(series_on_plt):
                 axes[iplt].plot(time, series, conf.time.style,