From 2fc2aa2810a9a3e2215c807fcaad826f570cb40f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 12 Jul 2018 15:43:28 +0200 Subject: [PATCH] preventing infinite recursion --- rowers/dataprep.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 1b54a396..80fc37f1 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1575,7 +1575,8 @@ def testdata(time, distance, pace, spm): # is not in DB, read from CSV file (and create DB entry) -def getrowdata_db(id=0, doclean=False, convertnewtons=True): +def getrowdata_db(id=0, doclean=False, convertnewtons=True, + checkefficiency=True): data = read_df_sql(id) data['x_right'] = data['x_right'] / 1.0e6 data['deltat'] = data['time'].diff() @@ -1591,7 +1592,7 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True): row = Workout.objects.get(id=id) - if not data.empty and data['efficiency'].mean() == 0 and data['power'].mean() != 0: + if not data.empty and data['efficiency'].mean() == 0 and data['power'].mean() != 0 and checkefficiency == True: data = add_efficiency(id=id) if doclean: @@ -1946,7 +1947,10 @@ def fix_newtons(id=0, limit=3000): def add_efficiency(id=0): - rowdata, row = getrowdata_db(id=id, doclean=False, convertnewtons=False) + rowdata, row = getrowdata_db(id=id, + doclean=False, + convertnewtons=False, + checkefficiency=False) power = rowdata['power'] pace = rowdata['pace'] / 1.0e3 velo = 500. / pace