Skip to content

Commit 8db319b

Browse files
committed
Update mini meta terminology
> Changed mini_meta attribute to is_mini_meta to better fit with other attributes (such as is_paired and is_proportional) > Changed mini_meta_delta class to mini_meta to better fit with other attributes such as delta_delta
1 parent f355a59 commit 8db319b

16 files changed

Lines changed: 224 additions & 109 deletions

dabest/_dabest_object.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def __init__(
5555
self.__resamples = resamples
5656
self.__random_seed = random_seed
5757
self.__is_proportional = proportional
58-
self.__mini_meta = mini_meta
58+
self.__is_mini_meta = mini_meta
5959

6060
# after this call the attributes self.__experiment_label and self.__x1_level are updated
6161
self._check_errors(x, y, idx, experiment, experiment_label, x1_level)
@@ -114,7 +114,7 @@ def __repr__(self):
114114
)
115115
)
116116

117-
if self.__mini_meta:
117+
if self.__is_mini_meta:
118118
comparisons.append("weighted delta (only for mean difference)")
119119

120120
for j, g in enumerate(comparisons):
@@ -399,11 +399,11 @@ def is_proportional(self):
399399
return self.__is_proportional
400400

401401
@property
402-
def mini_meta(self):
402+
def is_mini_meta(self):
403403
"""
404404
Returns the mini_meta boolean parameter.
405405
"""
406-
return self.__mini_meta
406+
return self.__is_mini_meta
407407

408408
@property
409409
def _all_plot_groups(self):
@@ -426,7 +426,7 @@ def _check_errors(self, x, y, idx, experiment, experiment_label, x1_level):
426426
raise ValueError(err0)
427427

428428
# Check if it is a valid mini_meta case
429-
if self.__mini_meta:
429+
if self.__is_mini_meta:
430430
# Only mini_meta calculation but not proportional and delta-delta function
431431
if self.__is_proportional:
432432
err0 = "`proportional` and `mini_meta` cannot be True at the same time."
@@ -692,7 +692,7 @@ def _compute_effectsize_dfs(self):
692692
experiment_label=self.__experiment_label,
693693
x1_level=self.__x1_level,
694694
x2=self.__x2,
695-
mini_meta=self.__mini_meta,
695+
mini_meta=self.__is_mini_meta,
696696
)
697697

