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

final ix replacements

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-09 08:57:52 +01:00
parent b88c6e902a
commit 0c811bdddc
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/plots.py
View File

@@ -61,7 +61,7 @@ def mkplot(row,title):
t = df.loc[:,' ElapsedTime (sec)'] t = df.loc[:,' ElapsedTime (sec)']
p = df.loc[:,' Stroke500mPace (sec/500m)'] p = df.loc[:,' Stroke500mPace (sec/500m)']
hr = df.loc[:,' HRCur (bpm)'] hr = df.loc[:,' HRCur (bpm)']
end_time = int(df.ix[df.shape[0]-1,'TimeStamp (sec)']) end_time = int(df.loc[:,'TimeStamp (sec)'].iloc[df.shape[0]-1])
fig, ax1 = plt.subplots(figsize=(5,4)) fig, ax1 = plt.subplots(figsize=(5,4))

2
rowers/tests/test_user.py
View File

@@ -26,7 +26,7 @@ class UserMiddleWareTest(TestCase):
row = rdata(filename,rower=rr) row = rdata(filename,rower=rr)
totaldist = row.df['cum_dist'].max() totaldist = row.df['cum_dist'].max()
totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min() totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)'] totaltime = totaltime+row.df.loc[:,' ElapsedTime (sec)'].iloc[0]
hours = int(totaltime/3600.) hours = int(totaltime/3600.)

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.