From b4afba8a9c07165f4aa6fddd9f823b5d59c66155 Mon Sep 17 00:00:00 2001 From: jannis Date: Wed, 4 Dec 2019 21:47:15 +0100 Subject: [PATCH] Better calorie calculation --- .../main/java/de/tadris/fitness/util/CalorieCalculator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java b/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java index 3a50270..388c5d9 100644 --- a/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java +++ b/app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java @@ -33,7 +33,8 @@ public class CalorieCalculator { */ public static int calculateCalories(Workout workout, double weight){ double mins= (double)(workout.duration / 1000) / 60; - return (int)(mins * (getMET(workout) * 3.5 * weight) / 200); + int ascent= (int)workout.ascent; // 1 calorie per meter + return (int)(mins * (getMET(workout) * 3.5 * weight) / 200) + ascent; } /**