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

passing some tests on py3, all on py2

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-25 21:03:30 +01:00
parent 199382a700
commit 617f1e5d9f
13 changed files with 56 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -913,7 +913,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
try:
checks = row.check_consistency()
allchecks = 1
for key, value in checks.iteritems():
for key, value in checks.items():
if not value:
allchecks = 0
if consistencychecks:
@@ -2093,7 +2093,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
if rowdatadf.empty:
return 0
rowdatadf.set_index([range(len(rowdatadf))], inplace=True)
#rowdatadf.set_index([range(len(rowdatadf))], inplace=True)
t = rowdatadf.loc[:, 'TimeStamp (sec)']
t = pd.Series(t - rowdatadf.loc[:, 'TimeStamp (sec)'].iloc[0])