From 1acad5dbf197b30552b458246329411af5767333 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 23 May 2017 17:12:32 +0200 Subject: [PATCH 1/2] fixed tuple in notes --- rowers/sporttracksstuff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/sporttracksstuff.py b/rowers/sporttracksstuff.py index 8711c738..06718912 100644 --- a/rowers/sporttracksstuff.py +++ b/rowers/sporttracksstuff.py @@ -279,7 +279,7 @@ def createsporttracksworkoutdata(w): 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: w.notes = 'from '+w.workoutsource+' via rowsandall.com' From b408129b6860be9b62a5bb1e98968ea79e420264 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 25 May 2017 17:20:52 +0200 Subject: [PATCH 2/2] added unduplication --- rowers/dataprep.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e67aa895..708c3d16 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1128,6 +1128,11 @@ def datafusion(id1,id2,columns,offset): df = df.interpolate(method='linear',axis=0,limit_direction='both', limit=10) 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['pace'] = df['pace']/1000.