Skip to content

Fix Series.div when div/floordiv np.inf by zero #1463

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 10 commits into from
May 18, 2020
Merged

Fix Series.div when div/floordiv np.inf by zero #1463

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
11ebd1c
Fix Series.div when dividing np.inf by zero
itholic May 6, 2020
a1a6cad
Add test case when -np.inf
itholic May 6, 2020
890d15e
Fix test when pandas < 1.0
itholic May 6, 2020
9a63024
Add opponent test & fix logic
itholic May 14, 2020
6c61738
Simplify the logic
itholic May 14, 2020
f41dc75
fix
itholic May 14, 2020
c8e7658
Add docstring to __floordiv__ and __truediv__
itholic May 16, 2020
df4d7e9
fix linter
itholic May 16, 2020
0919498
Add table to docstring
itholic May 18, 2020
d2a1097
Fix align
itholic May 18, 2020
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
25 changes: 21 additions & 4 deletions databricks/koalas/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,14 @@ def __sub__(self, other):

def __truediv__(self, other):
def truediv(left, right):
return F.when(F.lit(right == 0), F.lit(np.inf).__div__(left)).otherwise(
left.__truediv__(right)
return F.when(
F.lit(right == 0) & (F.lit(left != np.inf) & F.lit(left != -np.inf)),
F.lit(np.inf).__div__(left),
).otherwise(
F.when(
(F.lit(left == np.inf) | F.lit(left == -np.inf)) & F.lit(right is not np.nan),
left,
).otherwise(left.__truediv__(right))
)

return _numpy_column_op(truediv)(self, other)
Expand Down Expand Up @@ -212,8 +218,19 @@ def rtruediv(left, right):

def __floordiv__(self, other):
def floordiv(left, right):
return F.when(F.lit(right == 0), F.lit(np.inf).__div__(left)).otherwise(
F.when(F.lit(right) == np.nan, np.nan).otherwise(F.floor(left.__div__(right)))
return F.when(
F.lit(right == 0) & (F.lit(left != np.inf) & F.lit(left != -np.inf)),
F.lit(np.inf).__div__(left),
).otherwise(
F.when(
F.lit(right == 0) & (F.lit(left == np.inf) | F.lit(left == -np.inf)), left
).otherwise(
F.when(F.lit(left == np.inf) | F.lit(left == -np.inf), np.nan).otherwise(
F.when(F.lit(right is np.nan), np.nan).otherwise(
F.floor(left.__div__(right))
)
)
)
)

return _numpy_column_op(floordiv)(self, other)
Expand Down
18 changes: 9 additions & 9 deletions databricks/koalas/tests/test_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,25 +1467,25 @@ def test_squeeze(self):
pser = kser.to_pandas()
self.assert_eq(kser.squeeze(), pser.squeeze())

def test_div_zero(self):
pser = pd.Series([100, None, -300, None, 500, -700], name="Koalas")
def test_div_zero_and_nan(self):
pser = pd.Series([100, None, -300, None, 500, -700, np.inf, -np.inf], name="Koalas")
kser = ks.from_pandas(pser)

self.assert_eq(repr(pser.div(0)), repr(kser.div(0)))
self.assert_eq(repr(pser.truediv(0)), repr(kser.truediv(0)))
self.assert_eq(repr(pser / 0), repr(kser / 0))
self.assert_eq(repr(pser.div(np.nan)), repr(kser.div(np.nan)))
self.assert_eq(repr(pser.truediv(np.nan)), repr(kser.truediv(np.nan)))
self.assert_eq(repr(pser / np.nan), repr(kser / np.nan))

# floordiv has different behavior in pandas > 1.0.0
# floordiv has different behavior in pandas > 1.0.0 when divide by 0
if LooseVersion(pd.__version__) >= LooseVersion("1.0.0"):
self.assert_eq(repr(pser.floordiv(0)), repr(kser.floordiv(0)))
self.assert_eq(repr(pser // 0), repr(kser // 0))
else:
result = pd.Series([np.inf, np.nan, -np.inf, np.nan, np.inf, -np.inf], name="Koalas")
result = pd.Series(
[np.inf, np.nan, -np.inf, np.nan, np.inf, -np.inf, np.inf, -np.inf], name="Koalas"
)
self.assert_eq(repr(kser.floordiv(0)), repr(result))
self.assert_eq(repr(kser // 0), repr(result))

def test_floordiv_nan(self):
pser = pd.Series([-100, 0, 100, None, np.nan], name="Koalas")
kser = ks.from_pandas(pser)

self.assert_eq(repr(pser.floordiv(np.nan)), repr(kser.floordiv(np.nan)))