enh: minor optimization of min/max feature algorithm

ZELLMECHANIK-DRESDEN · Nov 15, 2023 · 9bdfbe0 · 9bdfbe0
1 parent 9368a64
commit 9bdfbe0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 2.14.1
  - fix: perform sanity check for contour spacing before plotting
+ - enh: minor optimization of min/max feature algorithm
  - setup: bump dclab to 0.55.5 (new scalar features)
 2.14.0
  - ref: don't set RTDCBase.identifier to slot identifier

diff --git a/shapeout2/pipeline/core.py b/shapeout2/pipeline/core.py
@@ -4,6 +4,8 @@
 import dclab
 import numpy as np
 
+from ..idiom import SLOPING_FEATURES
+
 from .dataslot import Dataslot
 from .filter import Filter
 from .filter_ray import FilterRay
@@ -453,10 +455,20 @@ def get_min_max(self, feat, plot_id=None, margin=0.0):
             if np.any(ds.filter.all):
                 if feat in ds:
                     fdata = ds[feat][ds.filter.all]
-                    invalid = np.logical_or(np.isnan(fdata), np.isinf(fdata))
-                    vdata = fdata[~invalid]
-                    vmin = np.min(vdata)
-                    vmax = np.max(vdata)
+                    invalid = np.isinf(fdata)
+                    if np.any(invalid):
+                        vdata = fdata[~invalid]
+                    else:
+                        vdata = fdata
+                    if feat in SLOPING_FEATURES:
+                        # We are a little faster here.
+                        vmin = min(np.nanmin(vdata[:1000]),
+                                   np.nanmin(vdata[-1000:]))
+                        vmax = max(np.nanmax(vdata[:1000]),
+                                   np.nanmax(vdata[-1000:]))
+                    else:
+                        vmin = np.nanmin(vdata)
+                        vmax = np.nanmax(vdata)
                     fmin = min(fmin, vmin)
                     fmax = max(fmax, vmax)
                 else: