fix: repeated subset_to

Author: d-laub

pixi.lock

@@ -106,21 +106,19 @@ def subset_to(
         if regions is None and samples is None:
             return self
 
+        to_update = {}
+
         if samples is not None:
             samples = self.sample2idx(samples)
             sample_idxs = idx_like_to_array(samples, self.n_samples)
-        else:
-            sample_idxs = np.arange(self.n_samples, dtype=np.intp)
+            to_update["sample_subset_idxs"] = sample_idxs
 
         if regions is not None:
             regions = self.region2idx(regions)
             region_idxs = idx_like_to_array(regions, self.n_regions)
-        else:
-            region_idxs = np.arange(self.n_regions, dtype=np.intp)
+            to_update["region_subset_idxs"] = region_idxs
 
-        return evolve(
-            self, region_subset_idxs=region_idxs, sample_subset_idxs=sample_idxs
-        )
+        return evolve(self, **to_update)
 
     def to_full_dataset(self) -> "DatasetIndexer":
         """Return a full sized dataset, undoing any subsettting."""

python/genvarloader/_dataset/_indexing.py

@@ -71,7 +71,9 @@ def idx_like_to_array(idx: Idx, max_len: int) -> NDArray[np.integer]:
         assert is_dtype(idx, np.integer) or is_dtype(idx, np.bool_)
 
     if isinstance(idx, slice):
-        _idx = np.arange(max_len, dtype=np.intp)[idx]
+        _idx = np.arange(
+            idx.start or 0, idx.stop or max_len, idx.step or 1, dtype=np.intp
+        )
     elif is_dtype(idx, np.bool_):
         _idx = idx.nonzero()[0]
     else: