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.

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

Jump to bottom

Optimize handling of wide datasets and Pandas indexes #1350

Merged
merged 15 commits into from
Jul 23, 2024
Merged

Optimize handling of wide datasets and Pandas indexes #1350

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1e61065
avoid calling redim on wide data
maximlt Jun 4, 2024
e53a4d2
Merge branch 'main' into optimize_wide_data
maximlt Jun 27, 2024
d342080
test multi-index groupby
maximlt Jul 2, 2024
1896d7b
add xfail test for hierarchical columns DataFrames
maximlt Jul 2, 2024
f7be393
test bar plot with by and y from index
maximlt Jul 17, 2024
f0d6f42
test the index being reset on tables
maximlt Jul 17, 2024
5c481a2
fix one reset_index call for Dask
maximlt Jul 17, 2024
0c4ee82
convert a test to also exert Dask
maximlt Jul 18, 2024
adbddf7
instantiate Dataset with explicit kdims
maximlt Jul 19, 2024
326ee64
optimize reset_index calls
maximlt Jul 19, 2024
4cf62c9
minor typing additions
maximlt Jul 19, 2024
aa8b29a
Merge branch 'main' into optimize_wide_data
maximlt Jul 19, 2024
24dd4c7
fix getting the color data
maximlt Jul 19, 2024
abb485a
conditionally relabel and redim
maximlt Jul 19, 2024
7df0911
restrict support_index to Pandas DataFrames only
maximlt Jul 22, 2024
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
5 changes: 3 additions & 2 deletions hvplot/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,8 +2123,9 @@ def chart(self, element, x, y, data=None):

charts = []
for c in y:
kdims, vdims = self._get_dimensions([x], [c])
chart = element(data, kdims, vdims).redim(**{c: self.value_label})
ydim = hv.Dimension(c, label=self.value_label)
kdims, vdims = self._get_dimensions([x], [ydim])
chart = element(data, kdims, vdims)
charts.append((c, chart.relabel(**self._relabel).redim(**self._redim)))
Copy link
Member

Choose a reason for hiding this comment

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

Maybe let's also skip relabel and redim if self._relabel and self._redim are empty respectively.

return (
self._by_type(charts, self.group_label, sort=False)
Expand Down
21 changes: 11 additions & 10 deletions hvplot/tests/testcharts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ def test_wide_chart(self, kind, element):
plot = self.df.hvplot(kind=kind)
obj = NdOverlay(
{
'x': element(self.df, 'index', 'x').redim(x='value'),
'y': element(self.df, 'index', 'y').redim(y='value'),
'x': element(self.df, 'index', Dimension('x', label='value')),
'y': element(self.df, 'index', Dimension('y', label='value')),
},
'Variable',
)
Expand All @@ -177,8 +177,8 @@ def test_wide_chart_labels(self, kind, element):
plot = self.df.hvplot(kind=kind, value_label='Test', group_label='Category')
obj = NdOverlay(
{
'x': element(self.df, 'index', 'x').redim(x='Test'),
'y': element(self.df, 'index', 'y').redim(y='Test'),
'x': element(self.df, 'index', Dimension('x', label='Test')),
'y': element(self.df, 'index', Dimension('y', label='Test')),
},
'Category',
)
Expand Down Expand Up @@ -270,8 +270,8 @@ def test_area_stacked(self):
plot = self.df.hvplot.area(stacked=True)
obj = NdOverlay(
{
'x': Area(self.df, 'index', 'x').redim(x='value'),
'y': Area(self.df, 'index', 'y').redim(y='value'),
'x': Area(self.df, 'index', Dimension('x', label='value')),
'y': Area(self.df, 'index', Dimension('y', label='value')),
},
'Variable',
)
Expand Down Expand Up @@ -323,8 +323,8 @@ def test_only_includes_num_chart(self, kind, element):
plot = self.cat_df.hvplot(kind=kind)
obj = NdOverlay(
{
'x': element(self.cat_df, 'index', 'x').redim(x='value'),
'y': element(self.cat_df, 'index', 'y').redim(y='value'),
'x': element(self.cat_df, 'index', Dimension('x', label='value')),
'y': element(self.cat_df, 'index', Dimension('y', label='value')),
},
'Variable',
)
Expand All @@ -335,10 +335,11 @@ def test_includes_str_if_no_num_chart(self, kind, element):
plot = self.cat_only_df.hvplot(kind=kind)
obj = NdOverlay(
{
'upper': element(self.cat_only_df, 'index', 'upper').redim(upper='value'),
'lower': element(self.cat_only_df, 'index', 'lower').redim(lower='value'),
'upper': element(self.cat_only_df, 'index', Dimension('upper', label='value')),
'lower': element(self.cat_only_df, 'index', Dimension('lower', label='value')),
},
'Variable',
sort=False,
)
self.assertEqual(plot, obj)

Expand Down
Loading