Skip to content

Added empty_circle plot aesthetic #174

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 23 commits into from
Sep 23, 2024
Merged

Added empty_circle plot aesthetic #174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c764dce
Updated empty_circle to allow color_col to be adjusted for deltadelta
sunroofgod Feb 24, 2024
7c84ae3
Added empty_circle as a plot_kwarg for plotting
sunroofgod Feb 24, 2024
458c3aa
Updated formatting
sunroofgod Feb 25, 2024
e2da55d
Added input parameter validation for new filled parameter
sunroofgod Mar 17, 2024
0e79e1c
Added unit tests for new filled parameter for swarmplot
sunroofgod Mar 17, 2024
397faac
Added baseline images for empty_circle plot aesthetic
sunroofgod Mar 17, 2024
a359186
Added baseline image tests for empty_circle plot aesthetic
sunroofgod Mar 17, 2024
6cc19f8
Updated summary lines for swarm_side='right'
sunroofgod Mar 17, 2024
508bd49
Updated summary lines for swarm_side='right'
sunroofgod Mar 17, 2024
c71a4ee
Resolve merge conflicts wrt asymmetric swarmplots and vnbdev branch
sunroofgod Mar 19, 2024
319f513
Fixed bug involving empty_circle filled dots feature not working as i…
sunroofgod Mar 22, 2024
8e63177
Merge pull request #176 from ACCLAB/v2024.03.29
Jacobluke- Mar 22, 2024
085a006
Merge pull request #177 from ACCLAB/v2024.03.29
Jacobluke- Mar 22, 2024
97585d1
Merge pull request #178 from ACCLAB/v2024.03.29
Jacobluke- Mar 22, 2024
ff3a06f
Updated swarmplot to produce legends if plotting by hue column
sunroofgod Mar 24, 2024
9f33da3
Updated errorbar handling of xspans to properly account for when hue …
sunroofgod Mar 24, 2024
8edb941
Updated errorbar handling of xspans to properly account for when hue …
sunroofgod Mar 24, 2024
4b928b7
Updated swarmplot to produce legends if plotting by hue column
sunroofgod Mar 24, 2024
d712e8e
Fix non-string input issue
Jacobluke- Mar 25, 2024
e5b26a1
Fix an error causing xtick label wrong
Jacobluke- Mar 25, 2024
001fa49
Merge remote-tracking branch 'upstream/master' into feat-asymmetric-s…
Jacobluke- Sep 20, 2024
df50e25
Resolve conflicts for empty_circle and Seaborn params
Jacobluke- Sep 23, 2024
533797c
Regenerate test image baseline
Jacobluke- Sep 23, 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
51 changes: 17 additions & 34 deletions dabest/plotter.py
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

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

The original code is related to bug fixes of issue #108. Currently investigating

Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
for i in range(len(idx)):
filled.append(False)
filled.extend([True] * (len(idx[i]) - 1))
print(f"filled is {filled}")

names = color_groups if not color_by_subgroups else idx
n_groups = len(color_groups)
Expand Down Expand Up @@ -686,39 +687,22 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
else:
jitter = 1

if color_col is None: # Determine the use of hue
rawdata_plot = swarmplot(
data=plot_data,
x=xvar,
y=yvar,
ax=rawdata_axes,
order=all_plot_groups,
hue=xvar,
palette=plot_palette_raw,
zorder=1,
side=asymmetric_side,
jitter=jitter,
is_drop_gutter=True,
gutter_limit=0.45,
**swarmplot_kwargs
)
rawdata_plot.legend().set_visible(False)
else:
rawdata_plot = swarmplot(
data=plot_data,
x=xvar,
y=yvar,
ax=rawdata_axes,
order=all_plot_groups,
hue=color_col,
palette=plot_palette_raw,
zorder=1,
side=asymmetric_side,
jitter=jitter,
is_drop_gutter=True,
gutter_limit=0.45,
**swarmplot_kwargs
)
rawdata_plot = swarmplot(
data=plot_data,
x=xvar,
y=yvar,
ax=rawdata_axes,
order=all_plot_groups,
hue=color_col,
palette=plot_palette_raw,
zorder=3,
side=asymmetric_side,
jitter=jitter,
filled=filled,
is_drop_gutter=True,
gutter_limit=0.45,
**swarmplot_kwargs,
)
else:
# Plot the raw data as a barplot.
bar1_df = pd.DataFrame(
Expand Down Expand Up @@ -1646,4 +1630,3 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):

# Return the figure.
return fig

50 changes: 17 additions & 33 deletions nbs/API/plotter.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@
" for i in range(len(idx)):\n",
" filled.append(False)\n",
" filled.extend([True] * (len(idx[i]) - 1))\n",
" print(f\"filled is {filled}\")\n",
"\n",
" names = color_groups if not color_by_subgroups else idx\n",
" n_groups = len(color_groups)\n",
Expand Down Expand Up @@ -745,39 +746,22 @@
" else:\n",
" jitter = 1\n",
"\n",
" if color_col is None: # Determine the use of hue\n",
" rawdata_plot = swarmplot(\n",
" data=plot_data,\n",
" x=xvar,\n",
" y=yvar,\n",
" ax=rawdata_axes,\n",
" order=all_plot_groups,\n",
" hue=xvar,\n",
" palette=plot_palette_raw,\n",
" zorder=1,\n",
" side=asymmetric_side,\n",
" jitter=jitter,\n",
" is_drop_gutter=True,\n",
" gutter_limit=0.45,\n",
" **swarmplot_kwargs,\n",
" )\n",
" rawdata_plot.legend().set_visible(False)\n",
" else:\n",
" rawdata_plot = swarmplot(\n",
" data=plot_data,\n",
" x=xvar,\n",
" y=yvar,\n",
" ax=rawdata_axes,\n",
" order=all_plot_groups,\n",
" hue=color_col,\n",
" palette=plot_palette_raw,\n",
" zorder=1,\n",
" side=asymmetric_side,\n",
" jitter=jitter,\n",
" is_drop_gutter=True,\n",
" gutter_limit=0.45,\n",
" **swarmplot_kwargs,\n",
" )\n",
" rawdata_plot = swarmplot(\n",
" data=plot_data,\n",
" x=xvar,\n",
" y=yvar,\n",
" ax=rawdata_axes,\n",
" order=all_plot_groups,\n",
" hue=color_col,\n",
" palette=plot_palette_raw,\n",
" zorder=3,\n",
" side=asymmetric_side,\n",
" jitter=jitter,\n",
" filled=filled,\n",
" is_drop_gutter=True,\n",
" gutter_limit=0.45,\n",
" **swarmplot_kwargs,\n",
" )\n",
" else:\n",
" # Plot the raw data as a barplot.\n",
" bar1_df = pd.DataFrame(\n",
Expand Down