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

3.6.0 for py39

Browse Source
This commit is contained in:
Sander Roosendaal
2023-06-04 16:53:55 +02:00
parent 206ee219f3
commit 1a082d8908
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/dataroutines.py
View File

@@ -1480,7 +1480,7 @@ def datafusion(id1, id2, columns, offset):
'fpace',
'workoutid',
'id'],
1, errors='ignore')
axis=1, errors='ignore')
# Add coordinates to DataFrame
latitude, longitude = get_latlon(id1)
@@ -1503,7 +1503,7 @@ def datafusion(id1, id2, columns, offset):
for c in df1.columns:
if c not in keep1:
df1 = df1.drop(c, 1, errors='ignore')
df1 = df1.drop(c, axis=1, errors='ignore')
df = pd.concat([df1, df2], ignore_index=True)
df = df.sort_values(['time'])
@@ -1512,9 +1512,9 @@ def datafusion(id1, id2, columns, offset):
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 = 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.