Commit 37c311c2 authored by Bryan Cazabonne's avatar Bryan Cazabonne

Changed name for the estimated tropospheric model.

parent 2297f96b
......@@ -27,7 +27,7 @@ import org.orekit.time.AbsoluteDate;
import org.orekit.time.FieldAbsoluteDate;
import org.orekit.utils.ParameterDriver;
/** A precise tropospheric model. The tropospheric delay is computed according to the formula:
/** An estimated tropospheric model. The tropospheric delay is computed according to the formula:
* <pre>
* δ = δ<sub>h</sub> * m<sub>h</sub> + (δ<sub>t</sub> - δ<sub>h</sub>) * m<sub>w</sub>
* </pre>
......@@ -48,7 +48,7 @@ import org.orekit.utils.ParameterDriver;
* The tropospheric zenith delay δ<sub>h</sub> is computed empirically with a {@link SaastamoinenModel}
* while the tropospheric total zenith delay δ<sub>t</sub> is estimated as a {@link ParameterDriver}
*/
public class PreciseTroposphericModel implements DiscreteTroposphericModel {
public class EstimatedTroposphericModel implements DiscreteTroposphericModel {
/** Name of the parameter of this model: the total zenith delay. */
public static final String TOTAL_ZENITH_DELAY = "total zenith delay";
......@@ -74,10 +74,10 @@ public class PreciseTroposphericModel implements DiscreteTroposphericModel {
* @param model mapping function model (NMF or GMF).
* @param totalDelay initial value for the tropospheric zenith total delay [m]
*/
public PreciseTroposphericModel(final double t0, final double p0,
public EstimatedTroposphericModel(final double t0, final double p0,
final MappingFunction model, final double totalDelay) {
totalZenithDelay = new ParameterDriver(PreciseTroposphericModel.TOTAL_ZENITH_DELAY,
totalZenithDelay = new ParameterDriver(EstimatedTroposphericModel.TOTAL_ZENITH_DELAY,
totalDelay, FastMath.scalb(1.0, 0), 0.0, Double.POSITIVE_INFINITY);
this.t0 = t0;
......@@ -93,7 +93,7 @@ public class PreciseTroposphericModel implements DiscreteTroposphericModel {
* @param model mapping function model (NMF or GMF).l
* @param totalDelay initial value for the tropospheric zenith total delay [m]
*/
public PreciseTroposphericModel(final MappingFunction model, final double totalDelay) {
public EstimatedTroposphericModel(final MappingFunction model, final double totalDelay) {
this(273.15 + 18.0, 1013.25, model, totalDelay);
}
......
......@@ -54,7 +54,7 @@ import org.orekit.utils.IERSConventions;
import org.orekit.utils.ParameterDriver;
import org.orekit.utils.ParameterDriversList;
public class PreciseTroposphericModelTest {
public class EstimatedTroposphericModelTest {
@BeforeClass
public static void setUpGlobal() {
......@@ -70,7 +70,7 @@ public class PreciseTroposphericModelTest {
public void testFixedHeight() {
final AbsoluteDate date = new AbsoluteDate();
MappingFunction mapping = new NiellMappingFunctionModel(FastMath.toRadians(45.0));
DiscreteTroposphericModel model = new PreciseTroposphericModel(mapping, 2.0);
DiscreteTroposphericModel model = new EstimatedTroposphericModel(mapping, 2.0);
double lastDelay = Double.MAX_VALUE;
// delay shall decline with increasing elevation angle
for (double elev = 10d; elev < 90d; elev += 8d) {
......@@ -86,7 +86,7 @@ public class PreciseTroposphericModelTest {
final double height = 100d;
final AbsoluteDate date = new AbsoluteDate();
MappingFunction mapping = new NiellMappingFunctionModel(FastMath.toRadians(45.0));
DiscreteTroposphericModel model = new PreciseTroposphericModel(mapping, 2.0);
DiscreteTroposphericModel model = new EstimatedTroposphericModel(mapping, 2.0);
final double path = model.pathDelay(FastMath.toRadians(elevation), height, model.getParameters(), date);
Assert.assertTrue(Precision.compareTo(path, 20d, 1.0e-6) < 0);
Assert.assertTrue(Precision.compareTo(path, 0d, 1.0e-6) > 0);
......@@ -125,7 +125,7 @@ public class PreciseTroposphericModelTest {
final GroundStation station = new GroundStation(baseFrame);
// Tropospheric model
final DiscreteTroposphericModel model = new PreciseTroposphericModel(func, 2.0);
final DiscreteTroposphericModel model = new EstimatedTroposphericModel(func, 2.0);
// Derivative Structure
final DSFactory factory = new DSFactory(6, 1);
......@@ -225,7 +225,7 @@ public class PreciseTroposphericModelTest {
@Test
public void testDelayParameterDerivative() {
doTestParametersDerivatives(PreciseTroposphericModel.TOTAL_ZENITH_DELAY, 5.0e-15);
doTestParametersDerivatives(EstimatedTroposphericModel.TOTAL_ZENITH_DELAY, 5.0e-15);
}
private void doTestParametersDerivatives(String parameterName, double tolerance) {
......@@ -244,7 +244,7 @@ public class PreciseTroposphericModelTest {
// Tropospheric model
final MappingFunction gmf = new GlobalMappingFunctionModel(latitude, longitude);
final DiscreteTroposphericModel model = new PreciseTroposphericModel(gmf, 5.0);
final DiscreteTroposphericModel model = new EstimatedTroposphericModel(gmf, 5.0);
// Set Parameter Driver
for (final ParameterDriver driver : model.getParametersDrivers()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment