Skip to content

Moved full_index and first_items generation logic to a helper function #15

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
jwenfai merged 2 commits into from
Jan 29, 2019
Merged

Moved full_index and first_items generation logic to a helper function #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89bc708
Moved full_index and first_items generation logic to a helper functio…
jwenfai Jan 29, 2019
31ccebf
Merge remote-tracking branch 'origin/master'
jwenfai Jan 29, 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
39 changes: 22 additions & 17 deletions xarray/core/groupby.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,23 +259,8 @@ def __init__(self, obj, group, squeeze=False, grouper=None, bins=None,
# TODO: sort instead of raising an error
raise ValueError('index must be monotonic for resampling')
s = pd.Series(np.arange(index.size), index)
from .resample_cftime import CFTimeGrouper
if isinstance(grouper, CFTimeGrouper):
first_items = grouper.first_items(index)
else:
first_items = s.groupby(grouper).first()
_apply_loffset(grouper, first_items)
full_index = first_items.index
if first_items.isnull().any():
if isinstance(grouper, CFTimeGrouper):
index_dict = dict(zip(np.arange(first_items.size),
first_items.index.values))
first_items.index = np.arange(first_items.size)
first_items = first_items.dropna()
first_items.index = [index_dict[i] for i in
first_items.index.values]
else:
first_items = first_items.dropna()
full_index, first_items = self._get_index_and_items(
index, s, grouper)
sbins = first_items.values.astype(np.int64)
group_indices = ([slice(i, j)
for i, j in zip(sbins[:-1], sbins[1:])] +
Expand Down Expand Up @@ -322,6 +307,26 @@ def __len__(self):
def __iter__(self):
return zip(self._unique_coord.values, self._iter_grouped())

def _get_index_and_items(self, index, s, grouper):
from .resample_cftime import CFTimeGrouper
if isinstance(grouper, CFTimeGrouper):
first_items = grouper.first_items(index)
full_index = first_items.index
if first_items.isnull().any():
index_dict = dict(zip(np.arange(first_items.size),
first_items.index.values))
first_items.index = np.arange(first_items.size)
first_items = first_items.dropna()
first_items.index = [index_dict[i] for i in
first_items.index.values]
else:
first_items = s.groupby(grouper).first()
_apply_loffset(grouper, first_items)
full_index = first_items.index
if first_items.isnull().any():
first_items = first_items.dropna()
return full_index, first_items

def _iter_grouped(self):
"""Iterate over each element in this group"""
for indices in self._group_indices:
Expand Down