Skip to content

Commit f7c9ebe

Browse files
committed
Update on the paired proportional plot v2
Keep the paired proportional plot up to date. Also update the documentation
1 parent 45bc1f6 commit f7c9ebe

3 files changed

Lines changed: 242 additions & 91 deletions

File tree

dabest/plotter.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
3838
reflines_kwargs=None,
3939
group_summary_kwargs=None,
4040
legend_kwargs=None,
41-
title=None, fontsize_title = 16,
42-
fontsize_rawxlabel = 12,fontsize_rawylabel = 12,
43-
fontsize_contrastxlabel = 12, fontsize_contrastylabel = 12,
44-
fontsize_delta2label = 12
41+
title=None, fontsize_title=16,
42+
fontsize_rawxlabel=12, fontsize_rawylabel=12,
43+
fontsize_contrastxlabel=12, fontsize_contrastylabel=12,
44+
fontsize_delta2label=12
4545
"""
4646

4747
import numpy as np
@@ -374,7 +374,8 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
374374
contrast_ax_ylim_low = list()
375375
contrast_ax_ylim_high = list()
376376
contrast_ax_ylim_tickintervals = list()
377-
377+
378+
# Title
378379
title = plot_kwargs["title"]
379380
fontsize_title = plot_kwargs["fontsize_title"]
380381
if title is not None:
@@ -418,8 +419,6 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
418419
pivot_values = [yvar]
419420
else:
420421
pivot_values = [yvar, color_col]
421-
# pivoted_plot_data = plot_data.pivot_table(index=dabest_obj.id_col,
422-
# columns=xvar, values=pivot_values, fill_value='')
423422
pivoted_plot_data = pd.pivot(data=plot_data, index=dabest_obj.id_col,
424423
columns=xvar, values=pivot_values)
425424
x_start = 0
@@ -571,7 +570,7 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
571570
N = str(counts.loc[te])
572571

573572
ticks_with_counts.append("{}\nN = {}".format(te, N))
574-
573+
575574
if plot_kwargs['fontsize_rawxlabel'] is not None:
576575
fontsize_rawxlabel = plot_kwargs['fontsize_rawxlabel']
577576
rawdata_axes.set_xticklabels(ticks_with_counts,fontsize=fontsize_rawxlabel)
@@ -722,7 +721,7 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
722721
if show_mini_meta:
723722
contrast_xtick_labels.extend(["","Weighted delta"])
724723
elif effect_size == "delta_g":
725-
contrast_xtick_labels.extend(["","deltas' g"])
724+
contrast_xtick_labels.extend(["", "deltas' g"])
726725
else:
727726
contrast_xtick_labels.extend(["", "delta-delta"])
728727

@@ -1149,7 +1148,7 @@ def EffectSizeDataFramePlotter(EffectSizeDataFrame, **plot_kwargs):
11491148
delta2_label = "deltas' g"
11501149
delta2_axes = contrast_axes.twinx()
11511150
delta2_axes.set_frame_on(False)
1152-
delta2_axes.set_ylabel(delta2_label,fontsize = fontsize_delta2label)
1151+
delta2_axes.set_ylabel(delta2_label, fontsize = fontsize_delta2label)
11531152
og_xlim_delta = contrast_axes.get_xlim()
11541153
og_ylim_delta = contrast_axes.get_ylim()
11551154
delta2_axes.set_ylim(og_ylim_delta)

nbs/API/plotter.ipynb

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@
9090
" reflines_kwargs=None,\n",
9191
" group_summary_kwargs=None,\n",
9292
" legend_kwargs=None,\n",
93-
" title=None, fontsize_title = 16,\n",
94-
" fontsize_rawxlabel = 12,fontsize_rawylabel = 12,\n",
95-
" fontsize_contrastxlabel = 12, fontsize_contrastylabel = 12,\n",
96-
" fontsize_delta2label = 12\n",
93+
" title=None, fontsize_title=16,\n",
94+
" fontsize_rawxlabel=12, fontsize_rawylabel=12,\n",
95+
" fontsize_contrastxlabel=12, fontsize_contrastylabel=12,\n",
96+
" fontsize_delta2label=12\n",
9797
" \"\"\"\n",
9898
"\n",
9999
" import numpy as np\n",
@@ -426,7 +426,8 @@
426426
" contrast_ax_ylim_low = list()\n",
427427
" contrast_ax_ylim_high = list()\n",
428428
" contrast_ax_ylim_tickintervals = list()\n",
429-
" \n",
429+
" \n",
430+
" # Title\n",
430431
" title = plot_kwargs[\"title\"]\n",
431432
" fontsize_title = plot_kwargs[\"fontsize_title\"]\n",
432433
" if title is not None:\n",
@@ -470,8 +471,6 @@
470471
" pivot_values = [yvar]\n",
471472
" else:\n",
472473
" pivot_values = [yvar, color_col]\n",
473-
" # pivoted_plot_data = plot_data.pivot_table(index=dabest_obj.id_col, \n",
474-
" # columns=xvar, values=pivot_values, fill_value='')\n",
475474
" pivoted_plot_data = pd.pivot(data=plot_data, index=dabest_obj.id_col,\n",
476475
" columns=xvar, values=pivot_values)\n",
477476
" x_start = 0\n",
@@ -623,7 +622,7 @@
623622
" N = str(counts.loc[te])\n",
624623
"\n",
625624
" ticks_with_counts.append(\"{}\\nN = {}\".format(te, N))\n",
626-
" \n",
625+
"\n",
627626
" if plot_kwargs['fontsize_rawxlabel'] is not None:\n",
628627
" fontsize_rawxlabel = plot_kwargs['fontsize_rawxlabel']\n",
629628
" rawdata_axes.set_xticklabels(ticks_with_counts,fontsize=fontsize_rawxlabel)\n",
@@ -774,7 +773,7 @@
774773
" if show_mini_meta:\n",
775774
" contrast_xtick_labels.extend([\"\",\"Weighted delta\"])\n",
776775
" elif effect_size == \"delta_g\":\n",
777-
" contrast_xtick_labels.extend([\"\",\"deltas' g\"])\n",
776+
" contrast_xtick_labels.extend([\"\", \"deltas' g\"])\n",
778777
" else:\n",
779778
" contrast_xtick_labels.extend([\"\", \"delta-delta\"])\n",
780779
"\n",
@@ -1201,7 +1200,7 @@
12011200
" delta2_label = \"deltas' g\"\n",
12021201
" delta2_axes = contrast_axes.twinx()\n",
12031202
" delta2_axes.set_frame_on(False)\n",
1204-
" delta2_axes.set_ylabel(delta2_label,fontsize = fontsize_delta2label)\n",
1203+
" delta2_axes.set_ylabel(delta2_label, fontsize = fontsize_delta2label)\n",
12051204
" og_xlim_delta = contrast_axes.get_xlim()\n",
12061205
" og_ylim_delta = contrast_axes.get_ylim()\n",
12071206
" delta2_axes.set_ylim(og_ylim_delta)\n",

0 commit comments

Comments
 (0)