[Numpy-svn] r5300 - trunk/numpy/ma

numpy-svn@scip... numpy-svn@scip...
Thu Jun 19 19:18:37 CDT 2008


Author: pierregm
Date: 2008-06-19 19:18:32 -0500 (Thu, 19 Jun 2008)
New Revision: 5300

Modified:
   trunk/numpy/ma/core.py
   trunk/numpy/ma/mrecords.py
Log:
* put maximum/minimum_fill_value back in __all__

Modified: trunk/numpy/ma/core.py
===================================================================
--- trunk/numpy/ma/core.py	2008-06-19 12:09:38 UTC (rev 5299)
+++ trunk/numpy/ma/core.py	2008-06-20 00:18:32 UTC (rev 5300)
@@ -44,7 +44,8 @@
            'masked_less','masked_less_equal', 'masked_not_equal',
            'masked_object','masked_outside', 'masked_print_option',
            'masked_singleton','masked_values', 'masked_where', 'max', 'maximum',
-           'mean', 'min', 'minimum', 'multiply',
+           'maximum_fill_value', 'mean', 'min', 'minimum', 'minimum_fill_value', 
+           'multiply',
            'negative', 'nomask', 'nonzero', 'not_equal',
            'ones', 'outer', 'outerproduct',
            'power', 'product', 'ptp', 'put', 'putmask',
@@ -110,12 +111,12 @@
                   'V' : '???',
                   }
 max_filler = ntypes._minvals
-max_filler.update(dict([(k, -np.inf) for k in [np.float32, np.float64]]))
+max_filler.update([(k, -np.inf) for k in [np.float32, np.float64]])
 min_filler = ntypes._maxvals
-min_filler.update(dict([(k, +np.inf) for k in [np.float32, np.float64]]))
+min_filler.update([(k, +np.inf) for k in [np.float32, np.float64]])
 if 'float128' in ntypes.typeDict:
-    max_filler[np.float128] = -np.inf
-    min_filler[np.float128] = +np.inf
+    max_filler.update([(np.float128, -np.inf)])
+    min_filler.update([(np.float128, +np.inf)])
 
 
 def default_fill_value(obj):

Modified: trunk/numpy/ma/mrecords.py
===================================================================
--- trunk/numpy/ma/mrecords.py	2008-06-19 12:09:38 UTC (rev 5299)
+++ trunk/numpy/ma/mrecords.py	2008-06-20 00:18:32 UTC (rev 5300)
@@ -170,7 +170,7 @@
         _locdict = self.__dict__
         if _locdict['_baseclass'] == ndarray:
             _locdict['_baseclass'] = recarray
-        _locdict.update({'_mask':_mask, '_fieldmask':_mask})
+        _locdict.update(_mask=_mask, _fieldmask=_mask)
         return
 
     def _getdata(self):



More information about the Numpy-svn mailing list