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

fixed time weighted mean bug

Browse Source 
Please enter the commit message for your changes. Lines starting
This commit is contained in:
Sander Roosendaal
2018-03-06 20:34:48 +01:00
parent d80e7d8f04
commit 6b5a76242d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/dataprep.py
View File

@@ -1634,6 +1634,7 @@ def testdata(time, distance, pace, spm):
def getrowdata_db(id=0, doclean=False, convertnewtons=True): def getrowdata_db(id=0, doclean=False, convertnewtons=True):
data = read_df_sql(id) data = read_df_sql(id)
data['x_right'] = data['x_right'] / 1.0e6 data['x_right'] = data['x_right'] / 1.0e6
data['deltat'] = data['time'].diff()
if data.empty: if data.empty:
rowdata, row = getrowdata(id=id) rowdata, row = getrowdata(id=id)

3
rowers/views.py
View File

@@ -1762,7 +1762,6 @@ def workouts_summaries_email_view(request):
first=startdate, first=startdate,
last=enddate last=enddate
) )
print filename
df = dataprep.workout_summary_to_df(r,startdate=startdate,enddate=enddate) df = dataprep.workout_summary_to_df(r,startdate=startdate,enddate=enddate)
df.to_csv(filename,encoding='utf-8') df.to_csv(filename,encoding='utf-8')
res = myqueue(queuehigh,handle_sendemailsummary, res = myqueue(queuehigh,handle_sendemailsummary,
@@ -7535,7 +7534,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
if datadf.empty: if datadf.empty:
return HttpResponse("CSV data file not found") return HttpResponse("CSV data file not found")
datadf['deltat'] = datadf['time'].diff() #datadf['deltat'] = datadf['time'].diff()
workoutstateswork = [1,4,5,8,9,6,7] workoutstateswork = [1,4,5,8,9,6,7]