Skip to content

Support getitem with Index #75

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.

Sign up for GitHub

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

Merged
michcio1234 merged 2 commits into from
Jan 19, 2019
Merged

Support getitem with Index #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
151861c
Fix behaviour when passing Index to __getitem__
michcio1234 Jan 17, 2019
08aa370
Address PR remarks
michcio1234 Jan 19, 2019
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
7 changes: 5 additions & 2 deletions sparsity/sparse_frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ def drop_duplicate_idx(self, **kwargs):

Returns
-------
dropeed: SparseFrame
dropped: SparseFrame
"""
mask = ~self.index.duplicated(**kwargs)
return SparseFrame(self.data[mask], index=self.index.values[mask],
Expand All @@ -798,7 +798,10 @@ def drop_duplicate_idx(self, **kwargs):
def __getitem__(self, item):
if item is None:
raise ValueError('Cannot label index with a null key.')
if not isinstance(item, (tuple, list)):
if not isinstance(item, (pd.Series, np.ndarray, pd.Index, list,
tuple)):
# TODO: tuple probably should be a separate case as in Pandas
# where it is used with Multiindex
item = [item]
if len(item) > 0:
return self.reindex_axis(item, axis=1)
Expand Down
9 changes: 9 additions & 0 deletions sparsity/test/test_sparse_frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import numpy as np
import pandas as pd
import pandas.testing as pdt
import pytest
from moto import mock_s3
from scipy import sparse
Expand Down Expand Up @@ -575,6 +576,7 @@ def test_npz_io_s3(complex_example):
def test_getitem():
id_ = np.identity(10)
sf = SparseFrame(id_, columns=list('abcdefghij'))

assert sf['a'].data.todense()[0] == 1
assert sf['j'].data.todense()[9] == 1
assert np.all(sf[['a', 'b']].data.todense() == np.asmatrix(id_[:, [0, 1]]))
Expand All @@ -588,6 +590,13 @@ def test_getitem():
with pytest.raises(ValueError):
sf[None]

idx = pd.Index(list('abc'))
pdt.assert_index_equal(idx, sf[idx].columns)
pdt.assert_index_equal(idx, sf[idx.to_series()].columns)
pdt.assert_index_equal(idx, sf[idx.tolist()].columns)
pdt.assert_index_equal(idx, sf[tuple(idx)].columns)
pdt.assert_index_equal(idx, sf[idx.values].columns)


def test_vstack():
frames = []
Expand Down