698698
self.__mean_diff = EffectSizeDataFrame(

dabest/_effsize_objects.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ def __init__(
847847
self.__experiment_label = experiment_label
848848
self.__x2 = x2
849849
self.__delta2 = delta2
850-
self.__mini_meta = mini_meta
850+
self.__is_mini_meta = mini_meta
851851

852852
def __pre_calc(self):
853853
from .misc_tools import print_greeting, get_varname
@@ -920,7 +920,7 @@ def __pre_calc(self):
920920
if self.__delta2 and self.__effect_size in ["mean_diff", "delta_g"]:
921921
resamp_count = False
922922
def_pval = False
923-
elif self.__mini_meta and self.__effect_size == "mean_diff":
923+
elif self.__is_mini_meta and self.__effect_size == "mean_diff":
924924
resamp_count = False
925925
def_pval = False
926926
else:
@@ -1016,17 +1016,17 @@ def __pre_calc(self):
10161016
)
10171017

10181018
# Create and compute the weighted average statistics
1019-
if self.__mini_meta and self.__effect_size == "mean_diff":
1020-
self.__mini_meta_delta = MiniMetaDelta(
1019+
if self.__is_mini_meta and self.__effect_size == "mean_diff":
1020+
self.__mini_meta = MiniMetaDelta(
10211021
self, self.__permutation_count, self.__ci
10221022
)
1023-
reprs.append(self.__mini_meta_delta.__repr__(header=False))
1024-
elif self.__mini_meta and self.__effect_size != "mean_diff":
1025-
self.__mini_meta_delta = "Weighted delta is not supported for {}.".format(
1023+
reprs.append(self.__mini_meta.__repr__(header=False))
1024+
elif self.__is_mini_meta and self.__effect_size != "mean_diff":
1025+
self.__mini_meta = "Weighted delta is not supported for {}.".format(
10261026
self.__effect_size
10271027
)
10281028
else:
1029-
self.__mini_meta_delta = (
1029+
self.__mini_meta = (
10301030
"`mini_meta` is False; weighted delta is therefore not calculated."
10311031
)
10321032

@@ -1579,27 +1579,27 @@ def lqrt(self):
15791579
return self.__lqrt_results
15801580

15811581
@property
1582-
def mini_meta(self):
1582+
def is_mini_meta(self):
15831583
"""
15841584
Returns the mini_meta boolean parameter.
15851585
"""
1586-
return self.__mini_meta
1586+
return self.__is_mini_meta
15871587

15881588
@property
1589-
def mini_meta_delta(self):
1589+
def mini_meta(self):
15901590
"""
15911591
Returns the mini_meta results.
15921592
"""
15931593
try:
1594-
return self.__mini_meta_delta
1594+
return self.__mini_meta
15951595
except AttributeError:
15961596
self.__pre_calc()
1597-
return self.__mini_meta_delta
1597+
return self.__mini_meta
15981598

15991599
@property
16001600
def delta_delta(self):
16011601
"""
1602-
Returns the mini_meta results.
1602+
Returns the delta_delta results.
16031603
"""
16041604
try:
16051605
return self.__delta_delta

dabest/forest_plot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ def load_plot_data(
5555
first_contrast = data[0]
5656
if first_contrast.delta2 is True:
5757
contrast_type = "delta2"
58-
elif first_contrast.mini_meta is True:
58+
elif first_contrast.is_mini_meta is True:
5959
contrast_type = "mini_meta"
6060
else:
6161
raise ValueError("The `contrast_type` parameter must be specified as either `delta2` or `mini_meta`.")
6262

63-
contrast_attr_map = {"delta2": "delta_delta", "mini_meta": "mini_meta_delta"}
63+
contrast_attr_map = {"delta2": "delta_delta", "mini_meta": "mini_meta"}
6464
contrast_attr = contrast_attr_map.get(contrast_type)
6565

6666
if idx is not None and contrast_type == 'delta2':

dabest/misc_tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def get_params(
115115
yvar = effectsize_df.yvar
116116
is_paired = effectsize_df.is_paired
117117
delta2 = effectsize_df.delta2
118-
mini_meta = effectsize_df.mini_meta
118+
is_mini_meta = effectsize_df.is_mini_meta
119119
effect_size = effectsize_df.effect_size
120120
proportional = effectsize_df.is_proportional
121121
results = effectsize_df.results
@@ -130,7 +130,7 @@ def get_params(
130130
else:
131131
show_delta2 = plot_kwargs["show_delta2"]
132132

133-
if effect_size != "mean_diff" or not mini_meta:
133+
if effect_size != "mean_diff" or not is_mini_meta:
134134
show_mini_meta = False
135135
else:
136136
show_mini_meta = plot_kwargs["show_mini_meta"]

dabest/plot_tools.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ def contrast_bars_plotter(
984984
color_col: str,
985985
plot_palette_raw: dict,
986986
show_mini_meta: bool,
987-
mini_meta_delta: object,
987+
mini_meta: object,
988988
show_delta2: bool,
989989
delta_delta: object,
990990
show_pairs: bool,
@@ -1012,7 +1012,7 @@ def contrast_bars_plotter(
10121012
Dictionary of colors used in the plot.
10131013
show_mini_meta : bool
10141014
Whether to show the mini meta-analysis.
1015-
mini_meta_delta : object
1015+
mini_meta : object
10161016
Mini meta-analysis object.
10171017
show_delta2 : bool
10181018
Whether to show the delta-delta.
@@ -1058,7 +1058,7 @@ def contrast_bars_plotter(
10581058
ax_to_plot.add_patch(mpatches.Rectangle((contrast_bars_x-0.25, 0), 0.5, contrast_bars_y, color=contrast_bars_colors[idx_selector], **contrast_bars_kwargs))
10591059

10601060
if show_mini_meta or show_delta2:
1061-
diff = mini_meta_delta.difference if show_mini_meta else delta_delta.difference
1061+
diff = mini_meta.difference if show_mini_meta else delta_delta.difference
10621062
if horizontal:
10631063
ax_to_plot.add_patch(mpatches.Rectangle((0, max(swarm_plot_ax.get_yticks())-0.5), diff, 0.5, color='black', **contrast_bars_kwargs))
10641064
else:
@@ -1150,7 +1150,7 @@ def delta_text_plotter(
11501150
proportional: bool,
11511151
float_contrast: bool,
11521152
show_mini_meta: bool,
1153-
mini_meta_delta: object,
1153+
mini_meta: object,
11541154
show_delta2: bool,
11551155
delta_delta: object,
11561156
idx: list
@@ -1182,7 +1182,7 @@ def delta_text_plotter(
11821182
Whether the DABEST plot uses Gardner-Altman or Cummings
11831183
show_mini_meta : bool
11841184
Whether to show the mini meta-analysis.
1185-
mini_meta_delta : object
1185+
mini_meta : object
11861186
Mini meta-analysis object.
11871187
show_delta2 : bool
11881188
Whether to show the delta-delta.
@@ -1226,7 +1226,7 @@ def delta_text_plotter(
12261226
for j, tick in enumerate(ticks_to_plot):
12271227
Delta_Values.append(results.difference[int(j)])
12281228
if show_delta2: Delta_Values.append(delta_delta.difference)
1229-
if show_mini_meta: Delta_Values.append(mini_meta_delta.difference)
1229+
if show_mini_meta: Delta_Values.append(mini_meta.difference)
12301230

12311231
# Collect the X-coordinates for the delta text
12321232
delta_text_x_coordinates = delta_text_kwargs.pop('x_coordinates')
@@ -1518,13 +1518,13 @@ def plot_minimeta_or_deltadelta_violins(
15181518

15191519
# Plot the curve
15201520
if show_mini_meta:
1521-
mini_meta_delta = effectsize_df.mini_meta_delta
1522-
data = mini_meta_delta.bootstraps_weighted_delta
1523-
difference = mini_meta_delta.difference
1521+
mini_meta = effectsize_df.mini_meta
1522+
data = mini_meta.bootstraps_weighted_delta
1523+
difference = mini_meta.difference
15241524
if ci_type == "bca":
1525-
ci_low, ci_high = mini_meta_delta.bca_low, mini_meta_delta.bca_high
1525+
ci_low, ci_high = mini_meta.bca_low, mini_meta.bca_high
15261526
else:
1527-
ci_low, ci_high = mini_meta_delta.pct_low, mini_meta_delta.pct_high
1527+
ci_low, ci_high = mini_meta.pct_low, mini_meta.pct_high
15281528
else:
15291529
delta_delta = effectsize_df.delta_delta
15301530
data = delta_delta.bootstraps_delta_delta
@@ -1803,7 +1803,7 @@ def gridkey_plotter(
18031803
float_contrast: bool,
18041804
horizontal: bool,
18051805
delta_delta: object,
1806-
mini_meta_delta: object,
1806+
mini_meta: object,
18071807
effect_size: str,
18081808
gridkey_kwargs: dict,
18091809
):
@@ -1846,7 +1846,7 @@ def gridkey_plotter(
18461846
If the plot is horizontal.
18471847
delta_delta : object
18481848
delta-delta object.
1849-
mini_meta_delta : object
1849+
mini_meta : object
18501850
Mini meta-analysis object.
18511851
effect_size : str
18521852
Type of effect size to plot
@@ -1982,7 +1982,7 @@ def gridkey_plotter(
19821982
if group_idx == 0:
19831983
added_group = ['', gridkey_marker]
19841984
elif gridkey_show_es and (group_idx == len(table_cellcols)-1) and not horizontal:
1985-
added_delta_effectsize = delta_delta.difference if show_delta2 else mini_meta_delta.difference
1985+
added_delta_effectsize = delta_delta.difference if show_delta2 else mini_meta.difference
19861986
added_delta_effectsize_str = np.format_float_positional(
19871987
added_delta_effectsize,
19881988
precision=2,
@@ -2226,7 +2226,7 @@ def table_for_horizontal_plots(
22262226
for n in np.arange(0, len(effectsize_df.results.difference), 1):
22272227
lst.append([effectsize_df.results.difference[n],0])
22282228
if show_mini_meta:
2229-
lst.append([effectsize_df.mini_meta_delta.difference,0])
2229+
lst.append([effectsize_df.mini_meta.difference,0])
22302230
elif show_delta2:
22312231
lst.append([effectsize_df.delta_delta.difference,0])
22322232
tab = pd.DataFrame(lst, columns=cols)

dabest/plotter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def effectsize_df_plotter(effectsize_df: object, **plot_kwargs) -> matplotlib.fi
248248
) # Default asymmetric side is right
249249

250250
# swarmplot() plots swarms based on current size of ax
251-
# Therefore, since the ax size for mini_meta and show_delta changes later on, there has to be increased jitter
251+
# Therefore, since the ax size for show_mini_meta and show_delta changes later on, there has to be increased jitter
252252
rawdata_plot = swarmplot(
253253
data = plot_data,
254254
x = xvar,
@@ -501,7 +501,7 @@ def effectsize_df_plotter(effectsize_df: object, **plot_kwargs) -> matplotlib.fi
501501
color_col = color_col,
502502
plot_palette_raw = plot_palette_raw,
503503
show_mini_meta = show_mini_meta,
504-
mini_meta_delta = effectsize_df.mini_meta_delta if show_mini_meta else None,
504+
mini_meta = effectsize_df.mini_meta if show_mini_meta else None,
505505
show_delta2 = show_delta2,
506506
delta_delta = effectsize_df.delta_delta if show_delta2 else None,
507507
show_pairs = show_pairs,
@@ -541,7 +541,7 @@ def effectsize_df_plotter(effectsize_df: object, **plot_kwargs) -> matplotlib.fi
541541
proportional = proportional,
542542
float_contrast = float_contrast,
543543
show_mini_meta = show_mini_meta,
544-
mini_meta_delta = effectsize_df.mini_meta_delta if show_mini_meta else None,
544+
mini_meta = effectsize_df.mini_meta if show_mini_meta else None,
545545
show_delta2 = show_delta2,
546546
delta_delta = effectsize_df.delta_delta if show_delta2 else None,
547547
idx = idx
@@ -582,7 +582,7 @@ def effectsize_df_plotter(effectsize_df: object, **plot_kwargs) -> matplotlib.fi
582582
float_contrast = float_contrast,
583583
horizontal = horizontal,
584584
delta_delta = effectsize_df.delta_delta if show_delta2 else None,
585-
mini_meta_delta = effectsize_df.mini_meta_delta if show_mini_meta else None,
585+
mini_meta = effectsize_df.mini_meta if show_mini_meta else None,
586586
effect_size = effect_size,
587587
gridkey_kwargs = gridkey_kwargs,
588588
)

nbs/API/dabest_object.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
" self.__resamples = resamples\n",
132132
" self.__random_seed = random_seed\n",
133133
" self.__is_proportional = proportional\n",
134-
" self.__mini_meta = mini_meta\n",
134+
" self.__is_mini_meta = mini_meta\n",
135135
"\n",
136136
" # after this call the attributes self.__experiment_label and self.__x1_level are updated\n",
137137
" self._check_errors(x, y, idx, experiment, experiment_label, x1_level)\n",
@@ -190,7 +190,7 @@
190190
" )\n",
191191
" )\n",
192192
"\n",
193-
" if self.__mini_meta:\n",
193+
" if self.__is_mini_meta:\n",
194194
" comparisons.append(\"weighted delta (only for mean difference)\")\n",
195195
"\n",
196196
" for j, g in enumerate(comparisons):\n",
@@ -475,11 +475,11 @@
475475
" return self.__is_proportional\n",
476476
"\n",
477477
" @property\n",
478-
" def mini_meta(self):\n",
478+
" def is_mini_meta(self):\n",
479479
" \"\"\"\n",
480480
" Returns the mini_meta boolean parameter.\n",
481481
" \"\"\"\n",
482-
" return self.__mini_meta\n",
482+
" return self.__is_mini_meta\n",
483483
"\n",
484484
" @property\n",
485485
" def _all_plot_groups(self):\n",
@@ -502,7 +502,7 @@
502502
" raise ValueError(err0)\n",
503503
"\n",
504504
" # Check if it is a valid mini_meta case\n",
505-
" if self.__mini_meta:\n",
505+
" if self.__is_mini_meta:\n",
506506
" # Only mini_meta calculation but not proportional and delta-delta function\n",
507507
" if self.__is_proportional:\n",
508508
" err0 = \"`proportional` and `mini_meta` cannot be True at the same time.\"\n",
@@ -768,7 +768,7 @@
768768
" experiment_label=self.__experiment_label,\n",
769769
" x1_level=self.__x1_level,\n",
770770
" x2=self.__x2,\n",
771-
" mini_meta=self.__mini_meta,\n",
771+
" mini_meta=self.__is_mini_meta,\n",
772772
" )\n",
773773
"\n",
774774
" self.__mean_diff = EffectSizeDataFrame(\n",

nbs/API/delta_objects.ipynb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@
10681068
" 'Control 2' : c2, 'Test 2' : t2,\n",
10691069
" 'Control 3' : c3, 'Test 3' : t3})\n",
10701070
"my_dabest_object = dabest.load(my_df, idx=((\"Control 1\", \"Test 1\"), (\"Control 2\", \"Test 2\"), (\"Control 3\", \"Test 3\")), mini_meta=True)\n",
1071-
"my_dabest_object.mean_diff.mini_meta_delta"
1071+
"my_dabest_object.mean_diff.mini_meta"
10721072
]
10731073
},
10741074
{
@@ -1077,12 +1077,17 @@
10771077
"source": [
10781078
"As of version 2023.02.14, weighted delta can only be calculated for mean difference, and not for standardized measures such as Cohen's *d*.\n",
10791079
"\n",
1080-
"Details about the calculated weighted delta are accessed as attributes of the ``mini_meta_delta`` class. See the `minimetadelta` for details on usage.\n",
1080+
"Details about the calculated weighted delta are accessed as attributes of the ``mini_meta`` class. See the `minimetadelta` for details on usage.\n",
10811081
"\n",
10821082
"Refer to Chapter 10 of the Cochrane handbook for further information on meta-analysis: \n",
10831083
"https://training.cochrane.org/handbook/current/chapter-10\n",
10841084
"\t\t"
10851085
]
1086+
},
1087+
{
1088+
"cell_type": "markdown",
1089+
"metadata": {},
1090+
"source": []
10861091
}
10871092
],
10881093
"metadata": {

0 commit comments

Comments
 (0)