Skip to content

Commit 9a1d147

Browse files
ChrisRoboChrisRobo
committed
apply output of
1 parent 5a0dfa1 commit 9a1d147

File tree

2 files changed

+62
-74
lines changed

2 files changed

+62
-74
lines changed

‎pandas/tests/frame/indexing/test_indexing.py

+26-32
Original file line numberDiff line numberDiff line change
@@ -1587,41 +1587,35 @@ def test_reindex_methods(self, method, expected_values):
15871587
tm.assert_frame_equal(expected, actual)
15881588

15891589
def test_reindex_with_multi_index(self):
1590-
df = pd.DataFrame({
1591-
"a": [0] * 7,
1592-
"b": list(range(7)),
1593-
"c": list(range(7)),
1594-
}).set_index(["a", "b"])
1590+
df = pd.DataFrame(
1591+
{"a": [0] * 7, "b": list(range(7)), "c": list(range(7)),}
1592+
).set_index(["a", "b"])
15951593
new_index = [0.5, 2.0, 5.0, 5.8]
1596-
new_multi_index = MultiIndex.from_product(
1597-
[[0], new_index],
1598-
names=["a", "b"])
1599-
1600-
reindexed_df = pd.DataFrame({
1601-
"a": [0] * 4,
1602-
"b": new_index,
1603-
"c": [np.nan, 2.0, 5.0, np.nan],
1604-
}).set_index(["a", "b"])
1605-
reindexed_and_backfilled_df = pd.DataFrame({
1606-
"a": [0] * 4,
1607-
"b": new_index,
1608-
"c": [1, 2, 5, 6],
1609-
}).set_index(["a", "b"])
1610-
reindexed_and_padded_df = pd.DataFrame({
1611-
"a": [0] * 4,
1612-
"b": new_index,
1613-
"c": [0, 2, 5, 5],
1614-
}).set_index(["a", "b"])
1594+
new_multi_index = MultiIndex.from_product([[0], new_index], names=["a", "b"])
1595+
1596+
reindexed_df = pd.DataFrame(
1597+
{"a": [0] * 4, "b": new_index, "c": [np.nan, 2.0, 5.0, np.nan],}
1598+
).set_index(["a", "b"])
1599+
reindexed_and_backfilled_df = pd.DataFrame(
1600+
{"a": [0] * 4, "b": new_index, "c": [1, 2, 5, 6],}
1601+
).set_index(["a", "b"])
1602+
reindexed_and_padded_df = pd.DataFrame(
1603+
{"a": [0] * 4, "b": new_index, "c": [0, 2, 5, 5],}
1604+
).set_index(["a", "b"])
16151605

16161606
tm.assert_frame_equal(df.reindex(new_multi_index), reindexed_df)
1617-
tm.assert_frame_equal(df.reindex(new_multi_index, method="bfill"),
1618-
reindexed_and_backfilled_df)
1619-
tm.assert_frame_equal(df.reindex(new_multi_index, method="backfill"),
1620-
reindexed_and_backfilled_df)
1621-
tm.assert_frame_equal(df.reindex(new_multi_index, method="ffill"),
1622-
reindexed_and_padded_df)
1623-
tm.assert_frame_equal(df.reindex(new_multi_index, method="pad"),
1624-
reindexed_and_padded_df)
1607+
tm.assert_frame_equal(
1608+
df.reindex(new_multi_index, method="bfill"), reindexed_and_backfilled_df
1609+
)
1610+
tm.assert_frame_equal(
1611+
df.reindex(new_multi_index, method="backfill"), reindexed_and_backfilled_df
1612+
)
1613+
tm.assert_frame_equal(
1614+
df.reindex(new_multi_index, method="ffill"), reindexed_and_padded_df
1615+
)
1616+
tm.assert_frame_equal(
1617+
df.reindex(new_multi_index, method="pad"), reindexed_and_padded_df
1618+
)
16251619

16261620
def test_reindex_methods_nearest_special(self):
16271621
df = pd.DataFrame({"x": list(range(5))})

‎pandas/tests/indexes/multi/test_indexing.py

+36-42
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,17 @@ def test_get_indexer_and_fill():
189189
mult_idx_2 = MultiIndex.from_product([[0], [1, 3, 4]])
190190

191191
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2), np.array([-1, 2, 3]))
192-
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2, method='backfill'),
193-
np.array([1, 2, 3]))
192+
tm.assert_almost_equal(
193+
mult_idx_1.get_indexer(mult_idx_2, method="backfill"), np.array([1, 2, 3])
194+
)
194195
for method in ("bfill", "backfill"):
195-
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2, method=method),
196-
np.array([1, 2, 3]))
196+
tm.assert_almost_equal(
197+
mult_idx_1.get_indexer(mult_idx_2, method=method), np.array([1, 2, 3])
198+
)
197199
for method in ("ffill", "pad"):
198-
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2, method=method),
199-
np.array([0, 2, 3]))
200+
tm.assert_almost_equal(
201+
mult_idx_1.get_indexer(mult_idx_2, method=method), np.array([0, 2, 3])
202+
)
200203

201204

