adds reshaping function to Images and Series

test/test_images.py

@@ -200,3 +200,16 @@ def f(x):
 
     assert allclose(data.map_as_series(f, chunk_size=size).toarray(), result)
     assert allclose(data.map_as_series(f, chunk_size=size, value_size=4).toarray(), result)
+
+def test_reshape_values(eng):
+    original = fromarray(arange(72).reshape(2, 6, 6), engine=eng)
+    arr = original.toarray()
+
+    reshaped = original.reshape_values(12, 3)
+    assert allclose(arr.reshape(2, 12, 3), reshaped.toarray())
+
+    reshaped = original.reshape_values(36)
+    assert allclose(arr.reshape(2, 36), reshaped.toarray())
+
+    reshaped = original.reshape_values(4, 3, 3)
+    assert allclose(arr.reshape(2, 4, 3, 3), reshaped.toarray())

test/test_series.py

@@ -428,3 +428,16 @@ def test_mean_by_window(eng):
     assert allclose(test3, [2, 3, 4, 5])
     test4 = data.mean_by_window(indices=[3], window=4).toarray()
     assert allclose(test4, [1, 2, 3, 4])
+
+def test_reshape_keys(eng):
+    original =  fromarray(arange(72).reshape(6, 6, 2), engine=eng)
+    arr = original.toarray()
+
+    reshaped = original.reshape_keys(12, 3)
+    assert allclose(arr.reshape(12, 3, 2), reshaped.toarray())
+
+    reshaped = original.reshape_keys(36)
+    assert allclose(arr.reshape(36, 2), reshaped.toarray())
+
+    reshaped = original.reshape_keys(4, 3, 3)
+    assert allclose(arr.reshape(4, 3, 3, 2), reshaped.toarray())

thunder/images/images.py

@@ -235,6 +235,21 @@ def squeeze(self):
         axis = tuple(range(1, len(self.shape) - 1)) if prod(self.shape[1:]) == 1 else None
         return self.map(lambda x: x.squeeze(axis=axis))
 
+    def reshape_values(self, *shape):
+        """
+        Reshape images
+
+        Parameters
+        ----------
+        shape: one or more ints
+            New shape of images
+        """
+        if prod(self.value_shape) != prod(shape):
+            raise ValueError("Total number of elements in each image must be unchanged")
+
+        newshape = (self.shape[0], ) + shape
+        return self._constructor(self.values.reshape(newshape)).__finalize__(self)
+
     def max_projection(self, axis=2):
         """
         Compute maximum projections of images along a dimension.

thunder/series/series.py

@@ -256,6 +256,21 @@ def min(self):
         """
         return self._constructor(self.values.min(axis=self.baseaxes, keepdims=True))
 
+    def reshape_keys(self, *shape):
+        """
+        Reshape the keys of the time series
+
+        Parameters
+        ----------
+        shape: one or more ints
+            Shape of the new keys
+        """
+        if prod(self.baseshape) != prod(shape):
+            raise ValueError("Total number of series elements must remain unchanged")
+
+        newshape = shape + (self.shape[-1], )
+        return self._constructor(self.values.reshape(newshape)).__finalize__(self)
+
     def between(self, left, right):
         """
         Select subset of values within the given index range.