nchunks; resolves #51

Author: alimanfoo

zarr/core.py

@@ -61,8 +61,9 @@ class Array(object):
     itemsize
     nbytes
     nbytes_stored
-    initialized
     cdata_shape
+    nchunks
+    nchunks_initialized
     is_view
 
     Methods
@@ -263,12 +264,6 @@ def nbytes_stored(self):
             else:
                 return m + n
 
-    @property
-    def initialized(self):
-        """The number of chunks that have been initialized with some data."""
-        return sum(1 for k in listdir(self._chunk_store, self._path)
-                   if k not in [array_meta_key, attrs_key])
-
     @property
     def cdata_shape(self):
         """A tuple of integers describing the number of chunks along each
@@ -277,6 +272,20 @@ def cdata_shape(self):
             int(np.ceil(s / c)) for s, c in zip(self._shape, self._chunks)
         )
 
+    @property
+    def nchunks(self):
+        """Total number of chunks."""
+        return reduce(operator.mul, self.cdata_shape)
+
+    @property
+    def nchunks_initialized(self):
+        """The number of chunks that have been initialized with some data."""
+        return sum(1 for k in listdir(self._chunk_store, self._path)
+                   if k not in [array_meta_key, attrs_key])
+
+    # backwards compability
+    initialized = nchunks_initialized
+
     @property
     def is_view(self):
         """A boolean, True if this array is a view on another array."""
@@ -755,8 +764,8 @@ def __repr__(self):
             r += '; nbytes_stored: %s' % human_readable_size(
                 self.nbytes_stored)
             r += '; ratio: %.1f' % (self.nbytes / self.nbytes_stored)
-        n_chunks = reduce(operator.mul, self.cdata_shape)
-        r += '; initialized: %s/%s' % (self.initialized, n_chunks)
+        r += '; initialized: %s/%s' % (self.nchunks_initialized,
+                                       self.nchunks)
 
         # filters
         if self.filters:

zarr/tests/test_core.py

@@ -90,7 +90,8 @@ def test_array_1d(self):
         eq(a.dtype, z.dtype)
         eq((100,), z.chunks)
         eq(a.nbytes, z.nbytes)
-        eq(0, z.initialized)
+        eq(11, z.nchunks)
+        eq(0, z.nchunks_initialized)
         eq((11,), z.cdata_shape)
 
         # check empty
@@ -108,7 +109,8 @@ def test_array_1d(self):
 
         # check properties
         eq(a.nbytes, z.nbytes)
-        eq(11, z.initialized)
+        eq(11, z.nchunks)
+        eq(11, z.nchunks_initialized)
 
         # check slicing
         assert_array_equal(a, np.array(z))
@@ -173,15 +175,15 @@ def test_array_2d(self):
         eq(a.shape, z.shape)
         eq(a.dtype, z.dtype)
         eq((100, 2), z.chunks)
-        eq(0, z.initialized)
+        eq(0, z.nchunks_initialized)
         eq((10, 5), z.cdata_shape)
 
         # set data
         z[:] = a
 
         # check properties
         eq(a.nbytes, z.nbytes)
-        eq(50, z.initialized)
+        eq(50, z.nchunks_initialized)
 
         # check slicing
         assert_array_equal(a, np.array(z))