Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.

Commit 697f8e0

Browse files
gene names were partially parsed before data, this is wrong
1 parent dbd5a74 commit 697f8e0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

diffxpy/testing/base.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,8 +1775,8 @@ def lrt(
17751775
if reduced_formula_scale is None:
17761776
reduced_formula_scale = reduced_formula
17771777

1778-
X = _parse_data(data, gene_names)
17791778
gene_names = _parse_gene_names(data, gene_names)
1779+
X = _parse_data(data, gene_names)
17801780
sample_description = _parse_sample_description(data, sample_description)
17811781
size_factors = _parse_size_factors(size_factors=size_factors, data=X)
17821782

@@ -1948,8 +1948,8 @@ def wald(
19481948
coef_to_test = [coef_to_test]
19491949

19501950
# # Parse input data formats:
1951-
X = _parse_data(data, gene_names)
19521951
gene_names = _parse_gene_names(data, gene_names)
1952+
X = _parse_data(data, gene_names)
19531953
if dmat_loc is None and dmat_scale is None:
19541954
sample_description = _parse_sample_description(data, sample_description)
19551955
size_factors = _parse_size_factors(size_factors=size_factors, data=X)
@@ -2203,8 +2203,8 @@ def two_sample(
22032203
raise ValueError('base.two_sample(): Do not specify `noise_model` if using test t-test or wilcoxon: ' +
22042204
'The t-test is based on a gaussian noise model and wilcoxon is model free.')
22052205

2206-
X = _parse_data(data, gene_names)
22072206
gene_names = _parse_gene_names(data, gene_names)
2207+
X = _parse_data(data, gene_names)
22082208
grouping = _parse_grouping(data, sample_description, grouping)
22092209
sample_description = pd.DataFrame({"grouping": grouping})
22102210

@@ -2389,8 +2389,8 @@ def pairwise(
23892389

23902390
# Do not store all models but only p-value and q-value matrix:
23912391
# genes x groups x groups
2392-
X = _parse_data(data, gene_names)
23932392
gene_names = _parse_gene_names(data, gene_names)
2393+
X = _parse_data(data, gene_names)
23942394
sample_description = _parse_sample_description(data, sample_description)
23952395
grouping = _parse_grouping(data, sample_description, grouping)
23962396
sample_description = pd.DataFrame({"grouping": grouping})
@@ -2593,8 +2593,8 @@ def versus_rest(
25932593

25942594
# Do not store all models but only p-value and q-value matrix:
25952595
# genes x groups
2596-
X = _parse_data(data, gene_names)
25972596
gene_names = _parse_gene_names(data, gene_names)
2597+
X = _parse_data(data, gene_names)
25982598
sample_description = _parse_sample_description(data, sample_description)
25992599
grouping = _parse_grouping(data, sample_description, grouping)
26002600
sample_description = pd.DataFrame({"grouping": grouping})

0 commit comments

Comments
 (0)