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

removing obsolete .ix calls to pandas

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-09 08:52:52 +01:00
parent a5d8dbdf07
commit b88c6e902a
13 changed files with 93 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/tests/test_cpchart.py
View File

@@ -40,7 +40,7 @@ class OTWCPChartTest(TestCase):
row = rdata(a2)
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.)
@@ -124,16 +124,16 @@ class CPChartTest(TestCase):
recordsdf = pd.read_csv('rowers/tests/worldrecords.csv',encoding='utf-8')
for i in range(len(recordsdf)):
for i in recordsdf.index:
record = C2WorldClassAgePerformance(
name = recordsdf.ix[i,'name'],
age = recordsdf.ix[i,'age'],
distance = recordsdf.ix[i,'distance'],
duration = recordsdf.ix[i,'duration'],
power = recordsdf.ix[i,'power'],
season = recordsdf.ix[i,'season'],
sex = recordsdf.ix[i,'sex'],
weightcategory = recordsdf.ix[i,'weightcategory'],
name = recordsdf.loc[i,'name'],
age = recordsdf.loc[i,'age'],
distance = recordsdf.loc[i,'distance'],
duration = recordsdf.loc[i,'duration'],
power = recordsdf.loc[i,'power'],
season = recordsdf.loc[i,'season'],
sex = recordsdf.loc[i,'sex'],
weightcategory = recordsdf.loc[i,'weightcategory'],
)
record.save()
@@ -142,11 +142,11 @@ class CPChartTest(TestCase):
r = self.u.rower
for i in range(len(perfsdf)):
for i in perfsdf.index:
perf = CalcAgePerformance(
age = age,
duration = perfsdf.ix[i,'duration'],
power = perfsdf.ix[i,'power'],
duration = perfsdf.loc[i,'duration'],
power = perfsdf.loc[i,'power'],
sex = r.sex,
weightcategory = r.weightcategory
)