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

adding tests for new analysis

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-25 10:06:29 +02:00
parent 2ec230fb98
commit f4e72923b9
4 changed files with 21924 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/tests/mocks.py
View File

@@ -174,7 +174,7 @@ def mocked_getsmallrowdata_db(*args, **kwargs):
return df return df
def mocked_read_cols_df_sql(*args, **kwargs): def mocked_read_cols_df_sql(*args, **kwargs):
df = pd.read_csv('rowers/tests/testdata/colsfromdb.csv') df = pd.read_csv('rowers/tests/testdata/readcols.csv')
return df,[] return df,[]

2
rowers/tests/test_analysis.py
View File

@@ -1075,7 +1075,7 @@ class WorkoutStatsTestNew(TestCase):
workouts = self.user_workouts workouts = self.user_workouts
script, div = boxplotdata(workouts,options) script, div = boxplotdata(workouts,options)
# script, div = trendflexdata(workouts,options) script, div = trendflexdata(workouts,options)
# script, div = histodata(workouts,options) # script, div = histodata(workouts,options)
script, div = flexalldata(workouts,options) script, div = flexalldata(workouts,options)
script, div = statsdata(workouts,options) script, div = statsdata(workouts,options)

21921
rowers/tests/testdata/readcols.csv vendored Normal file
View File

File diff suppressed because it is too large Load Diff

7
rowers/views/analysisviews.py
View File

@@ -325,12 +325,7 @@ def trendflexdata(workouts, options,userid=0):
binsize) binsize)
groups = datadf.groupby(pd.cut(datadf[groupby],bins,labels=False)) groups = datadf.groupby(pd.cut(datadf[groupby],bins,labels=False))
except ValueError: except ValueError:
messages.error( return ('','Error: not enough data')
request,
"Unable to compete. Probably not enough data selected"
)
url = reverse(user_multiflex_select)
return HttpResponseRedirect(url)
else: else:
bins = np.arange(datadf['days ago'].min()-binsize, bins = np.arange(datadf['days ago'].min()-binsize,
datadf['days ago'].max()+binsize, datadf['days ago'].max()+binsize,