From a028cdfb8224682688a1f92390d8546afe9b51f9 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Wed, 29 Apr 2020 08:32:43 -0600
Subject: [PATCH] Update min/max calculation
---
geomagio/residual/Calculation.py | 7 +------
geomagio/residual/Measurement.py | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/geomagio/residual/Calculation.py b/geomagio/residual/Calculation.py
index 8e2e2826d..0155df530 100644
--- a/geomagio/residual/Calculation.py
+++ b/geomagio/residual/Calculation.py
@@ -12,12 +12,7 @@ from .MeasurementType import (
INCLINATION_TYPES,
MARK_TYPES,
)
-from .Measurement import (
- AverageMeasurement,
- Measurement,
- average_measurement,
- measurement_index,
-)
+from .Measurement import AverageMeasurement, Measurement, average_measurement
from .Reading import Reading
diff --git a/geomagio/residual/Measurement.py b/geomagio/residual/Measurement.py
index 86fcd7403..27d98ed5c 100644
--- a/geomagio/residual/Measurement.py
+++ b/geomagio/residual/Measurement.py
@@ -92,9 +92,9 @@ def safe_average(l: List[Optional[float]]):
def safe_max(l: List[Optional[float]]):
values = l and [f for f in l if f] or None
- return l and numpy.nanmax(values) or None
+ return values and numpy.nanmax(values) or None
def safe_min(l: List[Optional[float]]):
values = l and [f for f in l if f] or None
- return l and numpy.nanmin(values) or None
+ return values and numpy.nanmin(values) or None
--
GitLab