karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fix an issue of test case testCalculateCalorieCycling.

Browse Source
This commit is contained in:
youtaol
2013-10-16 17:18:20 +08:00
parent 6231cf8663
commit 0b3f5ddca7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/util/CalorieUtils.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class CalorieUtils {
double power = earthGravity * weight * speed * (K1 + grade) + K2 * (speed * speed * speed); double power = earthGravity * weight * speed * (K1 + grade) + K2 * (speed * speed * speed);
// Get the calories in kcal // Get the calories in kcal
return power * timeUsed / UnitConversions.KCAL_TO_J; return power * timeUsed * UnitConversions.J_TO_KCAL;
} }
/** /**
MyTracksTest/src/com/google/android/apps/mytracks/util/CalorieUtilsTest.java
+6 -3
View File
@@ -95,15 +95,18 @@ public class CalorieUtilsTest extends TestCase {
} }
/** /**
* Checks calculating cycling calorie. * Checks calculating cycling calorie. 175 is the watt usage for a 90 kg bike
* + rider to go 9 m/s (20 mph or 32 km/h) on the flat. <a href=
* "http://www.ideafit.com/fitness-library/calculating-caloric-expenditure-0"
* >Reference</a>
*/ */
public void testCalculateCalorieCycling() { public void testCalculateCalorieCycling() {
grade = 0; grade = 0;
weight = 90; weight = 90;
start.setSpeed(9); start.setSpeed(9);
stop.setSpeed(9); stop.setSpeed(9);
double expected = 175 / 1000 / UnitConversions.KCAL_TO_J; double expected = 175.0 * (TIME_INTERVAL / 1000) * UnitConversions.J_TO_KCAL;
double actual = CalorieUtils.calculateCalorieCycling(start, stop, grade, weight); double actual = CalorieUtils.calculateCalorieCycling(start, stop, grade, weight);
assertEquals(expected, actual); assertTrue((actual - expected) / expected < 0.02);
} }
} }