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

Change code style.

Browse Source
This commit is contained in:
youtaol
2013-08-19 11:30:56 +08:00
parent 4cf647b02c
commit cbd6d8158a
11 changed files with 97 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java
+1 -1
View File
@@ -133,7 +133,7 @@ public class MyTracksProvider extends ContentProvider {
if (oldVersion <= 22) {
Log.w(TAG, "Upgrade DB: Adding track calories column.");
db.execSQL("ALTER TABLE " + TracksColumns.TABLE_NAME + " ADD " + TracksColumns.CALORIES
db.execSQL("ALTER TABLE " + TracksColumns.TABLE_NAME + " ADD " + TracksColumns.CALORIE
+ " INTEGER");
}
}
MyTracks/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java
+3 -2
View File
@@ -193,9 +193,10 @@ public class TripStatisticsUpdater {
// TODO 1: How to get the value of weight.
// TODO 2: How to get the value of ActivityType.
double value = CalorieUtils.getCalories(lastMovingLocation, location,
// Update calorie
double calorie = CalorieUtils.getCalories(lastMovingLocation, location,
gradeBuffer.getAverage(), 65, ActivityType.FOOT);
currentSegment.addCaloticExpenditure(value);
currentSegment.addCalorie(calorie);
lastLocation = location;
lastMovingLocation = location;
MyTracks/src/com/google/android/apps/mytracks/util/CalorieUtils.java
+35 -36
View File
@@ -39,11 +39,16 @@ public class CalorieUtils {
*/
private static final double VO2H_TO_KCAL = 5;
private static final double MILLISECOND_TO_SECOND = 1000.0;
private static final double MILLILITER_TO_LITER = 1000.0;
private static final double SECOND_TO_MINUTE = 60.0;
/**
* Changes 4.5 miles per hour to meters per minutes.
*/
@VisibleForTesting
static final double CRTICAL_SPEED_RUNNING = 4.5 * UnitConversions.MI_TO_KM * 1000 / 60;
static final double CRTICAL_SPEED_RUNNING = 4.5 * UnitConversions.MI_TO_KM * 1000
/ SECOND_TO_MINUTE;
public enum ActivityType {
CYCLING, FOOT
@@ -56,7 +61,7 @@ public class CalorieUtils {
*
* @param speed is calculated in meters per minute (m/min)
* @param grade
* @return the VO2 value in ml/kg/min
* @return the VO2 value in ml/kg/min.
*/
@VisibleForTesting
static double calculateWalkingVO2(double speed, double grade) {
@@ -75,7 +80,7 @@ public class CalorieUtils {
*
* @param speed is calculated in meters per minute (m/min)
* @param grade
* @return the VO2 value in ml/kg/min
* @return the VO2 value in ml/kg/min.
*/
@VisibleForTesting
static double calculateRunningVO2(double speed, double grade) {
@@ -108,13 +113,13 @@ public class CalorieUtils {
* @param grade the grade to calculate
* @param weight of rider plus bike
* @param timeUsed how many times used in second
* @return the power value watts(Joule/second)
* @return the power value watts(Joule/second).
*/
@VisibleForTesting
static double calculateCyclingCalories(double speed, double grade, int weight, double timeUsed) {
// Get the Power.
// Get the Power
double power = 9.8 * weight * speed * (0.0053 + grade) + 0.185 * (speed * speed * speed);
// Get the calories.
// Get the calories
return power * timeUsed / UnitConversions.KCAL_TO_J;
}
@@ -125,16 +130,16 @@ public class CalorieUtils {
* @param stop the stop location
* @param grade the grade to calculate
* @param weight the weight of user
* @return the calories expenditure between the start and stop location
* @return the calories expenditure between the start and stop location.
*/
@VisibleForTesting
static double calculateExpenditureCycling(Location start, Location stop, double grade, int weight) {
// Seconds.
double time = (double) (stop.getTime() - start.getTime()) / 1000;
// Meter per second.
double speed = (start.getSpeed() + stop.getSpeed()) / 2;
// Gets time in seconds
double time = (double) (stop.getTime() - start.getTime()) / MILLISECOND_TO_SECOND;
// Meters per second
double speed = (start.getSpeed() + stop.getSpeed()) / 2.0;
if (grade < 0) {
grade = 0;
grade = 0.0;
}
return calculateCyclingCalories(speed, grade, weight, time);
@@ -147,45 +152,39 @@ public class CalorieUtils {
* @param stop the stop location
* @param grade the grade to calculate
* @param weight the weight of user
* @return the calories expenditure between the start and stop location
* @return the calories expenditure between the start and stop location.
*/
@VisibleForTesting
static double calculateExpenditureFoot(Location start, Location stop, double grade, int weight) {
// Meter per minute.
double speed = (start.getSpeed() + stop.getSpeed()) * 60 / 2;
// Meters per minute
double averageSpeed = (start.getSpeed() + stop.getSpeed()) * SECOND_TO_MINUTE / 2.0;
// Get VO2
double VO2 = getVO2(speed, grade);
// Seconds.
double time = (double) (stop.getTime() - start.getTime()) / 1000;
// Change mL/kg/min to mL/kg.
double VO2All = VO2 * time / 60;
// Change mL/kg to L/kg.
VO2All = VO2All / 1000;
// Get the calorie.
return VO2All * weight * VO2H_TO_KCAL;
double VO2 = getVO2(averageSpeed, grade);
// Seconds
double time = (double) (stop.getTime() - start.getTime()) / MILLISECOND_TO_SECOND;
// Change mL/kg/min to mL/kg
double VO2All_mL = VO2 * time / SECOND_TO_MINUTE;
// Change mL/kg to L/kg
double VO2All_L = VO2All_mL / MILLILITER_TO_LITER;
// Get the calorie
return VO2All_L * weight * VO2H_TO_KCAL;
}
/**
* Gets the VO2 value.
*
* @param start the start location
* @param stop the stop location
* @param speed in meters per minute
* @param grade the grade to calculate
* @return the VO2 value
* @return the VO2 value.
*/
@VisibleForTesting
static double getVO2(double speed, double grade) {
if (grade < 0) {
grade = 0;
grade = 0.0;
}
double VO2 = 0;
if (speed > CRTICAL_SPEED_RUNNING) {
VO2 = calculateRunningVO2(speed, grade);
} else {
VO2 = calculateWalkingVO2(speed, grade);
}
return VO2;
return speed > CRTICAL_SPEED_RUNNING ? calculateRunningVO2(speed, grade) : calculateWalkingVO2(
speed, grade);
}
/**
@@ -196,7 +195,7 @@ public class CalorieUtils {
* @param grade the grade to calculate
* @param weight the weight of user
* @param activityType can be foot or cycling
* @return the calories expenditure between the start and stop location
* @return the calories expenditure between the start and stop location.
*/
public static double getCalories(Location start, Location stop, double grade, int weight,
ActivityType activityType) {
MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
+7 -10
View File
@@ -177,8 +177,8 @@ public class StatsUtils {
}
// Set calories
double calories = tripStatistics == null ? Double.NaN : tripStatistics.getCaloricExpenditure();
setCalories(activity, R.id.stats_calories, R.string.stats_calories, calories);
double calories = tripStatistics == null ? Double.NaN : tripStatistics.getCalorie();
setCalorie(activity, R.id.stats_calorie, R.string.stats_calorie, calories);
}
/**
@@ -322,18 +322,15 @@ public class StatsUtils {
}
/**
* Sets calories.
* Sets calorie.
*
* @param activity the activity
* @param itemId the item id
* @param speedLabelId the speed label id
* @param paceLabelId the pace label id
* @param speed the speed in meters per second
* @param metricUnits true if metric units
* @param reportSpeed true if report speed
* @param labelId the calorie label id
* @param calorie the value of calorie
*/
private static void setCalories(Activity activity, int itemId, int labelId, double calories) {
private static void setCalorie(Activity activity, int itemId, int labelId, double calorie) {
setItem(activity, itemId, labelId,
String.format(Locale.getDefault(), CALORIES_FORMAT, calories), "");
String.format(Locale.getDefault(), CALORIES_FORMAT, calorie), null);
}
}