Removed dropped_extent, now extent keeps integer indexes, shape reflects 'true' size

Author: dwest77a

arraypartition/partition.py

@@ -150,11 +150,8 @@ def _smooth_extent(self, extent):
         Replace values of None within each provided slice of the extent with integer
         values derived from the current shape.
         """
-        if len(extent) != self.ndim:
-            # Ignore dimensions that have already been dropped
-            extent = [e for e in extent if isinstance(e,slice)]
 
-        if len(extent) != self.ndim:
+        if len(extent) < self.ndim:
             raise ValueError(
                 'Direct assignment of truncated extent is not supported.'
             )
@@ -208,7 +205,6 @@ def __init__(self,
                  position: Union[tuple,None] = None,
                  extent: Union[tuple,None] = None,
                  format: Union[str,None] = None,
-                 dropped_extent: Union[tuple,None] = None,
                  **kwargs
             ):
 
@@ -261,15 +257,11 @@ def __init__(self,
 
         super().__init__(shape, **kwargs)
 
-        self._dropped_extent = dropped_extent or [None for i in shape]
-
         if extent:
-            for x, ext in enumerate(extent):
-                if isinstance(ext, int):
-                    self._dropped_extent[x] = ext
-
             # Apply a specific extent if given by the initiator
             self.set_extent(extent)
+
+        pass
 
     def __array__(self, *args, **kwargs):
         """
@@ -296,18 +288,13 @@ def __array__(self, *args, **kwargs):
         if hasattr(array, 'units'):
             self.units = array.units
 
-        apply_ext = self._extent
         if len(array.shape) != len(self._extent):
-            apply_ext = self._correct_slice(array.dimensions)
-
-        print(f'Applying Extent {apply_ext} to {self.address}')
-        print(array)
-        print(self.filename)
+            self._correct_slice(array.dimensions)
 
         try:
             # Still allowed to request a specific dtype 
             # Otherwise dtype casting prevented
-            var = np.array(array[tuple(apply_ext)], dtype=dtype)
+            var = np.array(array[tuple(self._extent)], dtype=dtype)
         except IndexError:
             raise ValueError(
                 f"Unable to select required 'extent' of {self.extent} "
@@ -362,20 +349,15 @@ def _correct_slice(self, array_dims: tuple):
             set in ``named_dims`` then this function is used to remove extra
             dimensions from the ``extent`` if possible.
         """
+        return
         extent = []
-        dimcount = 0
-        for dim in range(len(self._dropped_extent)):
-
-            if self._dropped_extent[dim] is not None:
-                extent.append(self._dropped_extent[dim])
-                continue
+        for dim in range(len(self.named_dims)):
 
             named_dim = self.named_dims[dim]
             if named_dim in array_dims:
-                extent.append(self._extent[dimcount])
+                extent.append(self._extent[dim])
 
-            dimcount += 1
-        return extent
+        self._extent = extent
 
     def _post_process_data(self, data: np.array):
         """
@@ -427,7 +409,6 @@ def get_kwargs(self):
             'position': self.position,
             'extent': self._extent,
             'format': self.format,
-            'dropped_extent':self._dropped_extent
         } | super().get_kwargs()
 
     def copy(self, extent: Union[tuple,None] = None):