Added Average/Peak Force Ratio

rowers/dataprep.py

@@ -99,7 +99,9 @@ def dataprep(rowdatadf,bands=False,barchart=False,otwpower=False):
 
     peakforce = rowdatadf.ix[:,' PeakDriveForce (lbs)']
 
-
+    forceratio = averageforce/peakforce
+    forceratio = forceratio.fillna(value=0)
+    
     f = rowdatadf['TimeStamp (sec)'].diff().mean()
     windowsize = 2*(int(10./(f)))+1
     if windowsize <= 3:
@@ -109,6 +111,7 @@ def dataprep(rowdatadf,bands=False,barchart=False,otwpower=False):
 	spm = savgol_filter(spm,windowsize,3)
 	hr = savgol_filter(hr,windowsize,3)
 	drivelength = savgol_filter(drivelength,windowsize,3)
+        forceratio = savgol_filter(forceratio,windowsize,3)
 
     t2 = t.fillna(method='ffill').apply(lambda x: timedeltaconv(x))
 
@@ -117,6 +120,7 @@ def dataprep(rowdatadf,bands=False,barchart=False,otwpower=False):
 
 
     drivespeed = drivelength/rowdatadf[' DriveTime (ms)']*1.0e3
+    drivespeed = drivespeed.fillna(value=0)
     driveenergy = drivelength*averageforce*4.44822
     distance = rowdatadf.ix[:,'cum_dist']
 
@@ -139,6 +143,7 @@ def dataprep(rowdatadf,bands=False,barchart=False,otwpower=False):
 	    averageforce=averageforce,
 	    drivelength=drivelength,
 	    peakforce=peakforce,
+            forceratio=forceratio,
 	    distance=distance,
 	    drivespeed=drivespeed,
 	    )
@@ -186,4 +191,7 @@ def dataprep(rowdatadf,bands=False,barchart=False,otwpower=False):
 	data['fergpace'] = nicepaceformat(ergpace)
 	data['fnowindpace'] = nicepaceformat(nowindpace)
 
+    data = data.replace([-np.inf,np.inf],np.nan)
+    data = data.fillna(method='ffill')
+        
     return data