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

Merge branch 'hotfix/gzipped'

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-08 21:55:19 +01:00
parent 7817de6f3d ed6790387b
commit 00850cd90a
5 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/dataprep.py
View File

@@ -117,6 +117,9 @@ def repair_data(verbose=False):
def rdata(file,rower=rrower()):
try:
res = rrdata(file,rower=rower)
except IOError:
try:
res = rrdata(file+'.gz',rower=rower)
except IOError:
res = 0
@@ -271,6 +274,17 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
try:
rowdata = dataprep(rrdata(f1).df)
rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2],
'distance': rowdata['distance'],
'spm': rowdata['spm'],
}
)
df = pd.concat([df,rowdata],ignore_index=True)
except IOError:
try:
rowdata = dataprep(rrdata(f1+'.gz').df)
rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2],

14
rowers/dataprepnodjango.py
View File

@@ -81,6 +81,9 @@ def timedeltaconv(x):
def rdata(file,rower=rrower()):
try:
res = rrdata(file,rower=rower)
except IOError:
try:
res = rrdata(file+'.gz',rower=rower)
except IOError:
res = 0
@@ -211,6 +214,17 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
try:
rowdata = dataprep(rrdata(f1).df)
rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2],
'distance': rowdata['distance'],
'spm': rowdata['spm'],
}
)
df = pd.concat([df,rowdata],ignore_index=True)
except IOError:
try:
rowdata = dataprep(rrdata(f1+'.gz').df)
rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2],

3
rowers/mailprocessing.py
View File

@@ -38,6 +38,9 @@ def send_confirm(u,name,link):
def rdata(file,rower=rrower()):
try:
res = rrdata(file,rower=rower)
except IOError:
try:
res = rrdata(file+'.gz',rower=rower)
except IOError:
res = 0

8
rowers/tasks.py
View File

@@ -98,7 +98,11 @@ def handle_sendemailcsv(first_name,last_name,email,csvfile):
def handle_otwsetpower(f1,boattype,weightvalue,
first_name,last_name,email,workoutid,
debug=False):
try:
rowdata = rdata(f1)
except IOError:
rowdata = rdata(f1+'.csv')
weightvalue = float(weightvalue)
# do something with boat type
@@ -165,7 +169,11 @@ def handle_makeplot(f1,f2,t,hrdata,plotnr,imagename):
rr = rowingdata.rower(hrmax=hrmax,hrut2=hrut2,
hrut1=hrut1,hrat=hrat,
hrtr=hrtr,hran=hran)
try:
row = rdata(f2,rower=rr)
except IOError:
row = rdata(f2+'.gz',rower=rr)
nr_rows = len(row.df)
if (plotnr in [1,2,4,5,8,11,9,12]) and (nr_rows > 1200):
bin = int(nr_rows/1200.)

3
rowers/views.py
View File

@@ -130,6 +130,9 @@ def error403_view(request):
def rdata(file,rower=rrower()):
try:
res = rrdata(file,rower=rower)
except IOError:
try:
res = rrdata(file+'.gz',rower=rower)
except IOError:
res = 0