Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(fix): obs filtering #148

Merged
merged 17 commits into from
Oct 16, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve tests for in-place filtering
gtca committed Oct 16, 2024
commit 172223796ed96705e53dffa049bb8db8a29a3436
29 changes: 18 additions & 11 deletions tests/test_muon_preproc.py
Original file line number Diff line number Diff line change
@@ -83,15 +83,15 @@ def test_filter_obs_adata_view(self, mdata, filepath_h5mu):
mu.pp.filter_obs(view, sub)

def test_filter_obs_with_obsm_obsp(self, pbmc3k_processed):
A = pbmc3k_processed[:500,].copy()
A = pbmc3k_processed[:, :500].copy()
B = pbmc3k_processed[:, 500:].copy()
A_subset = A[A.obs["louvain"] == "B cells"].copy()
B = pbmc3k_processed[500:,].copy()
B_subset = B[B.obs["louvain"] == "NOT HERE"].copy()
B_subset = B[B.obs["louvain"] == "B cells"].copy()
mdata = mu.MuData({"A": A, "B": B})
mu.pp.filter_obs(mdata, "A:louvain", lambda x: x == "B cells")
assert mdata["B"].n_obs == 0
assert mdata["B"].n_obs == B_subset.n_obs
assert mdata["A"].obs["louvain"].unique() == "B cells"
assert B.n_obs == 0
assert B.n_obs == B_subset.n_obs
assert A.obs["louvain"].unique() == "B cells"
assert_equal(mdata["A"], A_subset)
assert_equal(mdata["B"], B_subset)
@@ -146,14 +146,21 @@ def test_filter_var_adata_view(self, mdata, filepath_h5mu):
mu.pp.filter_var(view, sub)

def test_filter_var_with_varm_varp(self, pbmc3k_processed):
A = pbmc3k_processed[:500,].copy()
B = pbmc3k_processed[500:,].copy()
mdata = mu.MuData({"A": A, "B": B})
A = pbmc3k_processed[:, :500].copy()
B = pbmc3k_processed[:, 500:].copy()
np.random.seed(42)
var_sel = np.random.choice(np.array([0, 1]), size=mdata.n_vars, replace=True)
mdata.var["sel"] = var_sel
A_var_sel = np.random.choice(np.array([0, 1]), size=A.n_vars, replace=True)
B_var_sel = np.random.choice(np.array([0, 1]), size=B.n_vars, replace=True)
A.var["sel"] = A_var_sel
B.var["sel"] = B_var_sel
A_subset = A[:, A_var_sel == 1].copy()
B_subset = B[:, B_var_sel == 1].copy()
mdata = mu.MuData({"A": A, "B": B})
mdata.pull_var("sel")
mu.pp.filter_var(mdata, "sel", lambda y: y == 1)
assert mdata.shape[1] == int(np.sum(var_sel))
assert mdata.shape[1] == int(np.sum(A_var_sel) + np.sum(B_var_sel))
assert_equal(mdata["A"], A_subset)
assert_equal(mdata["B"], B_subset)


@pytest.mark.usefixtures("filepath_h5mu")