From 0c811bdddc8c83a6655dab55322663a0aebf8d6d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 9 Feb 2019 08:57:52 +0100 Subject: [PATCH] final ix replacements --- rowers/plots.py | 2 +- rowers/tests/test_user.py | 2 +- rowers/tests/testdata/testdata.csv.gz | Bin 12525 -> 12525 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/plots.py b/rowers/plots.py index 80786739..7760346c 100644 --- a/rowers/plots.py +++ b/rowers/plots.py @@ -61,7 +61,7 @@ def mkplot(row,title): t = df.loc[:,' ElapsedTime (sec)'] p = df.loc[:,' Stroke500mPace (sec/500m)'] 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)) diff --git a/rowers/tests/test_user.py b/rowers/tests/test_user.py index 9c1e0f4c..d5c05f70 100644 --- a/rowers/tests/test_user.py +++ b/rowers/tests/test_user.py @@ -26,7 +26,7 @@ class UserMiddleWareTest(TestCase): row = rdata(filename,rower=rr) totaldist = row.df['cum_dist'].max() 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.) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 6e683717f97cbd1f4686ea3858e69b182724d389..3d9863b7abfe9086d898c905fe8f1176170b1160 100644 GIT binary patch delta 15 WcmaEx_%@MEzMF%iwS6Poa{~Z1Jq9-b delta 15 WcmaEx_%@MEzMF&NVB1Ev=LP^apayaP