From 2a9beb7a25052520f67d2ce627d823fdd21183c3 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Wed, 10 Apr 2024 21:37:31 +0200
Subject: [PATCH] dataprep -> plep

---
 rowers/dataprep.py                    |   4 +--
 rowers/dataroutines.py                |  45 +++++++++++++-------------
 rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 4002 bytes
 rowers/views/apiviews.py              |   4 +--
 rowers/views/workoutviews.py          |   4 +--
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index cca3b186..018dc8ae 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -392,7 +392,7 @@ def resample(id, r, parent, overwrite='copy'):
 
         row.write_csv(parent.csvfilename, gzip=True)
 
-        _ = dataprep(row.df, id=parent.id, bands=True, barchart=True,
+        _ = dataplep(row.df, id=parent.id, bands=True, barchart=True,
                      otwpower=True, empower=True, inboard=parent.inboard)
         isbreakthrough, ishard = checkbreakthrough(parent, r)
         _ = check_marker(parent)
@@ -1397,7 +1397,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
             w.team.add(t)
 
     # put stroke data in database
-    _ = dataprep(row.df, id=w.id, bands=True,
+    _ = dataplep(row.df, id=w.id, bands=True,
                  barchart=True, otwpower=True, empower=True, inboard=inboard)
 
     isbreakthrough, ishard = checkbreakthrough(w, r)
diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 085c869a..38f2ccce 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1367,7 +1367,7 @@ def delete_strokedata(id, debug=False):
 
 def update_strokedata(id, df, debug=False):
     delete_strokedata(id, debug=debug)
-    _ = dataprep(df, id=id, bands=True, barchart=True, otwpower=True)
+    _ = dataplep(df, id=id, bands=True, barchart=True, otwpower=True)
 
 # Test that all data are of a numerical time
 
@@ -1395,7 +1395,7 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True,
     if data.empty:
         rowdata, row = getrowdata(id=id)
         if not rowdata.empty: # pragma: no cover
-            data = dataprep(rowdata.df, id=id, bands=True,
+            data = dataplep(rowdata.df, id=id, bands=True,
                             barchart=True, otwpower=True)
         else:
             data = pd.DataFrame()  # returning empty dataframe
@@ -1425,7 +1425,7 @@ def getrowdata_pl(id=0, doclean=False, convertnewtons=True,
     if data.is_empty():
         rowdata, row = getrowdata(id=id)
         if not rowdata.empty: # pragma: no cover
-            data = dataprep(rowdata.df, id=id, bands=True,
+            data = dataplep(rowdata.df, id=id, bands=True,
                             barchart=True, otwpower=True, polars=True)
         else:
             data = pl.DataFrame()  # returning empty dataframe
@@ -1471,7 +1471,7 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
                 except:
                     pass
                 if rowdata and len(rowdata.df):
-                    _ = dataprep(rowdata.df, id=id,
+                    _ = dataplep(rowdata.df, id=id,
                                  bands=True, otwpower=True, barchart=True,
                                  polars=True)
                     try:
@@ -1491,7 +1491,7 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
         except (OSError, IndexError, ArrowInvalid):
             rowdata, row = getrowdata(id=ids[0])
             if rowdata and len(rowdata.df):  # pragma: no cover
-                data = dataprep(
+                data = dataplep(
                     rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
                 try:
                     df = pl.read_parquet(csvfilenames[0], columns=columns)
@@ -1502,7 +1502,7 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
         except:
             rowdata, row = getrowdata(id=ids[0])
             if rowdata and len(rowdata.df):  # pragma: no cover
-                data = dataprep(
+                data = dataplep(
                     rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
                 try:
                     df = pl.read_parquet(csvfilenames[0], columns=columns)
@@ -1554,7 +1554,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
             except (OSError, ArrowInvalid, IndexError):  # pragma: no cover
                 rowdata, row = getrowdata(id=id)
                 if rowdata and len(rowdata.df):
-                    _ = dataprep(rowdata.df, id=id,
+                    _ = dataplep(rowdata.df, id=id,
                                  bands=True, otwpower=True, barchart=True)
                     try:
                         df = pd.read_parquet(f, columns=columns)
@@ -1573,7 +1573,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
         except (OSError, IndexError, ArrowInvalid):
             rowdata, row = getrowdata(id=ids[0])
             if rowdata and len(rowdata.df):  # pragma: no cover
-                data = dataprep(
+                data = dataplep(
                     rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
                 try:
                     df = pd.read_parquet(csvfilenames[0], columns=columns)
@@ -1584,7 +1584,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
         except:
             rowdata, row = getrowdata(id=ids[0])
             if rowdata and len(rowdata.df):  # pragma: no cover
-                data = dataprep(
+                data = dataplep(
                     rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
                 try:
                     df = pd.read_parquet(csvfilenames[0], columns=columns)
@@ -1651,7 +1651,7 @@ def prepmultipledata(ids, verbose=False):  # pragma: no cover
         if verbose:
             print(id)
         if rowdata and len(rowdata.df):
-            _ = dataprep(rowdata.df, id=id, bands=True,
+            _ = dataplep(rowdata.df, id=id, bands=True,
                          barchart=True, otwpower=True)
     return ids
 
@@ -1722,7 +1722,7 @@ def read_cols_df_sql(ids, columns, convertnewtons=True):
         except OSError:
             rowdata, row = getrowdata(id=ids[0])
             if rowdata and len(rowdata.df):
-                _ = dataprep(rowdata.df,
+                _ = dataplep(rowdata.df,
                              id=ids[0], bands=True, otwpower=True, barchart=True)
                 pq_file = pq.ParquetDataset(filename)
                 columns_in_file = [c for c in columns if c in pq_file.schema.names]
@@ -1740,7 +1740,7 @@ def read_cols_df_sql(ids, columns, convertnewtons=True):
             except (OSError, IndexError, ArrowInvalid):
                 rowdata, row = getrowdata(id=id)
                 if rowdata and len(rowdata.df):  # pragma: no cover
-                    _ = dataprep(rowdata.df, id=id,
+                    _ = dataplep(rowdata.df, id=id,
                                  bands=True, otwpower=True, barchart=True)
                     pq_file = pq.ParquetDataset(f)
                     columns_in_file = [c for c in columns if c in pq_file.schema.names]
@@ -1789,7 +1789,7 @@ def read_df_sql(id, polars=False):
             except:
                 pass
             if rowdata and len(rowdata.df):
-                _ = dataprep(rowdata.df, id=id,
+                _ = dataplep(rowdata.df, id=id,
                              bands=True, otwpower=True, barchart=True,
                              polars=True)
                 try:
@@ -1805,7 +1805,7 @@ def read_df_sql(id, polars=False):
     except (OSError, ArrowInvalid, IndexError):  # pragma: no cover
         rowdata, row = getrowdata(id=id)
         if rowdata and len(rowdata.df):
-            data = dataprep(rowdata.df, id=id, bands=True,
+            data = dataplep(rowdata.df, id=id, bands=True,
                             otwpower=True, barchart=True)
             try:
                 df = pd.read_parquet(f)
@@ -1973,7 +1973,9 @@ def add_efficiency(id=0):  # pragma: no cover
 # Takes a rowingdata object's DataFrame as input
 
 # polars
-def dataplep(rowdatadf, id=0, inboard=0.88, forceunit='lbs'):
+def dataplep(rowdatadf, id=0, inboard=0.88, forceunit='lbs', bands=True, barchart=True, otwpower=True,
+             empower=True, debug=False, polars=True
+             ):
     # rowdatadf is pd.DataFrame
     if rowdatadf.empty:
         return 0
@@ -2082,6 +2084,8 @@ def dataplep(rowdatadf, id=0, inboard=0.88, forceunit='lbs'):
         arclength = (inboard - 0.05) * (np.radians(finish) - np.radians(catch))
         if arclength.mean() > 0:
             drivelength = arclength
+        else:
+            drivelength = data['drivelength']
 
         slip = df['slip']
         totalangle = finish - catch
@@ -2108,10 +2112,6 @@ def dataplep(rowdatadf, id=0, inboard=0.88, forceunit='lbs'):
                 peakforceangle = savgol_filter(peakforceangle, windowsize, 3)
             except TypeError:  # pragma: no cover
                 pass
-            try:
-                driveenergy = savgol_filter(driveenergy, windowsize, 3)
-            except TypeError:  # pragma: no cover
-                pass
             try:
                 drivelength = savgol_filter(drivelength, windowsize, 3)
             except TypeError:  # pragma: no cover
@@ -2131,7 +2131,6 @@ def dataplep(rowdatadf, id=0, inboard=0.88, forceunit='lbs'):
             slip = slip,
             finish = finish,
             peakforceangle = peakforceangle,
-            driveenergy = driveenergy,
             drivelength = drivelength,
             totalangle = totalangle,
             effectiveangle = effectiveangle,
@@ -2598,7 +2597,7 @@ def add_c2_stroke_data_db(strokedata, workoutid, starttimeunix, csvfilename,
                     compression='gzip')
 
 
-    data = dataprep(df, id=workoutid, bands=False, debug=debug)
+    data = dataplep(df, id=workoutid, bands=False, debug=debug)
 
     return data
 
@@ -2666,7 +2665,7 @@ def create_c2_stroke_data_db(
 
     _ = df.to_csv(csvfilename, index_label='index', compression='gzip')
 
-    data = dataprep(df, id=workoutid, bands=False, debug=debug)
+    data = dataplep(df, id=workoutid, bands=False, debug=debug)
 
     return data
 
@@ -2705,7 +2704,7 @@ def update_empower(id, inboard, oarlength, boattype, df, f1, debug=False):  # pr
         if debug:  # pragma: no cover
             print("not updated ", id)
 
-    _ = dataprep(df, id=id, bands=True, barchart=True, otwpower=True, debug=debug)
+    _ = dataplep(df, id=id, bands=True, barchart=True, otwpower=True, debug=debug)
 
     row = rrdata(df=df)
     row.write_csv(f1, gzip=True)
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index db6565d3c122e8c9a176a06b2f7a51a8007b87cb..62b2f5931143a4b2872cff35338cfaf73f70a23d 100644
GIT binary patch
literal 4002
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
I(8PcN0ODmi0RR91

literal 4001
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
H#DD<+aDYFZ

diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index 43f8d257..1f2f87bb 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -743,7 +743,7 @@ def strokedatajson_v2(request, id):
                     powerperc=powerperc, powerzones=r.powerzones)
         rowdata = rdata(csvfile=row.csvfilename, rower=rr).df
 
-        datadf = dataprep.dataprep(
+        datadf = dataprep.dataplep(
             rowdata, id=row.id, bands=True, barchart=True, otwpower=True, empower=True)
 
         _ = myqueue(queuehigh, handle_calctrimp, row.id,
@@ -910,7 +910,7 @@ def strokedatajson(request, id=0):
                     powerperc=powerperc, powerzones=r.powerzones)
         rowdata = rdata(csvfile=row.csvfilename, rower=rr).df
 
-        datadf = dataprep.dataprep(
+        datadf = dataprep.dataplep(
             rowdata, id=row.id, bands=True, barchart=True, otwpower=True, empower=True)
         # mangling
 
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 2d871868..e7a951ee 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -1293,7 +1293,7 @@ def remove_power_view(request, id=0):
     row = rdata(csvfile=f, rower=rr)
     row.df[' Power (watts)'] = 0
     row.write_csv(f)
-    _ = dataprep.dataprep(row.df, id=workout.id)
+    _ = dataprep.dataplep(row.df, id=workout.id)
     cpdf, delta, cpvalues = dataprep.setcp(workout)
 
     workout.normp = 0
@@ -3599,7 +3599,7 @@ def workout_erase_column_view(request, id=0, column=''):
         row.write_csv(w.csvfilename, gzip=True)
 
         row, workout = dataprep.getrowdata(id=w.id)
-        _ = dataprep.dataprep(row.df, id=w.id)
+        _ = dataprep.dataplep(row.df, id=w.id)
 
         if column == 'hr':
             w.hrtss = 0