fix obscure bug

rowers/dataprep.py

@@ -1052,7 +1052,7 @@ def setcp(workout,background=False):
         job = myqueue(queuelow,handle_setcp,strokesdf,filename,workout.id)
         return job.id
 
-    
+
 
     if not strokesdf.empty:
         totaltime = strokesdf['time'].max()

rowers/datautils.py

@@ -269,22 +269,24 @@ def getcp(dfgrouped,logarr):
         mask = ww > 2000
         ww.loc[mask] = 0
 
+
+
         tmax = tt.max()
 
 
-        if tmax > 500000:
-            newlen = int(tmax/2000.)
-        else:
-            newlen = len(tt)
-        if newlen < len(tt):
-            newt = np.arange(newlen)*tmax/float(newlen)
-            ww = griddata(tt.values,
-                          ww.values,
-                          newt,method='linear',
-                          rescale=True)
-
-            tt = pd.Series(newt)
-            ww = pd.Series(ww)
+#        if tmax > 3600000:
+#            newlen = int(tmax/10000.)
+#        else:
+#            newlen = len(tt)
+#        if newlen < len(tt):
+#            newt = np.arange(newlen)*tmax/float(newlen)
+#            ww = griddata(tt.values,
+#                          ww.values,
+#                          newt,method='nearest',
+#                          rescale=True)
+#
+#            tt = pd.Series(newt)
+#            ww = pd.Series(ww)
 
 
         try:
@@ -303,7 +305,6 @@ def getcp(dfgrouped,logarr):
                     cpw.append(wmax)
 
 
-
             dt = pd.Series(dt)
             cpw = pd.Series(cpw)
             if len(dt)>2:
@@ -346,7 +347,7 @@ def getmaxwattinterval(tt,ww,i):
             t_0 = tt.loc[indexmaxpos]
             t_1 = tt.loc[indexmaxpos-i]
             deltas = tt.loc[indexmaxpos-i:indexmaxpos].diff().dropna()
-            testres = 1.0e-3*deltas.max() < 30.
+            testres = 1.0e-3*deltas.max() < 30. and not deltas.isnull().values.any()
             if testres:
                 deltat = 1.0e-3*(t_0-t_1)
                 wmax = w_roll.loc[indexmaxpos]

rowers/models.py

@@ -40,6 +40,7 @@ import pandas as pd
 from dateutil import parser
 import datetime
 
+
 #from rules.contrib.models import RulesModel
 
 from rowers.rower_rules import *
@@ -3000,6 +3001,8 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
     except FileNotFoundError:
         pass
 
+    
+
 @receiver(models.signals.post_delete,sender=Workout)
 def update_duplicates_on_delete(sender, instance, **kwargs):
     if instance.id: