refactores FlankDetector, extracts some flank settings

* Improvement of the MovingflankDetector

Simplified the call of the moving flank detector, making it dependent on the settings

* Update MovingFlankDetector.js

Cleaned up the call to the MovingFlankDetector

* Added heartrate data to TCX

* Added parameters for the flankdetector

Added parameters for the flankdetector (flankLength and numberOfErrorsAllowed)

* Gave the RX800 some room as the settings haven't stabilised yet (and I think the recording is with a different damper setting than the source tree)

app/engine/MovingFlankDetector.js

@@ -7,13 +7,13 @@
   Please note: The array contains flankLenght + 1 measured currentDt's, thus flankLenght number of flanks between them
   They are arranged that dataPoints[0] is the youngest, and dataPoints[flankLength] the youngest
 */
-function createMovingFlankDetector (flankLength, initValue, numberOfErrorsAllowed) {
-  const dataPoints = new Array(flankLength + 1)
-  dataPoints.fill(initValue)
+function createMovingFlankDetector (rowerSettings) {
+  const dataPoints = new Array(rowerSettings.flankLength + 1)
+  dataPoints.fill(rowerSettings.maximumTimeBetweenImpulses)
 
   function pushValue (dataPoint) {
     // add the new dataPoint to the array, we have to move datapoints starting at the oldst ones
-    let i = flankLength
+    let i = rowerSettings.flankLength
     while (i > 0) {
       // older datapoints are moved toward the higher numbers
       dataPoints[i] = dataPoints[i - 1]
@@ -23,7 +23,7 @@ function createMovingFlankDetector (flankLength, initValue, numberOfErrorsAllowe
   }
 
   function isDecelerating () {
-    let i = flankLength
+    let i = rowerSettings.flankLength
     let numberOfErrors = 0
     while (i > 0) {
       if (dataPoints[i] < dataPoints[i - 1]) {
@@ -33,7 +33,7 @@ function createMovingFlankDetector (flankLength, initValue, numberOfErrorsAllowe
       }
       i = i - 1
     }
-    if (numberOfErrors > numberOfErrorsAllowed) {
+    if (numberOfErrors > rowerSettings.numberOfErrorsAllowed) {
       return false
     } else {
       return true
@@ -41,7 +41,7 @@ function createMovingFlankDetector (flankLength, initValue, numberOfErrorsAllowe
   }
 
   function isAccelerating () {
-    let i = flankLength
+    let i = rowerSettings.flankLength
     let numberOfErrors = 0
     while (i > 0) {
       if (dataPoints[i] > dataPoints[i - 1]) {
@@ -51,7 +51,7 @@ function createMovingFlankDetector (flankLength, initValue, numberOfErrorsAllowe
       }
       i = i - 1
     }
-    if (numberOfErrors > numberOfErrorsAllowed) {
+    if (numberOfErrors > rowerSettings.numberOfErrorsAllowed) {
       return false
     } else {
       return true

app/engine/RowingEngine.js

@@ -56,7 +56,7 @@ function createRowingEngine (rowerSettings) {
 
   let workoutHandler
   const kDampEstimatorAverager = createWeightedAverager(3)
-  const flankDetector = createMovingFlankDetector(rowerSettings.numOfImpulsesPerRevolution, rowerSettings.maximumTimeBetweenImpulses, 0)
+  const flankDetector = createMovingFlankDetector(rowerSettings)
   let prevDt = rowerSettings.maximumTimeBetweenImpulses
   let kPower = 0.0
   let jPower = 0.0

app/engine/RowingEngine.test.js

@@ -73,8 +73,8 @@ test('sample data for RX800 should produce plausible results with rower profile'
   rowingEngine.notify(workoutEvaluator)
   await replayRowingSession(rowingEngine.handleRotationImpulse, { filename: 'recordings/RX800.csv' })
   assert.is(workoutEvaluator.getNumOfStrokes(), 10, 'number of strokes does not meet expectation')
-  assertPowerRange(workoutEvaluator, 160, 260)
-  assertDistanceRange(workoutEvaluator, 88, 92)
+  assertPowerRange(workoutEvaluator, 160, 270)
+  assertDistanceRange(workoutEvaluator, 78, 92)
 })
 
 function assertPowerRange (evaluator, minPower, maxPower) {

app/server.js

@@ -82,6 +82,9 @@ rowingStatistics.on('strokeFinished', (metrics) => {
   fs.appendFile('exports/currentlog.tcx',
   `<Trackpoint>\n <Time>${timestamp}</Time>\n` +
   `<DistanceMeters>${metrics.distanceTotal}</DistanceMeters>\n` +
+  '<HeartRateBpm>\n' +
+  `  <Value>${metrics.heartrate}</Value>\n` +
+  '</HeartRateBpm>\n' +
   `<Cadence>${Math.round(metrics.strokesPerMinute)}</Cadence>\n` +
   '<SensorState>Present</SensorState>\n' +
   '<Extensions>\n  <ns3:TPX>\n' +

config/rowerProfiles.js

@@ -25,6 +25,8 @@ export default {
     maximumDownwardChange: 0.2, // effectively the maximum deceleration
     maximumUpwardChange: 1.75, // effectively the maximum acceleration
     // Settings for the rowing phase detection (in seconds)
+    flankLength: 1,
+    numberOfErrorsAllowed: 0,
     minimumDriveTime: 0.300,
     minimumRecoveryTime: 0.750,
 
@@ -66,6 +68,8 @@ export default {
     maximumTimeBetweenImpulses: 1,
     maximumDownwardChange: 0.25,
     maximumUpwardChange: 2,
+    flankLength: 2,
+    numberOfErrorsAllowed: 0,
     minimumDriveTime: 0.500,
     minimumRecoveryTime: 0.800,
     omegaDotDivOmegaSquare: 0.046,
@@ -80,6 +84,8 @@ export default {
     maximumTimeBetweenImpulses: 0.5,
     maximumDownwardChange: 0.25,
     maximumUpwardChange: 1.75,
+    flankLength: 2,
+    numberOfErrorsAllowed: 0,
     minimumDriveTime: 0.500,
     minimumRecoveryTime: 0.800,
     omegaDotDivOmegaSquare: 0.019,
@@ -97,6 +103,8 @@ export default {
     maximumTimeBetweenImpulses: 0.0338,
     maximumDownwardChange: 0.69,
     maximumUpwardChange: 1.3,
+    flankLength: 3,
+    numberOfErrorsAllowed: 0,
     minimumDriveTime: 0.300,
     minimumRecoveryTime: 0.750,
     omegaDotDivOmegaSquare: 0.00543660639574872,