Merge remote-tracking branch 'origin/propplot'

# Conflicts:
#	dabest/_stats_tools/effsize.py

Author: Jacobluke-

dabest/_classes.py

@@ -1570,7 +1570,7 @@ class TwoGroupsEffectSize(object):
     mean differences between two groups.
     """
 
-    def __init__(self, control, test, effect_size,
+    def __init__(self, control, test, effect_size,proportional,
                  is_paired=None, ci=95,
                  resamples=5000, 
                  permutation_count=5000, 
@@ -1732,6 +1732,14 @@ def __init__(self, control, test, effect_size,
             err1 = "`paired` is not None; therefore Cliff's delta is not defined."
             raise ValueError(err1)
 
+        if proportional==True and effect_size not in ['mean_diff','cohens_h']:
+            err1 = "`proportional` is True; therefore effect size other than mean_diff and cohens_h is not defined."
+            raise ValueError(err1)
+
+        if proportional==True and (np.isin(control, [0, 1]).all() == False or np.isin(test, [0, 1]).all() == False):
+            err1 = "`proportional` is True; Only accept binary data consisting of 0 and 1."
+            raise ValueError(err1)
+
         # Convert to numpy arrays for speed.
         # NaNs are automatically dropped.
         control = array(control)
@@ -2425,6 +2433,7 @@ def __pre_calc(self):
 
                 result = TwoGroupsEffectSize(control, test,
                                              self.__effect_size,
+                                             self.__proportional,
                                              self.__is_paired,
                                              self.__ci,
                                              self.__resamples,
@@ -2615,7 +2624,7 @@ def plot(self, color_col=None,
             halfviolin_alpha=0.8, 
 
             #bar plot
-            bar_label=None, bar_desat=0.5, bar_width = 0.5,bar_ylim = None,
+            bar_label=None, bar_desat=0.8, bar_width = 0.5,bar_ylim = None,
             # error bar of proportion plot
             ci=None, err_color=None,
 

dabest/_stats_tools/effsize.py

@@ -276,7 +276,6 @@ def cohens_h(control, test):
     phi_control = 2 * np.arcsin(np.sqrt(prop_control))
     phi_test = 2 * np.arcsin(np.sqrt(prop_test))
 
-    
     return phi_test - phi_control