more tests

ecml_tools/data.py

@@ -191,7 +191,9 @@ def __repr__(self):
         return self.__class__.__name__ + "()"
 
     def _get_tuple(self, n):
-        raise NotImplementedError(f"Tuple not supported: {n} (class {self.__class__.__name__})")
+        raise NotImplementedError(
+            f"Tuple not supported: {n} (class {self.__class__.__name__})"
+        )
 
 
 class Source:
@@ -769,6 +771,21 @@ def check_same_variables(self, d1, d2):
     def __len__(self):
         return len(self.datasets[0])
 
+    def _get_tuple(self, n):
+
+        p = (n[0], slice(None), n[2:])
+        result = [d[p] for d in self.datasets]
+
+        print([type(s) for s in p], p)
+        print(self.shape, [r.shape for r in result])
+
+        raise NotImplementedError()
+
+        result = np.concatenate(result)
+        # result = np.stack(result)
+
+        return result[n[1]]
+
     def _get_slice(self, s):
         return np.stack([self[i] for i in range(*s.indices(self._len))])
 

tests/test_data.py

@@ -178,6 +178,8 @@ def __init__(self, ds):
         self.ds = ds
         self.np = ds[:]  # Numpy array
 
+        assert self.ds.shape == self.np.shape
+
     def __getitem__(self, index):
         assert (self.ds[index] == self.np[index]).all()
 
@@ -199,6 +201,13 @@ def slices(ds, start=None, end=None, step=None):
     t[::step]
 
     t[0:10, :, 0]
+    t[:, 0:3, 0]
+    t[:, :, 0]
+    t[0:10, 0:3, 0]
+    t[:, :, :]
+
+    # t[:,(1,3),:]
+    # t[:,(1,3)]
 
     if ds.shape[2] > 1:  # Ensemble dimension
         t[0:10, :, (0, 1)]