Skip to content

Parametrize tests for Series[timedelta64] integer arithmetic #19166

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 8 commits into from
Jan 12, 2018
+159 −59
Merged

Parametrize tests for Series[timedelta64] integer arithmetic #19166

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4644972
break up repetitive test; make more thorough and explicit
jbrockmendel Jan 10, 2018
77b3ad7
further break up big test, parametrize, test missing cases, identify …
jbrockmendel Jan 10, 2018
5e6281e
parametrize the last bits of test_timedelta64_operations_with_integers
jbrockmendel Jan 10, 2018
a376bf5
Merge branch 'master' of https://github.com/pandas-dev/pandas into pa…
jbrockmendel Jan 10, 2018
2750c20
remove setup_class
jbrockmendel Jan 10, 2018
69703e1
rename test_timedelta_series_ops more informative name
jbrockmendel Jan 10, 2018
de624d5
Merge branch 'master' of https://github.com/pandas-dev/pandas into pa…
jbrockmendel Jan 11, 2018
5560f07
use fixture as requested
jbrockmendel Jan 12, 2018
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
223 changes: 164 additions & 59 deletions pandas/tests/series/test_operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,83 +667,188 @@ def test_div(self):
assert_series_equal(result, expected)


class TestTimedeltaSeriesArithmetic(object):
def test_timedelta_series_ops(self):
# GH11925
s = Series(timedelta_range('1 day', periods=3))
ts = Timestamp('2012-01-01')
expected = Series(date_range('2012-01-02', periods=3))
assert_series_equal(ts + s, expected)
assert_series_equal(s + ts, expected)
class TestTimedeltaSeriesArithmeticWithIntegers(object):
# Tests for Series with dtype 'timedelta64[ns]' arithmetic operations
# with integer and int-like others

expected2 = Series(date_range('2011-12-31', periods=3, freq='-1D'))
assert_series_equal(ts - s, expected2)
assert_series_equal(ts + (-s), expected2)
# ------------------------------------------------------------------
# Addition and Subtraction

def test_td64series_add_int_series_invalid(self):
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
Copy link
Contributor

Choose a reason for hiding this comment

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

since you are repeating this everywhere, use a fixture for tdser

Copy link
Member Author

Choose a reason for hiding this comment

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

Any wiggle room on this request? I really prefer to be able to tell what is going on in a test just by looking at it, to be able to just copy/paste the text of a test when something goes wrong.

Copy link
Contributor

Choose a reason for hiding this comment

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

no wiggle room. This just adds so much boilerplate. that is the entire purpose of fixtures, to avoid copy-paste boilerplate.

with pytest.raises(TypeError):
tdser + Series([2, 3, 4])

def test_timedelta64_operations_with_integers(self):
@pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds')
def test_td64series_radd_int_series_invalid(self):
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
with pytest.raises(TypeError):
Series([2, 3, 4]) + tdser

def test_td64series_sub_int_series_invalid(self):
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
with pytest.raises(TypeError):
tdser - Series([2, 3, 4])

@pytest.mark.xfail(reason='GH#19123 integer interpreted as nanoseconds')
def test_td64series_rsub_int_series_invalid(self):
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
with pytest.raises(TypeError):
Series([2, 3, 4]) - tdser

@pytest.mark.parametrize('scalar', [1, 1.5, np.array(2)])
def test_td64series_add_sub_numeric_scalar_invalid(self, scalar):
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
with pytest.raises(TypeError):
tdser + scalar
with pytest.raises(TypeError):
scalar + tdser
with pytest.raises(TypeError):
tdser - scalar
with pytest.raises(TypeError):
scalar - tdser

@pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16',
'uint64', 'uint32', 'uint16', 'uint8',
'float64', 'float32', 'float16'])
@pytest.mark.parametrize('vector', [
np.array([1, 2, 3]),
pd.Index([1, 2, 3]),
pytest.param(Series([1, 2, 3]),
marks=pytest.mark.xfail(reason='GH#19123 integer '
'interpreted as nanos'))
])
def test_td64series_add_sub_numeric_array_invalid(self, vector, dtype):
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
vector = vector.astype(dtype)
with pytest.raises(TypeError):
tdser + vector
with pytest.raises(TypeError):
vector + tdser
with pytest.raises(TypeError):
tdser - vector
with pytest.raises(TypeError):
vector - tdser

# ------------------------------------------------------------------
# Multiplicaton and Division

@pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16',
'uint64', 'uint32', 'uint16', 'uint8',
'float64', 'float32', 'float16'])
@pytest.mark.parametrize('vector', [np.array([20, 30, 40]),
pd.Index([20, 30, 40]),
Series([20, 30, 40])])
def test_td64series_div_numeric_array(self, vector, dtype):
# GH 4521
# divide/multiply by integers
startdate = Series(date_range('2013-01-01', '2013-01-03'))
enddate = Series(date_range('2013-03-01', '2013-03-03'))
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
vector = vector.astype(dtype)
expected = Series(['2.95D', '1D 23H 12m', 'NaT'],
dtype='timedelta64[ns]')

s1 = enddate - startdate
s1[2] = np.nan
s2 = Series([2, 3, 4])
expected = Series(s1.values.astype(np.int64) / s2, dtype='m8[ns]')
expected[2] = np.nan
result = s1 / s2
result = tdser / vector
assert_series_equal(result, expected)

