04e49ef7fc490ddc1e7c6ef9cf849653b6516782
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java
| ... | ... | @@ -87,7 +87,7 @@ public class ManeuverDetectionOnMdM2011SemifinalTest extends OnlineTracTracBased |
| 87 | 87 | // at 13:35:54 with a much smaller jibing angle while the maneuver before which otherwise is grouped into the jibe then is |
| 88 | 88 | // only a bearing away by a lot. |
| 89 | 89 | assertManeuver(maneuvers, ManeuverType.JIBE, Tack.PORT, new MillisecondsTimePoint(c.getTime()), /* tolerance in milliseconds */ 10000); |
| 90 | - c.set(2011, 10-1, 30, 13, 36, 49); |
|
| 90 | + c.set(2011, 10-1, 30, 13, 36, 50); |
|
| 91 | 91 | assertManeuver(maneuvers, ManeuverType.JIBE, Tack.STARBOARD, new MillisecondsTimePoint(c.getTime()), /* tolerance in milliseconds */ 3000); |
| 92 | 92 | } |
| 93 | 93 |
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseChangeBasedTrackApproximation.java
| ... | ... | @@ -187,10 +187,8 @@ public class CourseChangeBasedTrackApproximation implements Serializable, GPSTra |
| 187 | 187 | private GPSFixMoving addOldEnoughFix(GPSFixMoving next) { |
| 188 | 188 | assert window.isEmpty() || !next.getTimePoint().before(window.peekFirst().getTimePoint()); |
| 189 | 189 | final GPSFixMoving result; |
| 190 | - final SpeedWithBearing nextSpeed = /* TODO this was the original code that can depend on fixes newer than next: */ next.isEstimatedSpeedCached() ? next.getCachedEstimatedSpeed() : track.getEstimatedSpeed(next.getTimePoint()); |
|
| 191 | -// next.getSpeed(); |
|
| 192 | - int TODO; // TODO bug6209: try without dependency on newer fixes and see if it helps produce equal results for early/late initialization |
|
| 193 | - if (nextSpeed != null) { // TODO bug6209: this gets messy... if we drop a fix because no estimated speed can be determined for it, and later fix additions may change this, where would we get this fix from again? |
|
| 190 | + final SpeedWithBearing nextSpeed = next.isEstimatedSpeedCached() ? next.getCachedEstimatedSpeed() : track.getEstimatedSpeed(next.getTimePoint()); |
|
| 191 | + if (nextSpeed != null) { |
|
| 194 | 192 | numberOfFixesAdded++; |
| 195 | 193 | int insertPosition = window.size(); |
| 196 | 194 | GPSFixMoving previous; |