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

gzipped

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-08 21:50:49 +01:00
parent 7817de6f3d
commit 2bff507c2d
4 changed files with 40 additions and 6 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()): def rdata(file,rower=rrower()):
try: try:
res = rrdata(file,rower=rower) res = rrdata(file,rower=rower)
except IOError:
try:
res = rrdata(file+'.gz',rower=rower)
except IOError: except IOError:
res = 0 res = 0
@@ -271,6 +274,17 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
try: try:
rowdata = dataprep(rrdata(f1).df) 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], rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1], yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2], yparam2: rowdata[yparam2],

14
rowers/dataprepnodjango.py
View File

@@ -81,6 +81,9 @@ def timedeltaconv(x):
def rdata(file,rower=rrower()): def rdata(file,rower=rrower()):
try: try:
res = rrdata(file,rower=rower) res = rrdata(file,rower=rower)
except IOError:
try:
res = rrdata(file+'.gz',rower=rower)
except IOError: except IOError:
res = 0 res = 0
@@ -211,6 +214,17 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
try: try:
rowdata = dataprep(rrdata(f1).df) 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], rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1], yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2], yparam2: rowdata[yparam2],

3
rowers/mailprocessing.py
View File

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

3
rowers/views.py
View File

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