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

bug fix otw power

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-29 16:02:15 +02:00
parent 30aaf6ed77
commit de3825e37c
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/dataprepnodjango.py
View File

@@ -1233,20 +1233,20 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
data['ergpace'] = ergpace*1e3
data['nowindpace'] = nowindpace*1e3
data['ergpace'] = ergpace*1.e3
data['nowindpace'] = nowindpace*1.e3
data['equivergpower'] = equivergpower
data['fergpace'] = nicepaceformat(ergpace2)
data['fnowindpace'] = nicepaceformat(nowindpace2)
data['efficiency'] = efficiency
data = data.replace([-np.inf,np.inf],np.nan)
data = data.fillna(method='ffill')
data.dropna(axis=0,inplace=True,how='all')
data.dropna(axis=1,inplace=True,how='any')
# write data if id given
if id != 0:
data['workoutid'] = id
@@ -1257,14 +1257,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
engine = create_engine(database_url, echo=False)
with engine.connect() as conn, conn.begin():
try:
data.to_sql('strokedata',engine,if_exists='append',index=False)
except:
data.drop(columns=['rhythm'],inplace=True)
try:
data.to_sql('strokedata',engine,if_exists='append',index=False)
except:
pass
data.to_sql('strokedata',engine,if_exists='append',index=False)
conn.close()
engine.dispose()