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

Merge branch 'develop' into feature/testcoverage3

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-23 14:05:43 +01:00
parent 6d4823d73c 2e2159778b
commit 5b9b756fef
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/c2stuff.py
View File

@@ -300,10 +300,14 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|'):
sa += iarr sa += iarr
results += resarr results += resarr
if itime != 0:
ivelo = idist/itime
ipower = 2.8*ivelo**(3.0)
else:
ivelo = 0
ipower = 0
ivelo = idist/itime
ipower = 2.8*ivelo**(3.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)
intervalnr+=1 intervalnr+=1

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

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