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

Merge tag 'v7.31' into develop

Browse Source 
bug fix
This commit is contained in:
Sander Roosendaal
2018-07-12 15:07:33 +02:00
parent 2a0194c56c 6a3d874ae1
commit 3a5768a500
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/c2stuff.py
View File

@@ -220,10 +220,17 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|'):
velo = totaldist/totaltime velo = totaldist/totaltime
avgpower = 2.8*velo**(3.0) avgpower = 2.8*velo**(3.0)
try:
restvelo = restdistance/resttime restvelo = restdistance/resttime
except (ZeroDivisionError,OverflowError):
restvelo = 0
restpower = 2.8*restvelo**(3.0) restpower = 2.8*restvelo**(3.0)
try:
avgdps = totaldist/data['stroke_count'] avgdps = totaldist/data['stroke_count']
except (ZeroDivisionError,OverflowError,KeyError):
avgdps = 0
from rowingdata import summarystring,workstring,interval_string from rowingdata import summarystring,workstring,interval_string