sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

testing refund acknowledgement

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-08 13:01:19 +01:00
parent 319ce56e07
commit fa9632afb1
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/datautils.py
View File

@@ -304,15 +304,16 @@ def getmaxwattinterval(tt,ww,i):
if len(w_roll):
# now goes with # data points - should be fixed seconds
indexmax = w_roll.idxmax(axis=1)
indexmaxpos = indexmax.get_loc(indexmax)
# indexmaxpos = indexmax.get_loc(indexmax)
indexmaxpos = indexmax
try:
t_0 = tt.iloc[indexmaxpos]
t_1 = tt.iloc[indexmaxpos-i]
deltas = tt.iloc[indexmaxpos-i:indexmaxpos].diff().dropna()
t_0 = tt.ix[indexmaxpos]
t_1 = tt.ix[indexmaxpos-i]
deltas = tt.ix[indexmaxpos-i:indexmaxpos].diff().dropna()
testres = 1.0e-3*deltas.max() < 30.
if testres:
deltat = 1.0e-3*(t_0-t_1)
wmax = w_roll.iloc[indexmaxpos]
wmax = w_roll.ix[indexmaxpos]
#if wmax > 800 or wmax*5.0e-4*deltat > 800.0:
# wmax = 0
else: