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

Merge branch 'hotfix/v9.13'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-23 13:46:25 +01:00
parent eeda6389ba c7595b7cb0
commit ebc7bd8c5e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/c2stuff.py
View File

@@ -301,8 +301,12 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|'):
sa += iarr sa += iarr
results += resarr results += resarr
ivelo = idist/itime if itime != 0:
ipower = 2.8*ivelo**(3.0) ivelo = idist/itime
ipower = 2.8*ivelo**(3.0)
else:
ivelo = 0
ipower = 0
sums += interval_string(intervalnr,idist,itime,ipace,ispm, sums += interval_string(intervalnr,idist,itime,ipace,ispm,
iavghr,imaxhr,0,ipower,separator=sep) iavghr,imaxhr,0,ipower,separator=sep)

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

2
rowers/tests/testdata/testdata.tcx vendored
View File

@@ -2502,7 +2502,7 @@
</Trackpoint> </Trackpoint>
</Track> </Track>
</Lap> </Lap>
<Notes>&lt;Element 'Notes' at 0x1913e400&gt;</Notes> <Notes>&lt;Element 'Notes' at 0x11aaf780&gt;</Notes>
</Activity> </Activity>
</Activities> </Activities>
<Creator> <Creator>