@@ -153,6 +153,16 @@ def __init__(
153
153
154
154
self ._make_selectors ()
155
155
156
+ @cache_readonly
157
+ def sorted_labels (self ) -> list [np .ndarray ]:
158
+ if self .sort :
159
+ return self .labels
160
+
161
+ v = self .level
162
+ codes = list (self .index .codes )
163
+ to_sort = codes [:v ] + codes [v + 1 :] + [codes [v ]]
164
+ return to_sort
165
+
156
166
@cache_readonly
157
167
def _indexer_and_to_sort (
158
168
self ,
@@ -162,8 +172,17 @@ def _indexer_and_to_sort(
162
172
]:
163
173
v = self .level
164
174
165
- codes = list (self .index .codes )
166
175
levs = list (self .index .levels )
176
+ codes = list (self .index .codes )
177
+
178
+ if not self .sort :
179
+ codes = [list (code ) for code in codes ]
180
+ ids_code = [
181
+ ({y : x for x , y in enumerate (sorted (set (code ), key = code .index ))}, code )
182
+ for code in codes
183
+ ]
184
+ codes = [np .array ([d [x ] for x in code ]) for d , code in ids_code ]
185
+
167
186
to_sort = codes [:v ] + codes [v + 1 :] + [codes [v ]]
168
187
sizes = tuple (len (x ) for x in levs [:v ] + levs [v + 1 :] + [levs [v ]])
169
188
@@ -174,25 +193,23 @@ def _indexer_and_to_sort(
174
193
return indexer , to_sort
175
194
176
195
@cache_readonly
177
- def sorted_labels (self ) -> list [np .ndarray ]:
196
+ def labels (self ) -> list [np .ndarray ]:
178
197
indexer , to_sort = self ._indexer_and_to_sort
179
198
if self .sort :
180
199
return [line .take (indexer ) for line in to_sort ]
181
200
return to_sort
182
201
183
202
def _make_sorted_values (self , values : np .ndarray ) -> np .ndarray :
184
- if self .sort :
185
- indexer , _ = self ._indexer_and_to_sort
186
-
187
- sorted_values = algos .take_nd (values , indexer , axis = 0 )
188
- return sorted_values
189
- return values
203
+ indexer , _ = self ._indexer_and_to_sort
204
+ sorted_values = algos .take_nd (values , indexer , axis = 0 )
205
+ return sorted_values
190
206
191
207
def _make_selectors (self ):
192
208
new_levels = self .new_index_levels
193
209
194
210
# make the mask
195
- remaining_labels = self .sorted_labels [:- 1 ]
211
+ remaining_labels = self .labels [:- 1 ]
212
+ choosen_labels = self .labels [- 1 ]
196
213
level_sizes = tuple (len (x ) for x in new_levels )
197
214
198
215
comp_index , obs_ids = get_compressed_ids (remaining_labels , level_sizes )
@@ -202,7 +219,7 @@ def _make_selectors(self):
202
219
stride = self .index .levshape [self .level ] + self .lift
203
220
self .full_shape = ngroups , stride
204
221
205
- selector = self . sorted_labels [ - 1 ] + stride * comp_index + self .lift
222
+ selector = choosen_labels + stride * comp_index + self .lift
206
223
mask = np .zeros (np .prod (self .full_shape ), dtype = bool )
207
224
mask .put (selector , True )
208
225
0 commit comments