Skip to content
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.

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

Fix Dataframe.melt function & Add doctest case for melt function #987

Merged
merged 15 commits into from
Nov 8, 2019
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
62 changes: 48 additions & 14 deletions databricks/koalas/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -6762,6 +6762,12 @@ def melt(self, id_vars=None, value_vars=None, var_name=None,
4 c B 5
5 c C 6

>>> df.melt(value_vars='A')
variable value
0 A a
1 A b
2 A c

>>> ks.melt(df, id_vars=['A', 'B'])
A B variable value
0 a 1 C 2
Expand All @@ -6783,28 +6789,56 @@ def melt(self, id_vars=None, value_vars=None, var_name=None,
1 b B 3
2 c B 5
"""
column_index = self._internal.column_index

if id_vars is None:
id_vars = []
elif isinstance(id_vars, str):
id_vars = [(id_vars,)]
elif isinstance(id_vars, tuple):
if self._internal.column_index_level == 1:
id_vars = [idv if isinstance(idv, tuple) else (idv,) for idv in id_vars]
else:
raise ValueError('id_vars must be a list of tuples when columns are a MultiIndex')
else:
id_vars = [idv if isinstance(idv, tuple) else (idv,) for idv in id_vars]
if isinstance(id_vars, str):
id_vars = [(id_vars,)]
elif isinstance(id_vars, tuple):
if self._internal.column_index_level == 1:
id_vars = [idv if isinstance(idv, tuple) else (idv,)
for idv in id_vars]
else:
raise ValueError('id_vars must be a list of tuples'
' when columns are a MultiIndex')
else:
id_vars = [idv if isinstance(idv, tuple) else (idv,)
for idv in id_vars]

column_index = self._internal.column_index
raveled_column_index = np.ravel(column_index)
missing = [idv for idv in np.ravel(id_vars)
if idv not in raveled_column_index]
ueshin marked this conversation as resolved.
Show resolved Hide resolved
if len(missing) != 0:
raise KeyError("The following 'id_vars' are not present"
" in the DataFrame: {}"
.format(missing))

if value_vars is None:
value_vars = []
elif isinstance(value_vars, str):
value_vars = [(value_vars,)]
elif isinstance(value_vars, tuple):
value_vars = [value_vars]
ueshin marked this conversation as resolved.
Show resolved Hide resolved
else:
value_vars = [valv if isinstance(valv, tuple) else (valv,) for valv in value_vars]
if isinstance(value_vars, str):
value_vars = [(value_vars,)]
elif isinstance(value_vars, tuple):
if self._internal.column_index_level == 1:
value_vars = [valv if isinstance(valv, tuple) else (valv,)
for valv in value_vars]
else:
raise ValueError('value_vars must be a list of tuples'
' when columns are a MultiIndex')
else:
value_vars = [valv if isinstance(valv, tuple) else (valv,)
for valv in value_vars]

raveled_column_index = np.ravel(column_index)
missing = [valv for valv in np.ravel(value_vars)
if valv not in raveled_column_index]
if len(missing) != 0:
raise KeyError("The following 'value_vars' are not present"
" in the DataFrame: {}"
.format(missing))

if len(value_vars) == 0:
value_vars = column_index

Expand Down
7 changes: 7 additions & 0 deletions databricks/koalas/tests/test_dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -1822,6 +1822,12 @@ def test_melt(self):
pdf.melt(id_vars=['A'], value_vars=['B'],
var_name='myVarname', value_name='myValname')
.sort_values(['myVarname', 'myValname']))
self.assert_eq(kdf.melt(value_vars=('A', 'B')).sort_values(['variable', 'value'])
.reset_index(drop=True),
pdf.melt(value_vars=('A', 'B')).sort_values(['variable', 'value']))

self.assertRaises(KeyError, lambda: kdf.melt(id_vars='Z'))
self.assertRaises(KeyError, lambda: kdf.melt(value_vars='Z'))

# multi-index columns
columns = pd.MultiIndex.from_tuples([('X', 'A'), ('X', 'B'), ('Y', 'C')])
Expand Down Expand Up @@ -1855,6 +1861,7 @@ def test_melt(self):
pdf.melt().sort_values(['v0', 'v1', 'value']))

self.assertRaises(ValueError, lambda: kdf.melt(id_vars=('X', 'A')))
self.assertRaises(ValueError, lambda: kdf.melt(value_vars=('X', 'A')))

def test_all(self):
pdf = pd.DataFrame({
Expand Down