adding resample function
This commit is contained in:
@@ -285,26 +285,8 @@ def getcp(dfgrouped,logarr):
|
||||
mask = ww > 2000
|
||||
ww.loc[mask] = 0
|
||||
|
||||
|
||||
|
||||
tmax = tt.max()
|
||||
|
||||
|
||||
# if tmax > 3600000:
|
||||
# newlen = int(tmax/10000.)
|
||||
# else:
|
||||
# newlen = len(tt)
|
||||
# if newlen < len(tt):
|
||||
# newt = np.arange(newlen)*tmax/float(newlen)
|
||||
# ww = griddata(tt.values,
|
||||
# ww.values,
|
||||
# newt,method='nearest',
|
||||
# rescale=True)
|
||||
#
|
||||
# tt = pd.Series(newt)
|
||||
# ww = pd.Series(ww)
|
||||
|
||||
|
||||
try:
|
||||
avgpower[id] = int(ww.mean())
|
||||
except ValueError: # pragma: no cover
|
||||
|
||||
Reference in New Issue
Block a user