Merge pull request #25 from NOHrD-Waterrower/resistancefix

Properly deal with equal low and high calibration values
NOHrD-Waterrower · Nov 27, 2020 · 8782124 · 8782124
2 parents 6aa1418 + f3a4c6b
commit 8782124
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/sdk/src/main/kotlin/com/nohrd/bike/sdk/internal/math/resistance/ResistanceCalculator.kt b/sdk/src/main/kotlin/com/nohrd/bike/sdk/internal/math/resistance/ResistanceCalculator.kt
@@ -9,6 +9,8 @@ internal class ResistanceCalculator(
 ) {
 
     fun calculateResistance(resistanceMeasurement: ResistanceMeasurement): Resistance {
+        if (calibration.highValue == calibration.lowValue) return Resistance.from(0f)
+
         return Resistance.from(
             (resistanceMeasurement.value - calibration.lowValue.value)
                 .div((calibration.highValue.value - calibration.lowValue.value).toFloat())

diff --git a/sdk/src/test/kotlin/com/nohrd/bike/sdk/internal/math/resistance/ResistanceCalculatorTest.kt b/sdk/src/test/kotlin/com/nohrd/bike/sdk/internal/math/resistance/ResistanceCalculatorTest.kt
@@ -74,4 +74,21 @@ internal class ResistanceCalculatorTest {
         /* Then */
         expect(result).toBe(Resistance.from(100f))
     }
+
+    @Test
+    fun `equal low and high calibration results in 0 resistance`() {
+        /* Given */
+        val calculator = ResistanceCalculator(
+            Calibration(
+                lowValue = ResistanceMeasurement(100),
+                highValue = ResistanceMeasurement(100),
+            )
+        )
+
+        /* When */
+        val result = calculator.calculateResistance(ResistanceMeasurement(100))
+
+        /* Then */
+        expect(result).toBe(Resistance.from(0f))
+    }
 }