202205
def test_get_indexer_three_or_more_levels():
@@ -228,13 +231,9 @@ def test_get_indexer_three_or_more_levels():
228231
6: 3 6 8
229232
"""
230233
mult_idx_1 = pd.MultiIndex.from_product([[1, 3], [2, 4, 6], [5, 7]])
231-
mult_idx_2 = pd.MultiIndex.from_tuples([(1, 1, 8),
232-
(1, 5, 9),
233-
(1, 6, 7),
234-
(2, 1, 6),
235-
(2, 7, 7),
236-
(2, 7, 8),
237-
(3, 6, 8)])
234+
mult_idx_2 = pd.MultiIndex.from_tuples(
235+
[(1, 1, 8), (1, 5, 9), (1, 6, 7), (2, 1, 6), (2, 7, 7), (2, 7, 8), (3, 6, 8)]
236+
)
238237
# sanity check
239238
assert mult_idx_1.is_monotonic
240239
assert mult_idx_1.is_unique
@@ -251,18 +250,15 @@ def test_get_indexer_three_or_more_levels():
251250
assert mult_idx_1[-1] < mult_idx_2[6]
252251

253252
indexer_no_fill = mult_idx_1.get_indexer(mult_idx_2)
254-
tm.assert_almost_equal(indexer_no_fill,
255-
np.array([-1, -1, 5, -1, -1, -1, -1]))
253+
tm.assert_almost_equal(indexer_no_fill, np.array([-1, -1, 5, -1, -1, -1, -1]))
256254

257255
# test with backfilling
258-
indexer_backfilled = mult_idx_1.get_indexer(mult_idx_2, method='backfill')
259-
tm. assert_almost_equal(indexer_backfilled,
260-
np.array([0, 4, 5, 6, 6, 6, -1]))
256+
indexer_backfilled = mult_idx_1.get_indexer(mult_idx_2, method="backfill")
257+
tm.assert_almost_equal(indexer_backfilled, np.array([0, 4, 5, 6, 6, 6, -1]))
261258

262259
# now, the same thing, but forward-filled (aka "padded")
263-
indexer_padded = mult_idx_1.get_indexer(mult_idx_2, method='pad')
264-
tm.assert_almost_equal(indexer_padded,
265-
np.array([-1, 3, 5, 5, 5, 5, 11]))
260+
indexer_padded = mult_idx_1.get_indexer(mult_idx_2, method="pad")
261+
tm.assert_almost_equal(indexer_padded, np.array([-1, 3, 5, 5, 5, 5, 11]))
266262

267263
# now, do the indexing in the other direction
268264
assert mult_idx_2[0] < mult_idx_1[0] < mult_idx_2[1]
@@ -278,21 +274,18 @@ def test_get_indexer_three_or_more_levels():
278274
assert mult_idx_2[5] < mult_idx_1[10] < mult_idx_2[6]
279275
assert mult_idx_2[5] < mult_idx_1[11] < mult_idx_2[6]
280276

281-
tm.assert_almost_equal(mult_idx_2.get_indexer(mult_idx_1),
282-
np.array([
283-
-1, -1, -1, -1, -1, 2,
284-
-1, -1, -1, -1, -1, -1,
285-
]))
286-
tm.assert_almost_equal(mult_idx_2.get_indexer(mult_idx_1, method='bfill'),
287-
np.array([
288-
1, 1, 1, 1, 2, 2,
289-
6, 6, 6, 6, 6, 6,
290-
]))
291-
tm.assert_almost_equal(mult_idx_2.get_indexer(mult_idx_1, method='pad'),
292-
np.array([
293-
0, 0, 0, 0, 1, 2,
294-
5, 5, 5, 5, 5, 5,
295-
]))
277+
tm.assert_almost_equal(
278+
mult_idx_2.get_indexer(mult_idx_1),
279+
np.array([-1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1,]),
280+
)
281+
tm.assert_almost_equal(
282+
mult_idx_2.get_indexer(mult_idx_1, method="bfill"),
283+
np.array([1, 1, 1, 1, 2, 2, 6, 6, 6, 6, 6, 6,]),
284+
)
285+
tm.assert_almost_equal(
286+
mult_idx_2.get_indexer(mult_idx_1, method="pad"),
287+
np.array([0, 0, 0, 0, 1, 2, 5, 5, 5, 5, 5, 5,]),
288+
)
296289

297290

298291
def test_get_indexer_backfill_with_carrying():
@@ -330,12 +323,13 @@ def test_get_indexer_backfill_with_carrying():
330323
assert mult_idx_1[7] < mult_idx_2[0] < mult_idx_1[8]
331324
assert mult_idx_1[-1] < mult_idx_2[1]
332325

333-
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2),
334-
np.array([-1, -1]))
335-
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2, method='bfill'),
336-
np.array([8, -1]))
337-
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2, method='ffill'),
338-
np.array([7, 15]))
326+
tm.assert_almost_equal(mult_idx_1.get_indexer(mult_idx_2), np.array([-1, -1]))
327+
tm.assert_almost_equal(
328+
mult_idx_1.get_indexer(mult_idx_2, method="bfill"), np.array([8, -1])
329+
)
330+
tm.assert_almost_equal(
331+
mult_idx_1.get_indexer(mult_idx_2, method="ffill"), np.array([7, 15])
332+
)
339333

340334

341335
def test_get_indexer_nearest():

0 commit comments

Comments
 (0)