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

bug fxe

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-15 22:18:59 +02:00
parent bad036bcec
commit 0f6667da40
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/dataprep.py
View File

@@ -1521,17 +1521,15 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
'CP':cpcp,
})
if powerdf.empty:
return('','<p>No valid data found</p>')
powerdf = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True)
powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True)
powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True)
res = datautils.cpfit(powerdf)
res2 = datautils.cpfit(powerdf)
if len(powerdf) != 0:
p1 = res[0]
p1 = res2[0]
r.p0 = p1[0]
r.p1 = p1[1]
r.p2 = p1[2]
@@ -1553,17 +1551,16 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
'Delta':dd,
'CP':cpcp,
})
if powerdf.empty:
return('','<p>No valid data found</p>')
powerdf = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True)
powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True)
powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True)
res = datautils.cpfit(powerdf)
res2 = datautils.cpfit(powerdf)
if len(powerdf) != 0:
res = datautils.cpfit(powerdf)
p1 = res[0]
p1 = res2[0]
r.ep0 = p1[0]
r.ep1 = p1[1]
r.ep2 = p1[2]
@@ -1599,7 +1596,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
r.user.last_name,
btvalues=btvalues.to_json())
return (w.id, message)
parsers = {