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

Merge branch 'release/v3.04'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-26 13:39:42 +02:00
parent 960b148149 b408129b68
commit 46d23004b9
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataprep.py
View File

@@ -1129,6 +1129,11 @@ def datafusion(id1,id2,columns,offset):
limit=10) limit=10)
df.fillna(method='bfill',inplace=True) df.fillna(method='bfill',inplace=True)
# Some new stuff to try out
df = df.groupby('time',axis=0).mean()
df['time'] = df.index
df.reset_index(drop=True,inplace=True)
df['time'] = df['time']/1000. df['time'] = df['time']/1000.
df['pace'] = df['pace']/1000. df['pace'] = df['pace']/1000.
df['cum_dist'] = df['cumdist'] df['cum_dist'] = df['cumdist']

2
rowers/sporttracksstuff.py
View File

@@ -279,7 +279,7 @@ def createsporttracksworkoutdata(w):
try: try:
w.notes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com', w.notes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
except TypeError: except TypeError:
w.notes = 'from '+w.workoutsource+' via rowsandall.com' w.notes = 'from '+w.workoutsource+' via rowsandall.com'