Skip to content
Snippets Groups Projects
Commit 7db3658a authored by Bryan Cazabonne's avatar Bryan Cazabonne
Browse files

Merge branch 'issue-846' into release-11.0

parents 474971fb 2b9bbebc
No related branches found
No related tags found
No related merge requests found
...@@ -51,8 +51,8 @@ public class AbstractRelativisticClockModifier { ...@@ -51,8 +51,8 @@ public class AbstractRelativisticClockModifier {
final TimeStampedPVCoordinates[] pv = estimated.getParticipants(); final TimeStampedPVCoordinates[] pv = estimated.getParticipants();
// Relativistic clock correction taking into account two-ways measurements // Relativistic clock correction taking into account two-ways measurements
return pv.length < 3 ? return pv.length < 3 ?
s * (dotProduct(pv[1]) - dotProduct(pv[0])) : s * (dotProduct(pv[0]) - dotProduct(pv[1])) :
s * (dotProduct(pv[2]) - dotProduct(pv[1])); s * (dotProduct(pv[1]) - dotProduct(pv[2]));
} }
/** Get the scale factor used to compute relativistic effect. /** Get the scale factor used to compute relativistic effect.
......
...@@ -60,7 +60,7 @@ public class RelativisticClockInterSatellitesPhaseModifierTest { ...@@ -60,7 +60,7 @@ public class RelativisticClockInterSatellitesPhaseModifierTest {
final EstimatedMeasurement<InterSatellitesPhase> estimatedAfter = phase.estimate(0, 0, states); final EstimatedMeasurement<InterSatellitesPhase> estimatedAfter = phase.estimate(0, 0, states);
// Verify // 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()); Assert.assertEquals(0, modifier.getParametersDrivers().size());
} }
......
...@@ -58,7 +58,7 @@ public class RelativisticClockInterSatellitesRangeModifierTest { ...@@ -58,7 +58,7 @@ public class RelativisticClockInterSatellitesRangeModifierTest {
final EstimatedMeasurement<InterSatellitesRange> estimatedAfter = range.estimate(0, 0, states); final EstimatedMeasurement<InterSatellitesRange> estimatedAfter = range.estimate(0, 0, states);
// Verify // 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()); Assert.assertEquals(0, modifier.getParametersDrivers().size());
} }
......
...@@ -59,7 +59,7 @@ public class RelativisticClockOneWayGNSSPhaseModifierTest { ...@@ -59,7 +59,7 @@ public class RelativisticClockOneWayGNSSPhaseModifierTest {
final EstimatedMeasurement<OneWayGNSSPhase> estimatedAfter = phase.estimate(0, 0, states); final EstimatedMeasurement<OneWayGNSSPhase> estimatedAfter = phase.estimate(0, 0, states);
// Verify // 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()); Assert.assertEquals(0, modifier.getParametersDrivers().size());
} }
......
...@@ -57,7 +57,7 @@ public class RelativisticClockOneWayGNSSRangeModifierTest { ...@@ -57,7 +57,7 @@ public class RelativisticClockOneWayGNSSRangeModifierTest {
final EstimatedMeasurement<OneWayGNSSRange> estimatedAfter = range.estimate(0, 0, states); final EstimatedMeasurement<OneWayGNSSRange> estimatedAfter = range.estimate(0, 0, states);
// Verify // 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()); Assert.assertEquals(0, modifier.getParametersDrivers().size());
} }
......
...@@ -95,7 +95,7 @@ public class RelativisticClockPhaseModifierTest { ...@@ -95,7 +95,7 @@ public class RelativisticClockPhaseModifierTest {
Assert.assertEquals(0, modifier.getParametersDrivers().size()); Assert.assertEquals(0, modifier.getParametersDrivers().size());
// Verify // 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);
} }
......
...@@ -94,7 +94,7 @@ public class RelativisticClockRangeModifierTest { ...@@ -94,7 +94,7 @@ public class RelativisticClockRangeModifierTest {
Assert.assertEquals(0, modifier.getParametersDrivers().size()); Assert.assertEquals(0, modifier.getParametersDrivers().size());
// Verify // 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);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment