luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-29 00:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jannis 2019-08-24 11:32:21 +02:00
commit b7dc876dbb
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -35,8 +35,8 @@ android {
applicationId "de.tadris.fitness" applicationId "de.tadris.fitness"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 102 versionCode 103
versionName "1.0.2" versionName "1.0.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

30
app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java
View File

@ -41,36 +41,24 @@ public class CalorieCalculator {
* *
* workoutType and avgSpeed of workout have to be set * workoutType and avgSpeed of workout have to be set
* *
* Calculation currently ignores height.
*
* @param workout * @param workout
* @return MET * @return MET
*/ */
public static double getMET(Workout workout){ public static double getMET(Workout workout){
double speedInKmh= workout.avgSpeed * 3.6;
if(workout.workoutType.equals(Workout.WORKOUT_TYPE_RUNNING)){ if(workout.workoutType.equals(Workout.WORKOUT_TYPE_RUNNING)){
if(workout.avgSpeed < 3.2){ // This is a linear graph based on the website linked above
return 1.5; return Math.max(1.5, speedInKmh*1.117 - 2.1906);
}else if(workout.avgSpeed < 4.0){
return 2.5;
}else if(workout.avgSpeed < 4.8){
return 3.25;
}else if(workout.avgSpeed < 5.9){
return 4.0;
}else if(workout.avgSpeed < 7.0){
return 5.0;
}else if(workout.avgSpeed < 8.0){
return 7.0;
}else if(workout.avgSpeed < 9.6){
return 9.0;
}else if(workout.avgSpeed < 12.8){
return 12.0;
}else{
return 16;
}
} }
if(workout.workoutType.equals(Workout.WORKOUT_TYPE_HIKING)){ if(workout.workoutType.equals(Workout.WORKOUT_TYPE_HIKING)){
return 6.3; // Use fixed MET because no more precise calculation was found
return 6.0;
} }
if(workout.workoutType.equals(Workout.WORKOUT_TYPE_CYCLING)){ if(workout.workoutType.equals(Workout.WORKOUT_TYPE_CYCLING)){
return Math.max(3, (workout.avgSpeed-10) / 1.5); // This is a linear graph based on the website linked above
return Math.max(3, (speedInKmh-10) / 1.5);
} }
return -1; return -1;
} }