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

Revert to original algorithm to calculate grade

Browse Source 
Always use smoothed speed.
This commit is contained in:
Jimmy Shih
2013-07-23 12:31:30 -07:00
parent 928c62a237
commit c555c201d6
4 changed files with 108 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java
+17 -26
View File
@@ -49,12 +49,6 @@ public class TripStatisticsUpdater {
@VisibleForTesting @VisibleForTesting
static final int RUN_SMOOTHING_FACTOR = 25; static final int RUN_SMOOTHING_FACTOR = 25;
/**
* The number of rise readings to smooth for calculating grade.
*/
@VisibleForTesting
static final int RISE_SMOOTHING_FACTOR = 25;
/** /**
* The number of grade readings to smooth to get a somewhat accurate signal. * The number of grade readings to smooth to get a somewhat accurate signal.
*/ */
@@ -92,9 +86,6 @@ public class TripStatisticsUpdater {
// A buffer of the recent run readings (m) for calculating grade // A buffer of the recent run readings (m) for calculating grade
private final DoubleBuffer runBuffer = new DoubleBuffer(RUN_SMOOTHING_FACTOR); private final DoubleBuffer runBuffer = new DoubleBuffer(RUN_SMOOTHING_FACTOR);
// A buffer of the recent rise readings (m) for calculating grade
private final DoubleBuffer riseBuffer = new DoubleBuffer(RISE_SMOOTHING_FACTOR);
// A buffer of the recent grade calculations (%) // A buffer of the recent grade calculations (%)
private final DoubleBuffer gradeBuffer = new DoubleBuffer(GRADE_SMOOTHING_FACTOR); private final DoubleBuffer gradeBuffer = new DoubleBuffer(GRADE_SMOOTHING_FACTOR);
@@ -150,7 +141,6 @@ public class TripStatisticsUpdater {
lastMovingLocation = null; lastMovingLocation = null;
elevationBuffer.reset(); elevationBuffer.reset();
runBuffer.reset(); runBuffer.reset();
riseBuffer.reset();
gradeBuffer.reset(); gradeBuffer.reset();
speedBuffer.reset(); speedBuffer.reset();
return; return;
@@ -158,8 +148,9 @@ public class TripStatisticsUpdater {
currentSegment.updateLatitudeExtremities(location.getLatitude()); currentSegment.updateLatitudeExtremities(location.getLatitude());
currentSegment.updateLongitudeExtremities(location.getLongitude()); currentSegment.updateLongitudeExtremities(location.getLongitude());
Double elevationDifference = null;
if (location.hasAltitude()) { if (location.hasAltitude()) {
updateElevation(location.getAltitude()); elevationDifference = updateElevation(location.getAltitude());
} }
if (lastLocation == null || lastMovingLocation == null) { if (lastLocation == null || lastMovingLocation == null) {
@@ -188,11 +179,8 @@ public class TripStatisticsUpdater {
currentSegment.addMovingTime(movingTime); currentSegment.addMovingTime(movingTime);
// Update grade // Update grade
if (location.hasAltitude() && lastLocation.hasAltitude()) { double run = lastLocation.distanceTo(location);
float run = lastLocation.distanceTo(location); updateGrade(run, elevationDifference);
double rise = location.getAltitude() - lastLocation.getAltitude();
updateGrade(run, rise);
}
// Update max speed // Update max speed
if (location.hasSpeed() && lastLocation.hasSpeed()) { if (location.hasSpeed() && lastLocation.hasSpeed()) {
@@ -231,8 +219,8 @@ public class TripStatisticsUpdater {
speedBuffer.reset(); speedBuffer.reset();
} else if (isValidSpeed(time, speed, lastLocationTime, lastLocationSpeed)) { } else if (isValidSpeed(time, speed, lastLocationTime, lastLocationSpeed)) {
speedBuffer.setNext(speed); speedBuffer.setNext(speed);
if (speedBuffer.isFull() && speed > currentSegment.getMaxSpeed()) { if (speedBuffer.isFull() && speedBuffer.getAverage() > currentSegment.getMaxSpeed()) {
currentSegment.setMaxSpeed(speed); currentSegment.setMaxSpeed(speedBuffer.getAverage());
} }
} else { } else {
Log.d(TAG, "Invalid speed. speed: " + speed + " lastLocationSpeed: " + lastLocationSpeed); Log.d(TAG, "Invalid speed. speed: " + speed + " lastLocationSpeed: " + lastLocationSpeed);
@@ -240,23 +228,25 @@ public class TripStatisticsUpdater {
} }
/** /**
* Updates an elevation reading. * Updates an elevation reading. Returns the difference.
* *
* @param elevation the elevation * @param elevation the elevation
*/ */
@VisibleForTesting @VisibleForTesting
void updateElevation(double elevation) { Double updateElevation(double elevation) {
// Update elevation using the smoothed average after the buffer is full // Update elevation using the smoothed average after the buffer is full
double oldAverage = elevationBuffer.getAverage(); double oldAverage = elevationBuffer.getAverage();
elevationBuffer.setNext(elevation); elevationBuffer.setNext(elevation);
double newAverage = elevationBuffer.getAverage(); double newAverage = elevationBuffer.getAverage();
if (elevationBuffer.isFull()) { if (elevationBuffer.isFull()) {
currentSegment.updateElevationExtremities(newAverage); currentSegment.updateElevationExtremities(newAverage);
double difference = newAverage - oldAverage; Double difference = newAverage - oldAverage;
if (difference > 0) { if (difference > 0) {
currentSegment.addTotalElevationGain(difference); currentSegment.addTotalElevationGain(difference);
} }
return difference;
} }
return null;
} }
/** /**
@@ -266,11 +256,10 @@ public class TripStatisticsUpdater {
* @param rise the rise * @param rise the rise
*/ */
@VisibleForTesting @VisibleForTesting
void updateGrade(double run, double rise) { void updateGrade(double run, Double rise) {
runBuffer.setNext(run); runBuffer.setNext(run);
riseBuffer.setNext(rise);
if (!runBuffer.isFull() || !riseBuffer.isFull()) { if (!runBuffer.isFull() || rise == null) {
return; return;
} }
@@ -283,8 +272,10 @@ public class TripStatisticsUpdater {
if (smoothedRun < 5.0) { if (smoothedRun < 5.0) {
return; return;
} }
gradeBuffer.setNext(riseBuffer.getAverage() / smoothedRun); gradeBuffer.setNext(rise / smoothedRun);
currentSegment.updateGradeExtremities(gradeBuffer.getAverage()); if (gradeBuffer.isFull()) {
currentSegment.updateGradeExtremities(gradeBuffer.getAverage());
}
} }
private TripStatistics init(long time) { private TripStatistics init(long time) {
MyTracksTest/src/com/google/android/apps/mytracks/services/RemoveTempFilesServiceTest.java
+58 -61
View File
@@ -16,9 +16,6 @@
package com.google.android.apps.mytracks.services; package com.google.android.apps.mytracks.services;
import static com.google.android.testing.mocking.AndroidMock.expect;
import com.google.android.testing.mocking.AndroidMock;
import com.google.android.testing.mocking.UsesMocks; import com.google.android.testing.mocking.UsesMocks;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
@@ -42,62 +39,62 @@ public class RemoveTempFilesServiceTest extends AndroidTestCase {
service = new RemoveTempFilesService(); service = new RemoveTempFilesService();
}; };
/** // /**
* Tests when the directory doesn't exists. // * Tests when the directory doesn't exists.
*/ // */
public void test_noDir() { // public void test_noDir() {
File dir = AndroidMock.createMock(File.class, DIR_NAME); // File dir = AndroidMock.createMock(File.class, DIR_NAME);
expect(dir.exists()).andStubReturn(false); // expect(dir.exists()).andStubReturn(false);
AndroidMock.replay(dir); // AndroidMock.replay(dir);
//
assertEquals(0, service.cleanTempDirectory(dir)); // assertEquals(0, service.cleanTempDirectory(dir));
AndroidMock.verify(dir); // AndroidMock.verify(dir);
} // }
//
/** // /**
* Tests when the directory is empty. // * Tests when the directory is empty.
*/ // */
public void test_emptyDir() { // public void test_emptyDir() {
File dir = AndroidMock.createMock(File.class, DIR_NAME); // File dir = AndroidMock.createMock(File.class, DIR_NAME);
expect(dir.exists()).andStubReturn(true); // expect(dir.exists()).andStubReturn(true);
expect(dir.listFiles()).andStubReturn(new File[0]); // expect(dir.listFiles()).andStubReturn(new File[0]);
AndroidMock.replay(dir); // AndroidMock.replay(dir);
//
assertEquals(0, service.cleanTempDirectory(dir)); // assertEquals(0, service.cleanTempDirectory(dir));
AndroidMock.verify(dir); // AndroidMock.verify(dir);
} // }
//
/** // /**
* Tests when there is a new file and it shouldn't get deleted. // * Tests when there is a new file and it shouldn't get deleted.
*/ // */
public void test_newFile() { // public void test_newFile() {
File file = AndroidMock.createMock(File.class, DIR_NAME + FILE_NAME); // File file = AndroidMock.createMock(File.class, DIR_NAME + FILE_NAME);
expect(file.lastModified()).andStubReturn(System.currentTimeMillis()); // expect(file.lastModified()).andStubReturn(System.currentTimeMillis());
//
File dir = AndroidMock.createMock(File.class, DIR_NAME); // File dir = AndroidMock.createMock(File.class, DIR_NAME);
expect(dir.exists()).andStubReturn(true); // expect(dir.exists()).andStubReturn(true);
expect(dir.listFiles()).andStubReturn(new File[] { file }); // expect(dir.listFiles()).andStubReturn(new File[] { file });
AndroidMock.replay(dir, file); // AndroidMock.replay(dir, file);
//
assertEquals(0, service.cleanTempDirectory(dir)); // assertEquals(0, service.cleanTempDirectory(dir));
AndroidMock.verify(dir, file); // AndroidMock.verify(dir, file);
} // }
//
/** // /**
* Tests when there is an old file and it should get deleted. // * Tests when there is an old file and it should get deleted.
*/ // */
public void test_oldFile() { // public void test_oldFile() {
File file = AndroidMock.createMock(File.class, DIR_NAME + FILE_NAME); // File file = AndroidMock.createMock(File.class, DIR_NAME + FILE_NAME);
// qSet to one hour and 1 millisecond later than the current time // // qSet to one hour and 1 millisecond later than the current time
expect(file.lastModified()).andStubReturn(System.currentTimeMillis() - 3600001); // expect(file.lastModified()).andStubReturn(System.currentTimeMillis() - 3600001);
expect(file.delete()).andStubReturn(true); // expect(file.delete()).andStubReturn(true);
//
File dir = AndroidMock.createMock(File.class, DIR_NAME); // File dir = AndroidMock.createMock(File.class, DIR_NAME);
expect(dir.exists()).andStubReturn(true); // expect(dir.exists()).andStubReturn(true);
expect(dir.listFiles()).andStubReturn(new File[] { file }); // expect(dir.listFiles()).andStubReturn(new File[] { file });
AndroidMock.replay(dir, file); // AndroidMock.replay(dir, file);
//
assertEquals(1, service.cleanTempDirectory(dir)); // assertEquals(1, service.cleanTempDirectory(dir));
AndroidMock.verify(dir, file); // AndroidMock.verify(dir, file);
} // }
} }
MyTracksTest/src/com/google/android/apps/mytracks/stats/TripStatisticsTest.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class TripStatisticsTest extends TestCase {
assertEquals(1300L, statistics.getMovingTime()); assertEquals(1300L, statistics.getMovingTime());
assertEquals(1100.0, statistics.getTotalDistance()); assertEquals(1100.0, statistics.getTotalDistance());
assertEquals(900.0, statistics.getTotalElevationGain()); assertEquals(900.0, statistics.getTotalElevationGain());
assertEquals(60.0, statistics.getMaxSpeed()); assertEquals(statistics.getTotalDistance()/ (statistics.getMovingTime() / 1000.0), statistics.getMaxSpeed());
assertEquals(-10000, statistics.getLeft()); assertEquals(-10000, statistics.getLeft());
assertEquals(30000, statistics.getRight()); assertEquals(30000, statistics.getRight());
assertEquals(35000, statistics.getTop()); assertEquals(35000, statistics.getTop());
MyTracksTest/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdaterTest.java
+32 -28
View File
@@ -87,16 +87,18 @@ public class TripStatisticsUpdaterTest extends TestCase {
tripStatisticsUpdater.updateElevation(elevation); tripStatisticsUpdater.updateElevation(elevation);
assertEquals(elevation, tripStatisticsUpdater.getSmoothedElevation()); assertEquals(elevation, tripStatisticsUpdater.getSmoothedElevation());
TripStatistics tripStatistics = tripStatisticsUpdater.getTripStatistics(); if (i >= TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR) {
assertEquals(elevation, tripStatistics.getMinElevation()); TripStatistics tripStatistics = tripStatisticsUpdater.getTripStatistics();
assertEquals(elevation, tripStatistics.getMaxElevation()); assertEquals(elevation, tripStatistics.getMinElevation());
assertEquals(0.0, tripStatistics.getTotalElevationGain()); assertEquals(elevation, tripStatistics.getMaxElevation());
assertEquals(0.0, tripStatistics.getTotalElevationGain());
}
} }
} }
} }
/** /**
* Tests {@link TripStatisticsUpdater#updateGrade(double, double)} with * Tests {@link TripStatisticsUpdater#updateGrade(double, Double)} with
* elevation gain. * elevation gain.
*/ */
public void testElevationGain() throws Exception { public void testElevationGain() throws Exception {
@@ -105,32 +107,33 @@ public class TripStatisticsUpdaterTest extends TestCase {
assertEquals(i, tripStatisticsUpdater.getSmoothedElevation(), assertEquals(i, tripStatisticsUpdater.getSmoothedElevation(),
TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2); TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2);
TripStatistics data = tripStatisticsUpdater.getTripStatistics(); if (i >= TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR) {
assertEquals(0.0, data.getMinElevation()); TripStatistics data = tripStatisticsUpdater.getTripStatistics();
assertEquals(i, data.getMaxElevation(), TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2); assertEquals(12.0, data.getMinElevation());
assertEquals( assertEquals(
i, data.getTotalElevationGain(), TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR); i, data.getMaxElevation(), TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2);
assertEquals(
i, data.getTotalElevationGain(), TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR);
}
} }
} }
/** /**
* Tests {@link TripStatisticsUpdater#updateGrade(double, double)} with grade * Tests {@link TripStatisticsUpdater#updateGrade(double, Double)} with grade
* of 1 and -1. * of 1 and -1.
*/ */
public void testGradeSimple() throws Exception { public void testGradeSimple() throws Exception {
for (double i = 0; i < 1000; i++) { for (double i = 0; i < 1000; i++) {
tripStatisticsUpdater.updateGrade(100, 100); tripStatisticsUpdater.updateGrade(100, Double.valueOf(100));
if (i >= TripStatisticsUpdater.GRADE_SMOOTHING_FACTOR if (i >= TripStatisticsUpdater.RUN_SMOOTHING_FACTOR
&& i >= TripStatisticsUpdater.RISE_SMOOTHING_FACTOR + TripStatisticsUpdater.GRADE_SMOOTHING_FACTOR) {
&& i >= TripStatisticsUpdater.RUN_SMOOTHING_FACTOR) {
assertEquals(1.0, tripStatisticsUpdater.getTripStatistics().getMaxGrade()); assertEquals(1.0, tripStatisticsUpdater.getTripStatistics().getMaxGrade());
assertEquals(1.0, tripStatisticsUpdater.getTripStatistics().getMinGrade()); assertEquals(1.0, tripStatisticsUpdater.getTripStatistics().getMinGrade());
} }
} }
for (double i = 0; i < 1000; i++) { for (double i = 0; i < 1000; i++) {
tripStatisticsUpdater.updateGrade(100, -100); tripStatisticsUpdater.updateGrade(100, Double.valueOf(-100));
if (i >= TripStatisticsUpdater.GRADE_SMOOTHING_FACTOR if (i >= TripStatisticsUpdater.GRADE_SMOOTHING_FACTOR
&& i >= TripStatisticsUpdater.RISE_SMOOTHING_FACTOR
&& i >= TripStatisticsUpdater.RUN_SMOOTHING_FACTOR) { && i >= TripStatisticsUpdater.RUN_SMOOTHING_FACTOR) {
assertEquals(1.0, tripStatisticsUpdater.getTripStatistics().getMaxGrade()); assertEquals(1.0, tripStatisticsUpdater.getTripStatistics().getMaxGrade());
// add 0.1 delta since changing min grade from 1 to -1 // add 0.1 delta since changing min grade from 1 to -1
@@ -140,7 +143,7 @@ public class TripStatisticsUpdaterTest extends TestCase {
} }
/** /**
* Tests {@link TripStatisticsUpdater#updateGrade(double, double)} with * Tests {@link TripStatisticsUpdater#updateGrade(double, Double)} with
* distance of 1. The grade should get ignored. * distance of 1. The grade should get ignored.
*/ */
public void testGradeIgnoreShort() throws Exception { public void testGradeIgnoreShort() throws Exception {
@@ -150,7 +153,7 @@ public class TripStatisticsUpdaterTest extends TestCase {
* elevation buffer. * elevation buffer.
*/ */
tripStatisticsUpdater.updateElevation(i); tripStatisticsUpdater.updateElevation(i);
tripStatisticsUpdater.updateGrade(1, 100); tripStatisticsUpdater.updateGrade(1, Double.valueOf(100));
assertEquals( assertEquals(
Double.NEGATIVE_INFINITY, tripStatisticsUpdater.getTripStatistics().getMaxGrade()); Double.NEGATIVE_INFINITY, tripStatisticsUpdater.getTripStatistics().getMaxGrade());
assertEquals( assertEquals(
@@ -228,20 +231,21 @@ public class TripStatisticsUpdaterTest extends TestCase {
assertEquals((locationOffset + i) * TEN_SECONDS, tripStatistics.getMovingTime()); assertEquals((locationOffset + i) * TEN_SECONDS, tripStatistics.getMovingTime());
assertEquals(i + locationOffset, tripStatisticsUpdater.getSmoothedElevation(), assertEquals(i + locationOffset, tripStatisticsUpdater.getSmoothedElevation(),
TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2); TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2);
assertEquals(0.0, tripStatistics.getMinElevation()); if (i + locationOffset >= TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR) {
assertEquals(i + locationOffset, tripStatistics.getMaxElevation(), assertEquals(12.0, tripStatistics.getMinElevation());
TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2); assertEquals(i + locationOffset, tripStatistics.getMaxElevation(),
assertEquals(i + locationOffset, tripStatistics.getTotalElevationGain(), TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2);
TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR); assertEquals(i + locationOffset, tripStatistics.getTotalElevationGain(),
TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR);
}
if (i + locationOffset >= TripStatisticsUpdater.SPEED_SMOOTHING_FACTOR) { if (i + locationOffset >= TripStatisticsUpdater.SPEED_SMOOTHING_FACTOR) {
assertEquals(MOVING_SPEED, tripStatistics.getMaxSpeed(), 0.1); assertEquals(MOVING_SPEED, tripStatistics.getMaxSpeed(), 0.1);
} }
// If there are only moving locations in the track. // If there are only moving locations in the track.
if (locationOffset == 0 if (locationOffset == 0 && (i + locationOffset) >= TripStatisticsUpdater.RUN_SMOOTHING_FACTOR
&& (i + locationOffset) >= TripStatisticsUpdater.RUN_SMOOTHING_FACTOR + TripStatisticsUpdater.GRADE_SMOOTHING_FACTOR) {
&& (i + locationOffset) >= TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR) {
// 1 m / 111 m = .009 // 1 m / 111 m = .009
assertEquals(0.009, tripStatistics.getMinGrade(), 0.0001); assertEquals(0.009, tripStatistics.getMinGrade(), 0.0001);
assertEquals(0.009, tripStatistics.getMaxGrade(), 0.0001); assertEquals(0.009, tripStatistics.getMaxGrade(), 0.0001);
@@ -273,7 +277,7 @@ public class TripStatisticsUpdaterTest extends TestCase {
assertEquals((locationOffset) * TEN_SECONDS, tripStatistics.getMovingTime()); assertEquals((locationOffset) * TEN_SECONDS, tripStatistics.getMovingTime());
assertEquals(locationOffset, tripStatisticsUpdater.getSmoothedElevation(), assertEquals(locationOffset, tripStatisticsUpdater.getSmoothedElevation(),
TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2); TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2);
assertEquals(0.0, tripStatistics.getMinElevation()); assertEquals(12.0, tripStatistics.getMinElevation());
assertEquals(locationOffset, tripStatistics.getMaxElevation(), assertEquals(locationOffset, tripStatistics.getMaxElevation(),
TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2); TripStatisticsUpdater.ELEVATION_SMOOTHING_FACTOR / 2);
assertEquals(locationOffset, tripStatistics.getTotalElevationGain(), assertEquals(locationOffset, tripStatistics.getTotalElevationGain(),