Skip to content

Commit 5cda1a9

Browse files
authored
Merge pull request #121 from LI-Yixuan/updated_delta_delta
updated delta-delta plot
2 parents 9caf23e + 7c71cc0 commit 5cda1a9

20 files changed

Lines changed: 842 additions & 93 deletions

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,6 @@ tex.cache/
125125
testtt.py
126126
real.py
127127
0to2_beforeduringafter.csv
128+
129+
TEST.ipynb
130+
TrhCsCh.csv

dabest/_api.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
# Email : joseshowh@gmail.com
55

66

7-
def load(data, idx, x=None, y=None, paired=None, id_col=None,
8-
ci=95, resamples=5000, random_seed=12345, proportional=False):
7+
def load(data, idx=None, x=None, y=None, paired=None, id_col=None,
8+
ci=95, resamples=5000, random_seed=12345, proportional=False,
9+
delta2 = False, experiment = None, experiment_label = None,
10+
x1_level = None):
911
'''
1012
Loads data in preparation for estimation statistics.
1113
@@ -18,7 +20,10 @@ def load(data, idx, x=None, y=None, paired=None, id_col=None,
1820
List of column names (if 'x' is not supplied) or of category names
1921
(if 'x' is supplied). This can be expressed as a tuple of tuples,
2022
with each individual tuple producing its own contrast plot
21-
x : string, default None
23+
x : string or list, default None
24+
Column name(s) of the independent variable. This can be expressed as
25+
a list of 2 elements if and only if 'delta2' is True; otherwise it
26+
can only be a string.
2227
y : string, default None
2328
Column names for data to be plotted on the x-axis and y-axis.
2429
paired : string, default None
@@ -37,6 +42,19 @@ def load(data, idx, x=None, y=None, paired=None, id_col=None,
3742
reported are replicable.
3843
proportional : boolean, default False.
3944
TO INCLUDE MORE DESCRIPTION ABOUT DATA FORMAT
45+
delta2 : boolean, default False
46+
Indicator of delta-delta experiment
47+
experiment : String, default None
48+
The name of the column of the dataframe which contains the label of
49+
experiments
50+
experiment_lab : list, default None
51+
A list of String to specify the order of subplots for delta-delta plots.
52+
This can be expressed as a list of 2 elements if and only if 'delta2'
53+
is True; otherwise it can only be a string.
54+
x1_level : list, default None
55+
A list of String to specify the order of subplots for delta-delta plots.
56+
This can be expressed as a list of 2 elements if and only if 'delta2'
57+
is True; otherwise it can only be a string.
4058
4159
Returns
4260
-------
@@ -65,4 +83,4 @@ def load(data, idx, x=None, y=None, paired=None, id_col=None,
6583
'''
6684
from ._classes import Dabest
6785

68-
return Dabest(data, idx, x, y, paired, id_col, ci, resamples, random_seed, proportional)
86+
return Dabest(data, idx, x, y, paired, id_col, ci, resamples, random_seed, proportional, delta2, experiment, experiment_label, x1_level)

0 commit comments

Comments
 (0)