min,max,argmin,argmax,nanmin,nanmax,nanargmin,nanargmax

mankoff · mankoff · commit 73c5325c4461 · 2014-03-24T14:19:03.000-04:00
diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -486,6 +486,14 @@ def max(self, axis=None, out=None):
             copy=False
         )
 
+    @with_doc(np.nanmax)
+    def nanmax(self, axis=None, out=None):
+        return Quantity(
+            np.nanmax(self.magnitude),
+            self.dimensionality,
+            copy=False
+        )
+
     @with_doc(np.ndarray.min)
     def min(self, axis=None, out=None):
         return Quantity(
@@ -494,10 +502,30 @@ def min(self, axis=None, out=None):
             copy=False
         )
 
+    @with_doc(np.nanmin)
+    def nanmin(self, axis=None, out=None):
+        return Quantity(
+            np.nanmin(self.magnitude),
+            self.dimensionality,
+            copy=False
+        )
+
     @with_doc(np.ndarray.argmin)
     def argmin(self,axis=None, out=None):
         return self.magnitude.argmin()
 
+    @with_doc(np.ndarray.argmax)
+    def argmax(self,axis=None, out=None):
+        return self.magnitude.argmax()
+
+    @with_doc(np.nanargmin)
+    def nanargmin(self,axis=None, out=None):
+        return np.nanargmin(self.magnitude)
+        
+    @with_doc(np.nanargmax)
+    def nanargmax(self,axis=None, out=None):
+        return np.nanargmax(self.magnitude)
+        
     @with_doc(np.ndarray.ptp)
     def ptp(self, axis=None, out=None):
         return Quantity(
diff --git a/quantities/tests/test_methods.py b/quantities/tests/test_methods.py
@@ -2,7 +2,7 @@
 
 from .. import units as pq
 from .common import TestCase
-
+import numpy as np
 
 class TestQuantityMethods(TestCase):
 
@@ -109,15 +109,31 @@ def test_nonzero(self):
     def test_max(self):
         self.assertQuantityEqual(self.q.max(), 4*pq.m)
 
+    def test_nanmax(self):
+        q = np.append(self.q, np.nan) * self.q.units
+        self.assertQuantityEqual(q.nanmax(), 4*pq.m)
+
     def test_argmax(self):
         self.assertEqual(self.q.argmax(), 3)
 
+    def test_nanargmax(self):
+        q = np.append(self.q, np.nan) * self.q.units
+        self.assertEqual(self.q.nanargmax(), 3)
+
     def test_min(self):
         self.assertEqual(self.q.min(), 1 * pq.m)
 
+    def test_nanmin(self):
+        q = np.append(self.q, np.nan) * self.q.units
+        self.assertQuantityEqual(q.nanmin(), 1*pq.m)
+
     def test_argmin(self):
         self.assertEqual(self.q.argmin(), 0)
 
+    def test_nanargmax(self):
+        q = np.append(self.q, np.nan) * self.q.units
+        self.assertEqual(self.q.nanargmin(), 0)
+        
     def test_ptp(self):
         self.assertQuantityEqual(self.q.ptp(), 3 * pq.m)
 
diff --git a/quantities/tests/test_uncertainty.py b/quantities/tests/test_uncertainty.py
@@ -88,3 +88,31 @@ def test_uncertainty_nansum(self):
         uq_nan = UncertainQuantity([1,2,np.nan], 'm', [1,1,np.nan])
         self.assertQuantityEqual(np.sum(uq), np.nansum(uq))
         self.assertQuantityEqual(np.sum(uq), np.nansum(uq_nan))
+
+    def test_uncertainty_minmax_nan_arg(self):
+        q = [1,2] * pq.m
+        # quantity
+        self.assertQuantityEqual(q.min(), 1*pq.m) # min
+        self.assertQuantityEqual(q.max(), 2*pq.m) # max
+        self.assertQuantityEqual(q.argmin(), 0) # argmin
+        self.assertQuantityEqual(q.argmax(), 1) # argmax
+        # uncertain quantity
+        uq = UncertainQuantity([1,2], pq.m, [1,1])
+        self.assertQuantityEqual(uq.min(), 1*pq.m) # min
+        self.assertQuantityEqual(uq.max(), 2*pq.m) # max
+        self.assertQuantityEqual(uq.argmin(), 0) # argmin
+        self.assertQuantityEqual(uq.argmax(), 1) # argmax
+        # now repeat the above with NaNs
+        nanq = [1,2, np.nan] * pq.m
+        nanuq = UncertainQuantity([1,2, np.nan], pq.m, [1,1,np.nan])
+        self.assertQuantityEqual(nanq.nanmin(), 1*pq.m) # min
+        self.assertQuantityEqual(nanq.nanmax(), 2*pq.m) # max
+        self.assertQuantityEqual(nanq.nanargmin(), 0) # argmin
+        self.assertQuantityEqual(nanq.nanargmax(), 1) # argmax
+        self.assertQuantityEqual(nanuq.nanmin(), 1*pq.m) # min
+        self.assertQuantityEqual(nanuq.nanmax(), 2*pq.m) # max
+        self.assertQuantityEqual(nanuq.nanargmin(), 0) # argmin
+        self.assertQuantityEqual(nanuq.nanargmax(), 1) # argmax
+        
+            
+    
diff --git a/quantities/uncertainquantity.py b/quantities/uncertainquantity.py
@@ -241,6 +241,42 @@ def nanmean(self, axis=None, dtype=None, out=None):
     def sqrt(self, out=None):
         return self**0.5
 
+    @with_doc(np.ndarray.max)
+    def max(self, axis=None, out=None):
+        idx = np.argmax(self.magnitude)
+        return self[idx]
+
+    @with_doc(np.nanmax)
+    def nanmax(self, axis=None, out=None):
+        idx = np.nanargmax(self.magnitude)
+        return self[idx]
+
+    @with_doc(np.ndarray.min)
+    def min(self, axis=None, out=None):
+        idx = np.argmin(self.magnitude)
+        return self[idx]
+
+    @with_doc(np.nanmin)
+    def nanmin(self, axis=None, out=None):
+        idx = np.nanargmin(self.magnitude)
+        return self[idx]
+
+    @with_doc(np.ndarray.argmin)
+    def argmin(self,axis=None, out=None):
+        return self.magnitude.argmin()
+
+    @with_doc(np.ndarray.argmax)
+    def argmax(self,axis=None, out=None):
+        return self.magnitude.argmax()
+
+    @with_doc(np.nanargmin)
+    def nanargmin(self,axis=None, out=None):
+        return np.nanargmin(self.magnitude)
+        
+    @with_doc(np.nanargmax)
+    def nanargmax(self,axis=None, out=None):
+        return np.nanargmax(self.magnitude)
+        
     def __getstate__(self):
         """
         Return the internal state of the quantity, for pickling
