Skip to content

Fix mod & rmod for matching with pandas. #1399

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
Apr 8, 2020
Merged

Fix mod & rmod for matching with pandas. #1399

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca7fa6c
Matching to pandas
itholic Apr 6, 2020
da68b8b
Check if the result is zero or not
itholic Apr 6, 2020
7599002
Using proper logic
itholic Apr 8, 2020
72cb81d
rebase to origin/master
itholic Apr 8, 2020
9b534b0
fix
itholic Apr 8, 2020
5c5427e
fix rmod
itholic Apr 8, 2020
ecc97c0
Relocate to where as it is
itholic Apr 8, 2020
27fd523
fix modulo logic
itholic Apr 8, 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
10 changes: 10 additions & 0 deletions databricks/koalas/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ def wrapper(self, *args):
args = [arg._scol if isinstance(arg, IndexOpsMixin) else arg for arg in args]
scol = f(self._scol, *args)
scol = booleanize_null(self._scol, scol, f)
# PySpark and pandas have a different way to calculate modulo operation.
# Below lines are needed for closing the gap.
if f is spark.Column.__mod__:
scol = F.when((self._scol * args[0] < 0) & (scol != 0), scol + args[0]).otherwise(
scol
)
elif f is spark.Column.__rmod__:
scol = F.when(
(self._scol * args[0] < 0) & (scol != 0), scol + self._scol
).otherwise(scol)

return self._with_new_scol(scol)
else:
Expand Down
12 changes: 12 additions & 0 deletions databricks/koalas/tests/test_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,3 +1372,15 @@ def test_take(self):
self.assertRaises(ValueError, lambda: kser.take("1"))
self.assertRaises(ValueError, lambda: kser.take({1, 2}))
self.assertRaises(ValueError, lambda: kser.take({1: None, 2: None}))

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

self.assert_eq(repr(kser.mod(-150)), repr(pser.mod(-150)))

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

self.assert_eq(repr(kser.rmod(-150)), repr(pser.rmod(-150)))