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

Merge branch 'release/v14.89'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-28 17:25:04 +01:00
parent 1b5693826c c497e17f1f
commit eba9fdaf0a
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rowers/dataprep.py
View File

@@ -545,7 +545,16 @@ def df_resample(datadf):
def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True, def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
ignoreadvanced=False): ignoreadvanced=False):
# clean data remove zeros and negative values # clean data remove zeros and negative values
before = len(datadf)
try:
workoutids = datadf['workoutid'].unqiue()
except (KeyError,AttributeError):
datadf['workoutid'] = 0
before = {}
for workoutid in datadf['workoutid'].unique():
before[workoutid] = len(datadf[datadf['workoutid']==workoutid])
data_orig = datadf.copy() data_orig = datadf.copy()
@@ -790,11 +799,14 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
except: except:
pass pass
after = len(datadf.dropna()) after = {}
ratio = float(after)/float(before) for workoutid in data_orig['workoutid'].unique():
after[workoutid] = len(datadf[datadf['workoutid']==workoutid].dropna())
ratio = float(after[workoutid])/float(before[workoutid])
if ratio < 0.01 or after < 2:
return data_orig if ratio < 0.01 or after < 2:
return data_orig
return datadf return datadf

6
rowers/tests/test_units.py
View File

@@ -74,7 +74,7 @@ class ForceUnits(TestCase):
df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13]) df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
average_N = int(df['averageforce'].mean()) average_N = int(df['averageforce'].mean())
self.assertEqual(average_N,399) self.assertEqual(average_N,398)
data = dataprep.read_df_sql(13) data = dataprep.read_df_sql(13)
average_N = int(data['averageforce'].mean()) average_N = int(data['averageforce'].mean())
@@ -122,7 +122,7 @@ class ForceUnits(TestCase):
df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13]) df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
average_N = int(df['averageforce'].mean()) average_N = int(df['averageforce'].mean())
self.assertEqual(average_N,267) self.assertEqual(average_N,263)
def test_upload_speedcoach_colin(self): def test_upload_speedcoach_colin(self):
login = self.c.login(username=self.u.username, password=self.password) login = self.c.login(username=self.u.username, password=self.password)
@@ -158,7 +158,7 @@ class ForceUnits(TestCase):
df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13]) df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
average_N = int(df['averageforce'].mean()) average_N = int(df['averageforce'].mean())
self.assertEqual(average_N,113) self.assertEqual(average_N,105)
@override_settings(TESTING=True) @override_settings(TESTING=True)
class TestForceUnit(TestCase): class TestForceUnit(TestCase):