fixing cr

rowers/dataprep.py

@@ -557,6 +557,7 @@ def setcp(workout, background=False, recurrance=True):
                     return(df, df['delta'], df['cp'], df['cr'])
                 except KeyError:
                     return(df, df['delta'], df['cp'], 0*df['cp'])
+                   
     except Exception as e:
         try:
             os.remove(filename)
@@ -772,10 +773,16 @@ def join_workouts(r, ids, title='Joined Workout',
 
 
 
-def fetchcp_new(rower, workouts):
+def fetchcp_new(rower, workouts, spm=False):
 
     data = []
 
+    cpcol = 'cp'
+    cpmin = 20
+    if spm:
+        cpcol = 'cr'
+        cpmin = 5
+
     for workout in workouts:
         df, delta, cpvalues, cpvalues_spm = setcp(workout)
         df = df.drop('id')
@@ -784,6 +791,7 @@ def fetchcp_new(rower, workouts):
         if not df.is_empty():
             data.append(df)
 
+
     if len(data) == 0:
         return pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64), 0, pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64)
     if len(data) > 1:
@@ -793,12 +801,12 @@ def fetchcp_new(rower, workouts):
     try:
         #df = df.group_by(pl.col("delta")).agg(pl.max("cp"), pl.max("workout"), pl.max("url")).sort("delta")
         df = df.groupby('delta').agg([
-            pl.all().sort_by('cp').last(),
+            pl.all().sort_by(cpcol).last(),
         ])
     except (KeyError, ColumnNotFoundError):  # pragma: no cover
         return pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64), 0, pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64)
 
-    df = df.filter(pl.col("cp")>20)
+    df = df.filter(pl.col(cpcol)>cpmin)
 
     try:
         testje = df['cr']

rowers/views/analysisviews.py

@@ -822,9 +822,8 @@ def crdata(workouts, options):
     u = User.objects.get(id=userid)
     r = u.rower
 
-    
     delta, cpvalue, crvalue, avgpower, workoutnames, urls = dataprep.fetchcp_new(
-        r, workouts)
+        r, workouts, spm=True)
 
     powerdf = pl.DataFrame({
         'Delta': delta,
@@ -1183,7 +1182,6 @@ def analysis_view_data(request, userid=0):
             pass
 
 
-
     if function == 'boxplot':
         script, div = boxplotdata(workouts, options)
     elif function == 'trendflex':  # pragma: no cover