@@ -1123,75 +1123,75 @@ def _get_join_indexers(left_keys, right_keys, sort=False, how='inner',
1123
1123
1124
1124
1125
1125
def _restore_dropped_levels_multijoin (left , right , dropped_level_names ,
1126
- join_idx , lidx , ridx ):
1126
+ join_index , lindexer , rindexer ):
1127
1127
"""
1128
1128
*this is an internal non-public method*
1129
1129
1130
1130
Returns the levels, labels and names of a multil-index to multi-index join.
1131
1131
Depending on the type of join, this method restores the appropriate
1132
- dropped levels of the joined multi-index. The method relies on lidx, ridx
1132
+ dropped levels of the joined multi-index. The method relies on lidx, rindexer
1133
1133
which hold the index positions of left and right, where a join was feasible
1134
1134
1135
1135
Parameters
1136
1136
----------
1137
- left : Index
1137
+ left : MultiIndex
1138
1138
left index
1139
- right : Index
1139
+ right : MultiIndex
1140
1140
right index
1141
1141
dropped_level_names : str array
1142
1142
list of non-common levels
1143
- join_idx : Index
1143
+ join_index : MultiIndex
1144
1144
the index of the join between the common levels of left and right
1145
- lidx : intp array
1145
+ lindexer : intp array
1146
1146
left indexer
1147
1147
right : intp array
1148
1148
right indexer
1149
1149
1150
1150
Returns
1151
1151
-------
1152
- levels : intp ndarray
1152
+ levels : list of Index
1153
1153
levels of combined multiindexes
1154
- labels : str array
1154
+ labels : intp array
1155
1155
labels of combined multiindexes
1156
1156
names : str array
1157
1157
names of combined multiindexes
1158
1158
1159
1159
"""
1160
1160
1161
1161
# Convert to 1 level multi-index if not
1162
- if not isinstance (join_idx , MultiIndex ):
1163
- levels = [join_idx .values ]
1164
- labels = [list (range (join_idx .size ))]
1165
- names = [join_idx .name ]
1166
- join_idx = MultiIndex (levels = levels , labels = labels ,
1167
- names = names , verify_integrity = False )
1168
-
1169
- join_levels = join_idx .levels
1170
- join_labels = join_idx .labels
1171
- join_names = join_idx .names
1172
-
1173
- # lidx and ridx hold the indexes where the join occured
1162
+ if not isinstance (join_index , MultiIndex ):
1163
+ levels = [join_index .values ]
1164
+ labels = [list (range (join_index .size ))]
1165
+ names = [join_index .name ]
1166
+ join_index = MultiIndex (levels = levels , labels = labels ,
1167
+ names = names , verify_integrity = False )
1168
+
1169
+ join_levels = join_index .levels
1170
+ join_labels = join_index .labels
1171
+ join_names = join_index .names
1172
+
1173
+ # lindexer and rindexer hold the indexes where the join occured
1174
1174
# for left and right respectively. If left (right) is None then
1175
1175
# the join occured on all indices of left (right)
1176
- if lidx is None :
1177
- lidx = range (left .size )
1176
+ if lindexer is None :
1177
+ lindexer = range (left .size )
1178
1178
1179
- if ridx is None :
1180
- ridx = range (right .size )
1179
+ if rindexer is None :
1180
+ rindexer = range (right .size )
1181
1181
1182
1182
# Iterate through the levels that must be restored
1183
1183
for dropped_level_name in dropped_level_names :
1184
1184
if dropped_level_name in left .names :
1185
1185
idx = left
1186
- indexer = lidx
1186
+ indexer = lindexer
1187
1187
else :
1188
1188
idx = right
1189
- indexer = ridx
1189
+ indexer = rindexer
1190
1190
1191
1191
# The index of the level name to be restored
1192
1192
name_idx = idx .names .index (dropped_level_name )
1193
1193
1194
- restore_levels = idx .levels [name_idx ]. values
1194
+ restore_levels = idx .levels [name_idx ]
1195
1195
# Inject -1 in the labels list where a join was not possible
1196
1196
# IOW indexer[i]=-1
1197
1197
labels = idx .labels [name_idx ]
0 commit comments