Skip to content

TST: Condense tests in test_interval_new.py and add new test based on TODO #23275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2018
+62 −82
Merged

TST: Condense tests in test_interval_new.py and add new test based on TODO #23275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 62 additions & 82 deletions pandas/tests/indexes/interval/test_interval_new.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@

class TestIntervalIndex(object):

def _compare_tuple_of_numpy_array(self, result, expected):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is never used

lidx, ridx = result
lidx_expected, ridx_expected = expected

tm.assert_numpy_array_equal(lidx, lidx_expected)
tm.assert_numpy_array_equal(ridx, ridx_expected)

@pytest.mark.parametrize("side", ['right', 'left', 'both', 'neither'])
def test_get_loc_interval(self, closed, side):

Expand Down Expand Up @@ -149,107 +142,94 @@ def test_slice_locs_with_ints_and_floats_errors(self, tuples, query):
index.slice_locs(query)

@pytest.mark.parametrize('query, expected', [
(Interval(1, 3, closed='right'), 1),
(Interval(1, 3, closed='left'), -1),
(Interval(1, 3, closed='both'), -1),
(Interval(1, 3, closed='neither'), -1),
(Interval(1, 4, closed='right'), -1),
(Interval(0, 4, closed='right'), -1),
(Interval(1, 2, closed='right'), -1)])
def test_get_indexer_with_interval_single_queries(self, query, expected):

index = IntervalIndex.from_tuples(
[(0, 2.5), (1, 3), (2, 4)], closed='right')

result = index.get_indexer([query])
expected = np.array([expected], dtype='intp')
tm.assert_numpy_array_equal(result, expected)

@pytest.mark.parametrize('query, expected', [
([Interval(1, 3, closed='right')], [1]),
([Interval(1, 3, closed='left')], [-1]),
([Interval(1, 3, closed='both')], [-1]),
([Interval(1, 3, closed='neither')], [-1]),
([Interval(1, 4, closed='right')], [-1]),
([Interval(0, 4, closed='right')], [-1]),
([Interval(1, 2, closed='right')], [-1]),
([Interval(2, 4, closed='right'), Interval(1, 3, closed='right')],
[2, 1]),
([Interval(1, 3, closed='right'), Interval(0, 2, closed='right')],
[1, -1]),
([Interval(1, 3, closed='right'), Interval(1, 3, closed='left')],
[1, -1])])
def test_get_indexer_with_interval_multiple_queries(self, query, expected):
def test_get_indexer_with_interval(self, query, expected):

index = IntervalIndex.from_tuples(
[(0, 2.5), (1, 3), (2, 4)], closed='right')
tuples = [(0, 2.5), (1, 3), (2, 4)]
index = IntervalIndex.from_tuples(tuples, closed='right')

result = index.get_indexer(query)
expected = np.array(expected, dtype='intp')
tm.assert_numpy_array_equal(result, expected)

@pytest.mark.parametrize('query, expected', [
(-0.5, -1), (0, -1), (0.5, 0), (1, 0), (1.5, 1), (2, 1),
(2.5, -1), (3, -1), (3.5, 2), (4, 2), (4.5, -1)])
def test_get_indexer_with_ints_and_floats_single_queries(
self, query, expected):

index = IntervalIndex.from_tuples(
[(0, 1), (1, 2), (3, 4)], closed='right')

result = index.get_indexer([query])
expected = np.array([expected], dtype='intp')
tm.assert_numpy_array_equal(result, expected)

@pytest.mark.parametrize('query, expected', [
([-0.5], [-1]),
([0], [-1]),
([0.5], [0]),
([1], [0]),
([1.5], [1]),
([2], [1]),
([2.5], [-1]),
([3], [-1]),
([3.5], [2]),
([4], [2]),
([4.5], [-1]),
([1, 2], [0, 1]),
([1, 2, 3], [0, 1, -1]),
([1, 2, 3, 4], [0, 1, -1, 2]),
([1, 2, 3, 4, 2], [0, 1, -1, 2, 1])])
def test_get_indexer_with_ints_and_floats_multiple_queries(
self, query, expected):
def test_get_indexer_with_int_and_float(self, query, expected):

index = IntervalIndex.from_tuples(
[(0, 1), (1, 2), (3, 4)], closed='right')
tuples = [(0, 1), (1, 2), (3, 4)]
index = IntervalIndex.from_tuples(tuples, closed='right')

