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

Merge tag 'pacetimevals' into develop

Browse Source 
hotfix dataprep values
This commit is contained in:
Sander Roosendaal
2016-11-27 19:15:57 +01:00
parent 4c545bed3b b700f8aa9a
commit b2267ca524
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rowers/dataprep.py
View File

@@ -104,10 +104,12 @@ def testdata(time,distance,pace,spm):
def getrowdata_db(id=0): def getrowdata_db(id=0):
data = read_df_sql(id) data = read_df_sql(id)
data['pace'] = data['pace']/1.0e6 # data['pace'] = data['pace']/1.0e6
data['ergpace'] = data['ergpace']/1.0e6 # data['ergpace'] = data['ergpace']/1.0e6
data['nowindpace'] = data['nowindpace']/1.0e6 # data['nowindpace'] = data['nowindpace']/1.0e6
data['time'] = data['time']/1.0e6 # data['time'] = data['time']/1.0e6
data['pace'] = data['pseconds']*1.0e3
data['time'] = data['timesecs']*1.0e3
data['x_right'] = data['x_right']/1.0e6 data['x_right'] = data['x_right']/1.0e6
if data.empty: if data.empty:
rowdata,row = getrowdata(id=id) rowdata,row = getrowdata(id=id)
@@ -123,13 +125,14 @@ def getrowdata_db(id=0):
def getsmallrowdata_db(columns,ids=[]): def getsmallrowdata_db(columns,ids=[]):
prepmultipledata(ids) prepmultipledata(ids)
data = read_cols_df_sql(ids,columns) data = read_cols_df_sql(ids,columns)
print columns
for column in columns: for column in columns:
if column == 'time': if column == 'time':
data['time'] = data['time']/1.0e6 data['time'] = data['timesecs']*1.0e3
# data['time'] = data['time']/1.0e6
if column == 'pace': if column == 'pace':
data['pace'] = data['pace']/1.0e6 # data['pace'] = data['pace']/1.0e6
if column == 'pace': data['pace'] = data['pseconds']*1.0e3
data['pace'] = data['pace']/1.0e6
return data return data