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

account for obsp/varp during transpose #370

Merged
merged 7 commits into from
May 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions anndata/_core/anndata.py
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,8 @@ def transpose(self) -> "AnnData":
Transpose whole object.

Data matrix is transposed, observations and variables are interchanged.

Ignores `.raw`.
"""
if not self.isbacked:
X = self.X
Expand All @@ -1272,11 +1274,14 @@ def t_csr(m: sparse.spmatrix) -> sparse.csr_matrix:

return AnnData(
t_csr(X),
self._var,
self._obs,
self._uns,
self._varm.flipped(),
self._obsm.flipped(),
obs=self.var,
var=self.obs,
# we're taking a private attributes here to be able to modify uns of the original object
uns=self._uns,
obsm=self.varm.flipped(),
varm=self.obsm.flipped(),
obsp=self.varp.copy(),
varp=self.obsp.copy(),
filename=self.filename,
layers={k: t_csr(v) for k, v in self.layers.items()},
dtype=self.X.dtype.name,
Expand Down
25 changes: 6 additions & 19 deletions anndata/tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,26 +360,13 @@ def test_get_subset_annotation():


def test_transpose():
adata = AnnData(
np.array([[1, 2, 3], [4, 5, 6]]),
dict(obs_names=["A", "B"]),
dict(var_names=["a", "b", "c"]),
)

adata = gen_adata((5, 3))
adata.varp = {f"varp_{k}": v for k, v in adata.varp.items()}
adata1 = adata.T

# make sure to not modify the original!
assert adata.obs_names.tolist() == ["A", "B"]
assert adata.var_names.tolist() == ["a", "b", "c"]

assert adata1.obs_names.tolist() == ["a", "b", "c"]
assert adata1.var_names.tolist() == ["A", "B"]
assert adata1.X.shape == adata.X.T.shape

adata2 = adata.transpose()
assert np.array_equal(adata1.X, adata2.X)
assert np.array_equal(adata1.obs, adata2.obs)
assert np.array_equal(adata1.var, adata2.var)
adata1.uns["test123"] = 1
assert "test123" in adata.uns
assert_equal(adata1.X.shape, (3, 5))
assert_equal(adata1.obsp.keys(), adata.varp.keys())


def test_append_col():
Expand Down