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

equivergpace and nowindpace data

Browse Source
This commit is contained in:
Sander Roosendaal
2016-11-28 09:52:39 +01:00
parent 65ec7640b1
commit 4816c095d0
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/dataprep.py
View File

@@ -114,10 +114,6 @@ 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['ergpace'] = data['ergpace']/1.0e6
# data['nowindpace'] = data['nowindpace']/1.0e6
# data['time'] = data['time']/1.0e6
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)
@@ -133,7 +129,6 @@ 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
return data return data
@@ -249,7 +244,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
return df return df
def dataprep(rowdatadf,id=0,bands=False,barchart=False,otwpower=False): def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True):
rowdatadf.set_index([range(len(rowdatadf))],inplace=True) rowdatadf.set_index([range(len(rowdatadf))],inplace=True)
t = rowdatadf.ix[:,'TimeStamp (sec)'] t = rowdatadf.ix[:,'TimeStamp (sec)']
t = pd.Series(t-rowdatadf.ix[0,'TimeStamp (sec)']) t = pd.Series(t-rowdatadf.ix[0,'TimeStamp (sec)'])
@@ -353,12 +348,12 @@ def dataprep(rowdatadf,id=0,bands=False,barchart=False,otwpower=False):
except KeyError: except KeyError:
equivergpower = 0*p+50. equivergpower = 0*p+50.
nowindpace = nowindpace.apply(lambda x: timedeltaconv(x)) #nowindpace = nowindpace.apply(lambda x: timedeltaconv(x))
ergvelo = (equivergpower/2.8)**(1./3.) ergvelo = (equivergpower/2.8)**(1./3.)
ergpace = 500./ergvelo ergpace = 500./ergvelo
ergpace[ergpace == np.inf] = 240. ergpace[ergpace == np.inf] = 240.
ergpace = ergpace.apply(lambda x: timedeltaconv(x)) #ergpace = ergpace.apply(lambda x: timedeltaconv(x))
data['ergpace'] = ergpace data['ergpace'] = ergpace
data['nowindpace'] = nowindpace data['nowindpace'] = nowindpace