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

small bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-31 15:46:25 +01:00
parent 3f0f8e69b0
commit 473f2b3cdf
2 changed files with 98 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/dataprepnodjango.py
View File

@@ -166,7 +166,7 @@ def create_c2_stroke_data_db(
try: try:
spm = 60.*nr_strokes/totalseconds spm = 60.*nr_strokes/totalseconds
except ZeroDivisionError: except ZeroDivisionError:
spm = 20*zeros(nr_strokes) spm = 20*np.zeros(nr_strokes)
step = totalseconds/float(nr_strokes) step = totalseconds/float(nr_strokes)
@@ -713,7 +713,7 @@ def getsmallrowdata_db(columns,ids=[],debug=False):
columns = [c for c in columns if c != 'None'] columns = [c for c in columns if c != 'None']
if len(ids)>1: if len(ids)>1:
for f in csvfilenames: for id, f in zip(ids,csvfilenames):
try: try:
df = pd.read_parquet(f,columns=columns,engine='pyarrow') df = pd.read_parquet(f,columns=columns,engine='pyarrow')
data.append(df) data.append(df)
@@ -721,7 +721,10 @@ def getsmallrowdata_db(columns,ids=[],debug=False):
pass pass
df = pd.concat(data,axis=0) try:
df = pd.concat(data,axis=0)
except ValueError:
df = pd.DataFrame()
else: else:
df = pd.read_parquet(csvfilenames[0],columns=columns,engine='pyarrow') df = pd.read_parquet(csvfilenames[0],columns=columns,engine='pyarrow')

5
rowers/tasks.py
View File

@@ -191,7 +191,10 @@ def getagegrouprecord(age,sex='male',weightcategory='hwt',
distance=2000,duration=None,indf=pd.DataFrame()): distance=2000,duration=None,indf=pd.DataFrame()):
if not duration: if not duration:
df = indf[indf['distance'] == distance] try:
df = indf[indf['distance'] == distance]
except KeyError:
df = pd.DataFrame()
else: else:
duration = 60*int(duration) duration = 60*int(duration)
df = indf[indf['duration'] == duration] df = indf[indf['duration'] == duration]