s2 = Series([20, 30, 40])
expected = Series(s1.values.astype(np.int64) / s2, dtype='m8[ns]')
expected[2] = np.nan
result = s1 / s2
with pytest.raises(TypeError):
vector / tdser

@pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16',
'uint64', 'uint32', 'uint16', 'uint8',
'float64', 'float32', 'float16'])
@pytest.mark.parametrize('vector', [np.array([20, 30, 40]),
pd.Index([20, 30, 40]),
Series([20, 30, 40])])
def test_td64series_mul_numeric_array(self, vector, dtype):
# GH 4521
# divide/multiply by integers
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
vector = vector.astype(dtype)

expected = Series(['1180 Days', '1770 Days', 'NaT'],
dtype='timedelta64[ns]')

result = tdser * vector
assert_series_equal(result, expected)

result = s1 / 2
expected = Series(s1.values.astype(np.int64) / 2, dtype='m8[ns]')
expected[2] = np.nan
@pytest.mark.parametrize('dtype', ['int64', 'int32', 'int16',
'uint64', 'uint32', 'uint16', 'uint8',
'float64', 'float32', 'float16'])
@pytest.mark.parametrize('vector', [
np.array([20, 30, 40]),
pytest.param(pd.Index([20, 30, 40]),
marks=pytest.mark.xfail(reason='__mul__ raises '
'instead of returning '
'NotImplemented')),
Series([20, 30, 40])
])
def test_td64series_rmul_numeric_array(self, vector, dtype):
# GH 4521
# divide/multiply by integers
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
vector = vector.astype(dtype)

expected = Series(['1180 Days', '1770 Days', 'NaT'],
dtype='timedelta64[ns]')

result = vector * tdser
assert_series_equal(result, expected)

s2 = Series([20, 30, 40])
expected = Series(s1.values.astype(np.int64) * s2, dtype='m8[ns]')
expected[2] = np.nan
result = s1 * s2
@pytest.mark.parametrize('one', [1, np.array(1), 1.0, np.array(1.0)])
def test_td64series_mul_numeric_scalar(self, one):
# GH 4521
# divide/multiply by integers
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
expected = Series(['-59 Days', '-59 Days', 'NaT'],
dtype='timedelta64[ns]')

result = tdser * (-one)
assert_series_equal(result, expected)
result = (-one) * tdser
assert_series_equal(result, expected)

for dtype in ['int32', 'int16', 'uint32', 'uint64', 'uint32', 'uint16',
'uint8']:
s2 = Series([20, 30, 40], dtype=dtype)
expected = Series(
s1.values.astype(np.int64) * s2.astype(np.int64),
dtype='m8[ns]')
expected[2] = np.nan
result = s1 * s2
assert_series_equal(result, expected)
expected = Series(['118 Days', '118 Days', 'NaT'],
dtype='timedelta64[ns]')

result = s1 * 2
expected = Series(s1.values.astype(np.int64) * 2, dtype='m8[ns]')
expected[2] = np.nan
result = tdser * (2 * one)
assert_series_equal(result, expected)
result = (2 * one) * tdser
assert_series_equal(result, expected)

result = s1 * -1
expected = Series(s1.values.astype(np.int64) * -1, dtype='m8[ns]')
expected[2] = np.nan
@pytest.mark.parametrize('two', [
2, 2.0,
pytest.param(np.array(2),
marks=pytest.mark.xfail(reason='GH#19011 is_list_like '
'incorrectly True.')),
pytest.param(np.array(2.0),
marks=pytest.mark.xfail(reason='GH#19011 is_list_like '
'incorrectly True.')),
])
def test_td64series_div_numeric_scalar(self, two):
# GH 4521
# divide/multiply by integers
tdser = Series(['59 Days', '59 Days', 'NaT'], dtype='timedelta64[ns]')
expected = Series(['29.5D', '29.5D', 'NaT'], dtype='timedelta64[ns]')

result = tdser / two
assert_series_equal(result, expected)

# invalid ops
assert_series_equal(s1 / s2.astype(float),
Series([Timedelta('2 days 22:48:00'), Timedelta(
'1 days 23:12:00'), Timedelta('NaT')]))
assert_series_equal(s1 / 2.0,
Series([Timedelta('29 days 12:00:00'), Timedelta(
'29 days 12:00:00'), Timedelta('NaT')]))

for op in ['__add__', '__sub__']:
sop = getattr(s1, op, None)
if sop is not None:
pytest.raises(TypeError, sop, 1)
pytest.raises(TypeError, sop, s2.values)

class TestTimedeltaSeriesArithmetic(object):
def test_td64series_add_sub_timestamp(self):
# GH11925
tdser = Series(timedelta_range('1 day', periods=3))
ts = Timestamp('2012-01-01')
expected = Series(date_range('2012-01-02', periods=3))
assert_series_equal(ts + tdser, expected)
assert_series_equal(tdser + ts, expected)

expected2 = Series(date_range('2011-12-31', periods=3, freq='-1D'))
assert_series_equal(ts - tdser, expected2)
assert_series_equal(ts + (-tdser), expected2)

with pytest.raises(TypeError):
tdser - ts

def test_timedelta64_operations_with_DateOffset(self):
# GH 10699
Expand Down