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

Merge branch 'release/v10.43'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-31 16:02:33 +01:00
parent 09b57b930c 4bf967195f
commit 2c8a3be795
4 changed files with 103 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/c2stuff.py
View File

@@ -574,6 +574,7 @@ def createc2workoutdata(w):
"time": int(10*makeseconds(durationstr)), "time": int(10*makeseconds(durationstr)),
"weight_class": c2wc(w.weightcategory), "weight_class": c2wc(w.weightcategory),
"comments": w.notes, "comments": w.notes,
"stroke_count": int(row.stroke_count),
'stroke_rate': int(row.df[' Cadence (stokes/min)'].mean()), 'stroke_rate': int(row.df[' Cadence (stokes/min)'].mean()),
'drag_factor': int(row.dragfactor), 'drag_factor': int(row.dragfactor),
"heart_rate": { "heart_rate": {

4
rowers/dataprep.py
View File

@@ -2007,9 +2007,9 @@ def read_df_sql(id):
f = 'media/strokedata_{id}.parquet.gz'.format(id=id) f = 'media/strokedata_{id}.parquet.gz'.format(id=id)
df = pd.read_parquet(f) df = pd.read_parquet(f)
except OSError: except OSError:
rowdata,row = getrowdata(id=ids[0]) rowdata,row = getrowdata(id=id)
if rowdata and len(rowdata.df): if rowdata and len(rowdata.df):
data = dataprep(rowdata.df,id=ids[0],bands=True,otwpower=True,barchart=True) data = dataprep(rowdata.df,id=id,bands=True,otwpower=True,barchart=True)
df = pd.read_parquet(f) df = pd.read_parquet(f)
df = df.fillna(value=0) df = df.fillna(value=0)

7
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
try:
df = pd.concat(data,axis=0) 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')

3
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:
try:
df = indf[indf['distance'] == distance] 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]