[Scipy-svn] r2590 - trunk/Lib/sandbox/maskedarray

[scipy-svn at scipy.org]

Author: pierregm
Date: 2007-01-22 23:45:43 -0600 (Mon, 22 Jan 2007)
New Revision: 2590

Modified:
   trunk/Lib/sandbox/maskedarray/CHANGELOG
   trunk/Lib/sandbox/maskedarray/core.py
Log:
cf changelog

Modified: trunk/Lib/sandbox/maskedarray/CHANGELOG
===================================================================
--- trunk/Lib/sandbox/maskedarray/CHANGELOG	2007-01-23 01:08:11 UTC (rev 2589)
+++ trunk/Lib/sandbox/maskedarray/CHANGELOG	2007-01-23 05:45:43 UTC (rev 2590)
@@ -1,3 +1,4 @@
+#2007-01-22 : core    : fixed a call to numpy.float128 on 32b machines
 #2007-01-21 : core    : fixed max/min_fill_values
 #           :         : fixed sort (as method and function)
 #2007-01-18 : core    : fixed default filling values for unsigned int_.

Modified: trunk/Lib/sandbox/maskedarray/core.py
===================================================================
--- trunk/Lib/sandbox/maskedarray/core.py	2007-01-23 01:08:11 UTC (rev 2589)
+++ trunk/Lib/sandbox/maskedarray/core.py	2007-01-23 05:45:43 UTC (rev 2590)
@@ -165,12 +165,13 @@
 # 18: <type 'numpy.string_'>,
 # 19: <type 'numpy.unicode_'>,
 # 20: <type 'numpy.void'>,
-max_filler = ntypes._minvals
-max_filler.update([(k,-numeric.inf) for k in 
-                   [numpy.float32, numpy.float64, numpy.float128]])            
+max_filler = ntypes._minvals   
+max_filler.update([(k,-numeric.inf) for k in [numpy.float32, numpy.float64]])         
 min_filler = ntypes._maxvals
-min_filler.update([(k,numeric.inf) for k in 
-                   [numpy.float32, numpy.float64, numpy.float128]])           
+min_filler.update([(k,numeric.inf) for k in [numpy.float32, numpy.float64]])    
+if 'float128' in ntypes.typeDict:
+    max_filler.update([(numpy.float128,-numeric.inf)])
+    min_filler.update([(numpy.float128, numeric.inf)])       
 
 
 def default_fill_value (obj):
@@ -1173,6 +1174,9 @@
                 if m.shape == () and m:
                     return str(f)
                 # convert to object array to make filled work
+#CHECK: the two lines below seem more robust than the self._data.astype
+#                res = numeric.empty(self._data.shape, object_)
+#                numeric.putmask(res,~m,self._data)
                 res = self._data.astype("|O8")
                 res[self._mask] = f
         else: