Changeset 8094

Timestamp:

02/08/10 00:21:33 (7 months ago)

Author:

pierregm

Message:

* Make sure _fill_value is never None for structured masked arrays

Location:

trunk/numpy/ma

Files:

• core.py (modified) (5 diffs)
• tests/test_core.py (modified) (2 diffs)

trunk/numpy/ma/core.py

@@ -2793 +2793 @@
                 # When _mask.shape is not writable (because it's a void)
                 pass
+        # Finalize the fill_value for structured arrays
+        if self.dtype.names:
+            if self._fill_value is None:
+                self._fill_value = _check_fill_value(None, self.dtype)
         return
 
@@ -3570 +3574 @@
             return _print_templates['short'] % parameters
         return _print_templates['long'] % parameters
-    #............................................
+
+
     def __eq__(self, other):
         "Check whether other equals self elementwise"
@@ -5433 +5438 @@
     def __new__(self, data, mask=nomask, dtype=None, fill_value=None):
         dtype = dtype or data.dtype
-        _data = ndarray.__new__(self, (), dtype=dtype, buffer=data.data)
+        _data = ndarray((), dtype=dtype)
+        _data[()] = data
+        _data = _data.view(self)
         if mask is not nomask:
             try:
@@ -5464 +5471 @@
         m = tuple(m)
         if (not any(m)):
-            return self._data.__repr__()
+            return self._data.__str__()
         r = self._data.tolist()
         p = masked_print_option
@@ -5471 +5478 @@
         else:
             p = str(p)
-        r = [(str(_), p)[_m] for (_, _m) in zip(self._data.tolist(), tuple(m))]
+        r = [(str(_), p)[_m] for (_, _m) in zip(r, m)]
         return "(%s)" % ", ".join(r)
 
-    __repr__ = __str__
+    def __repr__(self):
+        m = self._mask
+        if (m is nomask):
+            return self._data.__repr__()
+        m = tuple(m)
+        if not any(m):
+            return self._data.__repr__()
+        p = masked_print_option
+        if not p.enabled():
+            return self.filled(self.fill_value).__repr__()
+        p = str(p)
+        r = [(str(_), p)[_m] for (_, _m) in zip(r, m)]
+        return "(%s)" % ", ".join(r)
 
     def __iter__(self):

trunk/numpy/ma/tests/test_core.py

@@ -504 +504 @@
         "Test filled w/ mvoid"
         ndtype = [('a', int), ('b', float)]
-        a = mvoid(np.array((1, 2)), mask=[(0, 1)], dtype=ndtype)
+        a = mvoid((1, 2.), mask=[(0, 1)], dtype=ndtype)
         # Filled using default
         test = a.filled()
@@ -1457 +1457 @@
         assert_equal(tt._fill_value, np.array(10))
         assert_equal(tuple(t.fill_value), (10, default_fill_value(0)))
+
+    def test_fillvalue_implicit_structured_array(self):
+        "Check that fill_value is always defined for structured arrays"
+        ndtype = ('b', float)
+        adtype = ('a', float)
+        a = array([(1.,), (2.,)], mask=[(False,), (False,)],
+                  fill_value=(np.nan,), dtype=np.dtype([adtype]))
+        b = empty(a.shape, dtype=[adtype, ndtype])
+        b['a'] = a['a']
+        b['a'].set_fill_value(a['a'].fill_value)
+        f = b._fill_value[()]
+        assert(np.isnan(f[0]))
+        assert_equal(f[-1], default_fill_value(1.))
 
 #------------------------------------------------------------------------------