New Interval / IntervalIndex behavior spec #16386
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -595,6 +595,7 @@ def test_repr_max_seq_item_setting(self): | |
| def test_repr_roundtrip(self): | ||
| super(TestIntervalIndex, self).test_repr_roundtrip() | ||
|
|
||
| # TODO: check this behavior is consistent | ||
| def test_get_item(self, closed): | ||
| i = IntervalIndex.from_arrays((0, 1, np.nan), (1, 2, np.nan), | ||
| closed=closed) | ||
|
|
@@ -615,6 +616,7 @@ def test_get_item(self, closed): | |
| closed=closed) | ||
| tm.assert_index_equal(result, expected) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
|
There was a problem hiding this comment. Why? Could you briefly explain in the comments? There was a problem hiding this comment. Those questions BTW apply to all comments where you write this. There was a problem hiding this comment. maybe reference test_interval_new.py directly (as well as the issues numbers), so its obvious to a reader what is happening. |
||
| def test_get_loc_value(self): | ||
|
There was a problem hiding this comment. to the extent you are adding new tests that are xfailing, but let's these these where they are for now. actually let's put all of your new tests in a new file, its going to be much more obvious. This way all existing behavior is preserved (as we have not changed anything). You can certainly mark existing tests (maybe with a comment), that this is going to change. There was a problem hiding this comment. That was the way I had it before, but @jorisvandenbossche (I believe it was you?) asked that I remove the current tests instead. I'm happy to go back to what I had before, but please settle this amongst yourselves so we don't revert a third time. There was a problem hiding this comment. it was not me who asked, but that doesn't matter anymore. I think we agree now to go this route. I don't think you should 'go back to what you had before', I think you should be able to just revert that single commit where you removed them to get them back. |
||
| pytest.raises(KeyError, self.index.get_loc, 0) | ||
| assert self.index.get_loc(0.5) == 0 | ||
|
|
@@ -637,6 +639,7 @@ def test_get_loc_value(self): | |
| idx = IntervalIndex.from_arrays([0, 2], [1, 3]) | ||
| pytest.raises(KeyError, idx.get_loc, 1.5) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def slice_locs_cases(self, breaks): | ||
| # TODO: same tests for more index types | ||
| index = IntervalIndex.from_breaks([0, 1, 2], closed='right') | ||
|
|
@@ -665,12 +668,15 @@ def slice_locs_cases(self, breaks): | |
| assert index.slice_locs(1, 1) == (0, 1) | ||
| assert index.slice_locs(1, 2) == (0, 2) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_slice_locs_int64(self): | ||
| self.slice_locs_cases([0, 1, 2]) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_slice_locs_float64(self): | ||
| self.slice_locs_cases([0.0, 1.0, 2.0]) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def slice_locs_decreasing_cases(self, tuples): | ||
| index = IntervalIndex.from_tuples(tuples) | ||
| assert index.slice_locs(1.5, 0.5) == (1, 3) | ||
|
|
@@ -684,17 +690,21 @@ def slice_locs_decreasing_cases(self, tuples): | |
| slice_locs = index.slice_locs(-1, -1) | ||
| assert slice_locs[0] == slice_locs[1] | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_slice_locs_decreasing_int64(self): | ||
| self.slice_locs_cases([(2, 4), (1, 3), (0, 2)]) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_slice_locs_decreasing_float64(self): | ||
| self.slice_locs_cases([(2., 4.), (1., 3.), (0., 2.)]) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_slice_locs_fails(self): | ||
| index = IntervalIndex.from_tuples([(1, 2), (0, 1), (2, 3)]) | ||
| with pytest.raises(KeyError): | ||
| index.slice_locs(1, 2) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_get_loc_interval(self): | ||
| assert self.index.get_loc(Interval(0, 1)) == 0 | ||
| assert self.index.get_loc(Interval(0, 0.5)) == 0 | ||
|
|
@@ -703,6 +713,7 @@ def test_get_loc_interval(self): | |
| pytest.raises(KeyError, self.index.get_loc, | ||
| Interval(-1, 0, 'left')) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_get_indexer(self): | ||
| actual = self.index.get_indexer([-1, 0, 0.5, 1, 1.5, 2, 3]) | ||
| expected = np.array([-1, -1, 0, 0, 1, 1, -1], dtype='intp') | ||
|
|
@@ -725,6 +736,7 @@ def test_get_indexer(self): | |
| expected = np.array([-1, 1], dtype='intp') | ||
| tm.assert_numpy_array_equal(actual, expected) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_get_indexer_subintervals(self): | ||
|
|
||
| # TODO: is this right? | ||
|
|
@@ -748,6 +760,7 @@ def test_get_indexer_subintervals(self): | |
| expected = np.array([0, 0, 0], dtype='intp') | ||
| tm.assert_numpy_array_equal(actual, expected) | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def test_contains(self): | ||
| # Only endpoints are valid. | ||
| i = IntervalIndex.from_arrays([0, 1], [1, 2]) | ||
|
|
@@ -764,6 +777,7 @@ def test_contains(self): | |
| assert Interval(3, 5) not in i | ||
| assert Interval(-1, 0, closed='left') not in i | ||
|
|
||
| # To be removed (see #16316, #16386) | ||
| def testcontains(self): | ||
| # can select values that are IN the range of a value | ||
| i = IntervalIndex.from_arrays([0, 1], [1, 2]) | ||
|
|
@@ -795,7 +809,8 @@ def test_dropna(self, closed): | |
| result = ii.dropna() | ||
| tm.assert_index_equal(result, expected) | ||
|
|
||
| # TODO: check this behavior is consistent | ||
| def test_non_contiguous(self): | ||
| index = IntervalIndex.from_tuples([(0, 1), (2, 3)], closed=closed) | ||
| target = [0.5, 1.5, 2.5] | ||
| actual = index.get_indexer(target) | ||
|
|
@@ -1392,7 +1407,6 @@ def test_errors(self): | |
| with tm.assert_raises_regex(TypeError, msg): | ||
| interval_range(start=start, end=end) | ||
|
|
||
| class TestIntervalTree(object): | ||
| def setup_method(self, method): | ||
| gentree = lambda dtype: IntervalTree(np.arange(5, dtype=dtype), | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you mean by this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these comments are ok