Merge branch 'issue-846' into release-11.0

src/main/java/org/orekit/estimation/measurements/modifiers/AbstractRelativisticClockModifier.java

@@ -51,8 +51,8 @@ public class AbstractRelativisticClockModifier {
         final TimeStampedPVCoordinates[] pv = estimated.getParticipants();
         // Relativistic clock correction taking into account two-ways measurements
         return pv.length < 3 ?
-               s * (dotProduct(pv[1]) - dotProduct(pv[0])) :
-               s * (dotProduct(pv[2]) - dotProduct(pv[1]));
+               s * (dotProduct(pv[0]) - dotProduct(pv[1])) :
+               s * (dotProduct(pv[1]) - dotProduct(pv[2]));
     }
 
     /** Get the scale factor used to compute relativistic effect.

src/test/java/org/orekit/estimation/measurements/modifiers/RelativisticClockInterSatellitesPhaseModifierTest.java

@@ -60,7 +60,7 @@ public class RelativisticClockInterSatellitesPhaseModifierTest {
         final EstimatedMeasurement<InterSatellitesPhase> estimatedAfter = phase.estimate(0, 0, states);
 
         // Verify
-        Assert.assertEquals(10.57, (estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0]) * wavelength, 1.0e-2);
+        Assert.assertEquals(-10.57, (estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0]) * wavelength, 1.0e-2);
         Assert.assertEquals(0, modifier.getParametersDrivers().size());
 
     }

src/test/java/org/orekit/estimation/measurements/modifiers/RelativisticClockInterSatellitesRangeModifierTest.java

@@ -58,7 +58,7 @@ public class RelativisticClockInterSatellitesRangeModifierTest {
         final EstimatedMeasurement<InterSatellitesRange> estimatedAfter = range.estimate(0, 0, states);
 
         // Verify
-        Assert.assertEquals(10.57, estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0], 1.0e-2);
+        Assert.assertEquals(-10.57, estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0], 1.0e-2);
         Assert.assertEquals(0, modifier.getParametersDrivers().size());
 
     }

src/test/java/org/orekit/estimation/measurements/modifiers/RelativisticClockOneWayGNSSPhaseModifierTest.java

@@ -59,7 +59,7 @@ public class RelativisticClockOneWayGNSSPhaseModifierTest {
         final EstimatedMeasurement<OneWayGNSSPhase> estimatedAfter = phase.estimate(0, 0, states);
 
         // Verify
-        Assert.assertEquals(10.57, (estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0]) * wavelength, 1.0e-2);
+        Assert.assertEquals(-10.57, (estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0]) * wavelength, 1.0e-2);
         Assert.assertEquals(0, modifier.getParametersDrivers().size());
 
     }

src/test/java/org/orekit/estimation/measurements/modifiers/RelativisticClockOneWayGNSSRangeModifierTest.java

@@ -57,7 +57,7 @@ public class RelativisticClockOneWayGNSSRangeModifierTest {
         final EstimatedMeasurement<OneWayGNSSRange> estimatedAfter = range.estimate(0, 0, states);
 
         // Verify
-        Assert.assertEquals(10.57, estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0], 1.0e-2);
+        Assert.assertEquals(-10.57, estimatedBefore.getEstimatedValue()[0] - estimatedAfter.getEstimatedValue()[0], 1.0e-2);
         Assert.assertEquals(0, modifier.getParametersDrivers().size());
 
     }

src/test/java/org/orekit/estimation/measurements/modifiers/RelativisticClockPhaseModifierTest.java

@@ -95,7 +95,7 @@ public class RelativisticClockPhaseModifierTest {
         Assert.assertEquals(0, modifier.getParametersDrivers().size());
 
         // Verify
-        Assert.assertEquals(6.87 / Frequency.G01.getWavelength(), estimated.getObservedValue()[0] - estimated.getEstimatedValue()[0], 1.0e-2);
+        Assert.assertEquals(-6.87 / Frequency.G01.getWavelength(), estimated.getObservedValue()[0] - estimated.getEstimatedValue()[0], 1.0e-2);
 
     }
 

src/test/java/org/orekit/estimation/measurements/modifiers/RelativisticClockRangeModifierTest.java

@@ -94,7 +94,7 @@ public class RelativisticClockRangeModifierTest {
         Assert.assertEquals(0, modifier.getParametersDrivers().size());
 
         // Verify
-        Assert.assertEquals(6.87, estimated.getObservedValue()[0] - estimated.getEstimatedValue()[0], 1.0e-2);
+        Assert.assertEquals(-6.87, estimated.getObservedValue()[0] - estimated.getEstimatedValue()[0], 1.0e-2);
 
     }