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

Merge branch 'release/v14.19' into master

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-21 19:18:36 +02:00
parent 6053b17311 52c15644ba
commit e83289e976
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -1037,6 +1037,8 @@ def fetchcp_new(rower,workouts):
if len(data)>1:
df = pd.concat(data,axis=0)
print(df)
df = df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
@@ -1076,7 +1078,7 @@ def setcp(workout,background=False):
df.to_parquet(filename,engine='fastparquet',compression='GZIP')
return df,delta,cpvalues
return pd.DataFrame(),pd.Series(),pd.Series()
return pd.DataFrame({'delta':[],'cp':[]}),pd.Series(),pd.Series()
def fetchcp(rower,theworkouts,table='cpdata'):