Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pandas/core/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def __new__(cls, *args, **kwargs):
cls = TimeGrouper
return super(Grouper, cls).__new__(cls)

def __init__(self, key=None, level=None, freq=None, axis=None, sort=True):
def __init__(self, key=None, level=None, freq=None, axis=None, sort=False):
self.key=key
self.level=level
self.freq=freq
Expand Down Expand Up @@ -201,7 +201,7 @@ def get_grouper(self, obj):
self.set_grouper(obj)
return self.binner, self.grouper, self.obj

def set_grouper(self, obj):
def set_grouper(self, obj, sort=False):
"""
given an object and the specifcations, setup the internal grouper for this particular specification

Expand Down Expand Up @@ -243,7 +243,7 @@ def set_grouper(self, obj):
raise ValueError("The grouper level {0} is not valid".format(level))

# possibly sort
if not ax.is_monotonic:
if (self.sort or sort) and not ax.is_monotonic:
indexer = self.indexer = ax.argsort(kind='quicksort')
ax = ax.take(indexer)
obj = obj.take(indexer, axis=self.axis, convert=False, is_copy=False)
Expand Down Expand Up @@ -1608,6 +1608,7 @@ def __init__(self, index, grouper=None, obj=None, name=None, level=None,
self.grouper = _convert_grouper(index, grouper)
self.index = index
self.sort = sort
self.obj = obj

# right place for this?
if isinstance(grouper, (Series, Index)) and name is None:
Expand Down Expand Up @@ -1684,7 +1685,8 @@ def __init__(self, index, grouper=None, obj=None, name=None, level=None,
elif isinstance(self.grouper, Grouper):

# get the new grouper
grouper = self.grouper.get_binner_for_grouping(obj)
grouper = self.grouper.get_binner_for_grouping(self.obj)
self.obj = self.grouper.obj
self.grouper = grouper
if self.name is None:
self.name = grouper.name
Expand Down
5 changes: 4 additions & 1 deletion pandas/core/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,10 @@ def argsort(self, *args, **kwargs):
"""
See docstring for ndarray.argsort
"""
return self.view(np.ndarray).argsort(*args, **kwargs)
result = self.asi8
if result is None:
result = self.view(np.ndarray)
return result.argsort(*args, **kwargs)

def __add__(self, other):
if isinstance(other, Index):
Expand Down
4 changes: 2 additions & 2 deletions pandas/tseries/resample.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ def __init__(self, freq='Min', closed=None, label=None, how='mean',
self.limit = limit
self.base = base

# by definition we always sort
# always sort time groupers
kwargs['sort'] = True

super(TimeGrouper, self).__init__(freq=freq, axis=axis, **kwargs)

def resample(self, obj):
self.set_grouper(obj)
self.set_grouper(obj, sort=True)
ax = self.grouper

if isinstance(ax, DatetimeIndex):
Expand Down