result = index.get_indexer(query)
expected = np.array(expected, dtype='intp')
tm.assert_numpy_array_equal(result, expected)

index = IntervalIndex.from_tuples([(0, 2), (1, 3), (2, 4)])
# TODO: @shoyer believes this should raise, master branch doesn't
@pytest.mark.parametrize('tuples, closed', [
([(0, 2), (1, 3), (3, 4)], 'neither'),
([(0, 5), (1, 4), (6, 7)], 'left'),
([(0, 1), (0, 1), (1, 2)], 'right'),
([(0, 1), (2, 3), (3, 4)], 'both')])
def test_get_indexer_errors(self, tuples, closed):
# IntervalIndex needs non-overlapping for uniqueness when querying
index = IntervalIndex.from_tuples(tuples, closed=closed)

@pytest.mark.parametrize('query, expected', [
(-0.5, (Int64Index([], dtype='int64'), np.array([0]))),
(0, (Int64Index([0], dtype='int64'), np.array([]))),
(0.5, (Int64Index([0], dtype='int64'), np.array([]))),
(1, (Int64Index([0, 1], dtype='int64'), np.array([]))),
(1.5, (Int64Index([0, 1], dtype='int64'), np.array([]))),
(2, (Int64Index([0, 1, 2], dtype='int64'), np.array([]))),
(2.5, (Int64Index([1, 2], dtype='int64'), np.array([]))),
(3, (Int64Index([2], dtype='int64'), np.array([]))),
(3.5, (Int64Index([2], dtype='int64'), np.array([]))),
(4, (Int64Index([], dtype='int64'), np.array([0]))),
(4.5, (Int64Index([], dtype='int64'), np.array([0])))])
def test_get_indexer_non_unique_with_ints_and_floats_single_queries(
self, query, expected):

index = IntervalIndex.from_tuples(
[(0, 2.5), (1, 3), (2, 4)], closed='left')

result = index.get_indexer_non_unique([query])
tm.assert_numpy_array_equal(result, expected)
msg = ('cannot handle overlapping indices; use '
'IntervalIndex.get_indexer_non_unique')
with tm.assert_raises_regex(ValueError, msg):
index.get_indexer([0, 2])

@pytest.mark.parametrize('query, expected', [
([1, 2], (Int64Index([0, 1, 0, 1, 2], dtype='int64'), np.array([]))),
([1, 2, 3],
(Int64Index([0, 1, 0, 1, 2, 2], dtype='int64'), np.array([]))),
([1, 2, 3, 4],
(Int64Index([0, 1, 0, 1, 2, 2, -1], dtype='int64'), np.array([3]))),
([1, 2, 3, 4, 2],
(Int64Index([0, 1, 0, 1, 2, 2, -1, 0, 1, 2], dtype='int64'),
np.array([3])))])
def test_get_indexer_non_unique_with_ints_and_floats_multiple_queries(
self, query, expected):

index = IntervalIndex.from_tuples(
[(0, 2.5), (1, 3), (2, 4)], closed='left')

result = index.get_indexer_non_unique(query)
tm.assert_numpy_array_equal(result, expected)
([-0.5], ([-1], [0])),
([0], ([0], [])),
([0.5], ([0], [])),
([1], ([0, 1], [])),
([1.5], ([0, 1], [])),
([2], ([0, 1, 2], [])),
([2.5], ([1, 2], [])),
([3], ([2], [])),
([3.5], ([2], [])),
([4], ([-1], [0])),
([4.5], ([-1], [0])),
([1, 2], ([0, 1, 0, 1, 2], [])),
([1, 2, 3], ([0, 1, 0, 1, 2, 2], [])),
([1, 2, 3, 4], ([0, 1, 0, 1, 2, 2, -1], [3])),
([1, 2, 3, 4, 2], ([0, 1, 0, 1, 2, 2, -1, 0, 1, 2], [3]))])
def test_get_indexer_non_unique_with_int_and_float(self, query, expected):

tuples = [(0, 2.5), (1, 3), (2, 4)]
index = IntervalIndex.from_tuples(tuples, closed='left')

result_indexer, result_missing = index.get_indexer_non_unique(query)
expected_indexer = Int64Index(expected[0])
expected_missing = np.array(expected[1], dtype='intp')

tm.assert_index_equal(result_indexer, expected_indexer)
tm.assert_numpy_array_equal(result_missing, expected_missing)

# TODO we may also want to test get_indexer for the case when
# the intervals are duplicated, decreasing, non-monotonic, etc..
Expand Down