Bug fix and zero-dot effect size for baseline

Fixed a bug where some baseline line error curve for certain controls are wrongly plotted as the previous one.

The implementation is a bit different from dabestr becuase R allows nesting DataFrame where Python doesn’t.

Author: Jacobluke-

dabest/plot_tools.py

@@ -1292,15 +1292,6 @@ def plot_effect_size(tick, group, control, bootstrap, effsize, ci_low, ci_high):
         fc = plot_palette_contrast[group] if bootstraps_color_by_group else "grey"
         halfviolin(v, fill_color=fc, alpha=halfviolin_alpha)
 
-        # Plot the effect size
-        contrast_axes.plot(
-            [tick],
-            effsize,
-            marker="o",
-            color=ytick_color,
-            markersize=es_marker_size,
-        )
-
         # Plot the confidence interval
         contrast_axes.plot(
             [tick, tick],
@@ -1320,21 +1311,41 @@ def plot_effect_size(tick, group, control, bootstrap, effsize, ci_low, ci_high):
         current_effsize = results.difference[j]
         current_ci_low = results.bca_low[j] if ci_type == "bca" else results.pct_low[j]
         current_ci_high = results.bca_high[j] if ci_type == "bca" else results.pct_high[j]
+        
+        # Plot the effect size
+        contrast_axes.plot(
+            [tick],
+            current_effsize,
+            marker="o",
+            color=ytick_color,
+            markersize=es_marker_size,
+        )
 
         label = plot_effect_size(tick, current_group, current_control, current_bootstrap, 
                                  current_effsize, current_ci_low, current_ci_high)
         contrast_xtick_labels.append(label)
 
-    if show_baseline_ec:
-        for j, tick in enumerate(ticks_for_baseline_ec):
-            bec_group = results.control[j]
-            bec_control = results.control[j]
-            bec_bootstrap = results.bec_bootstraps[j]
-            bec_effsize = results.bec_difference[j]
-            bec_ci_low = results.bec_bca_low[j] if ci_type == "bca" else results.bec_pct_low[j]
-            bec_ci_high = results.bec_bca_high[j] if ci_type == "bca" else results.bec_pct_high[j]
-
-            bec_label = plot_effect_size(tick, bec_group, bec_control, bec_bootstrap, 
+
+    bec_results = results.drop_duplicates(subset='control', keep='first').reset_index(drop=True)
+    for j, tick in enumerate(ticks_for_baseline_ec):
+        bec_group = bec_results.control[j]
+        bec_control = bec_results.control[j]
+        bec_bootstrap = bec_results.bec_bootstraps[j]
+        bec_effsize = bec_results.bec_difference[j]
+        bec_ci_low = bec_results.bec_bca_low[j] if ci_type == "bca" else bec_results.bec_pct_low[j]
+        bec_ci_high = bec_results.bec_bca_high[j] if ci_type == "bca" else bec_results.bec_pct_high[j]
+        
+        # Plot the effect size no matter show_baseline
+        contrast_axes.plot(
+            [tick],
+            bec_effsize,
+            marker="o",
+            color=ytick_color,
+            markersize=es_marker_size,
+        )
+        
+        if show_baseline_ec:
+            _ = plot_effect_size(tick, bec_group, bec_control, bec_bootstrap, 
                                      bec_effsize, bec_ci_low, bec_ci_high)
             # Baseline Curve don't need ticks text
 

nbs/API/plot_tools.ipynb

@@ -1343,15 +1343,6 @@
     "        fc = plot_palette_contrast[group] if bootstraps_color_by_group else \"grey\"\n",
     "        halfviolin(v, fill_color=fc, alpha=halfviolin_alpha)\n",
     "\n",
-    "        # Plot the effect size\n",
-    "        contrast_axes.plot(\n",
-    "            [tick],\n",
-    "            effsize,\n",
-    "            marker=\"o\",\n",
-    "            color=ytick_color,\n",
-    "            markersize=es_marker_size,\n",
-    "        )\n",
-    "\n",
     "        # Plot the confidence interval\n",
     "        contrast_axes.plot(\n",
     "            [tick, tick],\n",
@@ -1371,21 +1362,41 @@
     "        current_effsize = results.difference[j]\n",
     "        current_ci_low = results.bca_low[j] if ci_type == \"bca\" else results.pct_low[j]\n",
     "        current_ci_high = results.bca_high[j] if ci_type == \"bca\" else results.pct_high[j]\n",
+    "        \n",
+    "        # Plot the effect size\n",
+    "        contrast_axes.plot(\n",
+    "            [tick],\n",
+    "            current_effsize,\n",
+    "            marker=\"o\",\n",
+    "            color=ytick_color,\n",
+    "            markersize=es_marker_size,\n",
+    "        )\n",
     "\n",
     "        label = plot_effect_size(tick, current_group, current_control, current_bootstrap, \n",
     "                                 current_effsize, current_ci_low, current_ci_high)\n",
     "        contrast_xtick_labels.append(label)\n",
     "        \n",
-    "    if show_baseline_ec:\n",
-    "        for j, tick in enumerate(ticks_for_baseline_ec):\n",
-    "            bec_group = results.control[j]\n",
-    "            bec_control = results.control[j]\n",
-    "            bec_bootstrap = results.bec_bootstraps[j]\n",
-    "            bec_effsize = results.bec_difference[j]\n",
-    "            bec_ci_low = results.bec_bca_low[j] if ci_type == \"bca\" else results.bec_pct_low[j]\n",
-    "            bec_ci_high = results.bec_bca_high[j] if ci_type == \"bca\" else results.bec_pct_high[j]\n",
-    "\n",
-    "            bec_label = plot_effect_size(tick, bec_group, bec_control, bec_bootstrap, \n",
+    "\n",
+    "    bec_results = results.drop_duplicates(subset='control', keep='first').reset_index(drop=True)\n",
+    "    for j, tick in enumerate(ticks_for_baseline_ec):\n",
+    "        bec_group = bec_results.control[j]\n",
+    "        bec_control = bec_results.control[j]\n",
+    "        bec_bootstrap = bec_results.bec_bootstraps[j]\n",
+    "        bec_effsize = bec_results.bec_difference[j]\n",
+    "        bec_ci_low = bec_results.bec_bca_low[j] if ci_type == \"bca\" else bec_results.bec_pct_low[j]\n",
+    "        bec_ci_high = bec_results.bec_bca_high[j] if ci_type == \"bca\" else bec_results.bec_pct_high[j]\n",
+    "        \n",
+    "        # Plot the effect size no matter show_baseline\n",
+    "        contrast_axes.plot(\n",
+    "            [tick],\n",
+    "            bec_effsize,\n",
+    "            marker=\"o\",\n",
+    "            color=ytick_color,\n",
+    "            markersize=es_marker_size,\n",
+    "        )\n",
+    "        \n",
+    "        if show_baseline_ec:\n",
+    "            _ = plot_effect_size(tick, bec_group, bec_control, bec_bootstrap, \n",
     "                                     bec_effsize, bec_ci_low, bec_ci_high)\n",
     "            # Baseline Curve don't need ticks text\n",
     "    \n",