Skip to content

ENH: Allow custom frequencies #6473

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
merged 1 commit into from
Feb 25, 2014
Merged

ENH: Allow custom frequencies #6473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions pandas/util/testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,9 @@ def makeFloatIndex(k=10):
return Index(values * (10 ** np.random.randint(0, 9)))


def makeDateIndex(k=10):
def makeDateIndex(k=10, freq='B'):
dt = datetime(2000, 1, 1)
dr = bdate_range(dt, periods=k)
dr = bdate_range(dt, periods=k, freq=freq)
return DatetimeIndex(dr)


Expand Down Expand Up @@ -662,10 +662,10 @@ def getSeriesData():
return dict((c, Series(randn(N), index=index)) for c in getCols(K))


def makeTimeSeries(nper=None):
def makeTimeSeries(nper=None, freq='B'):
if nper is None:
nper = N
return Series(randn(nper), index=makeDateIndex(nper))
return Series(randn(nper), index=makeDateIndex(nper, freq=freq))


def makePeriodSeries(nper=None):
Expand All @@ -674,16 +674,16 @@ def makePeriodSeries(nper=None):
return Series(randn(nper), index=makePeriodIndex(nper))


def getTimeSeriesData(nper=None):
return dict((c, makeTimeSeries(nper)) for c in getCols(K))
def getTimeSeriesData(nper=None, freq='B'):
return dict((c, makeTimeSeries(nper, freq)) for c in getCols(K))


def getPeriodData(nper=None):
return dict((c, makePeriodSeries(nper)) for c in getCols(K))

# make frame
def makeTimeDataFrame(nper=None):
data = getTimeSeriesData(nper)
def makeTimeDataFrame(nper=None, freq='B'):
data = getTimeSeriesData(nper, freq)
return DataFrame(data)


Expand Down