From 418b125913999ab21c653fbb2296befb95b6e2d5 Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Tue, 22 Apr 2014 17:38:48 +0200
Subject: [PATCH] Configure tiles updater at construction time.
---
.../java/org/orekit/rugged/api/Rugged.java | 27 ++++++++++---------
.../rugged/core/BasicScanAlgorithm.java | 11 +++-----
.../rugged/core/IgnoreDEMAlgorithm.java | 7 -----
.../core/duvenhage/DuvenhageAlgorithm.java | 11 +++-----
.../core/raster/IntersectionAlgorithm.java | 7 -----
.../org/orekit/rugged/api/RuggedTest.java | 17 +++++++++---
.../rugged/core/AbstractAlgorithmTest.java | 11 +++-----
.../rugged/core/BasicScanAlgorithmTest.java | 5 ++--
.../duvenhage/DuvenhageAlgorithmTest.java | 11 ++++----
9 files changed, 47 insertions(+), 60 deletions(-)
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index b2600d02..20e254b0 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -79,6 +79,8 @@ public class Rugged {
* other methods will fail due to uninitialized context.
* </p>
* @param referenceDate reference date from which all other dates are computed
+ * @param updater updater used to load Digital Elevation Model tiles
+ * @param maxCachedTiles maximum number of tiles stored in the cache
* @param algorithmID identifier of algorithm to use for Digital Elevation Model intersection
* @param ellipsoidID identifier of reference ellipsoid
* @param inertialFrameID identifier of inertial frame
@@ -90,6 +92,7 @@ public class Rugged {
* @exception RuggedException if data needed for some frame cannot be loaded
*/
public Rugged(final AbsoluteDate newReferenceDate,
+ final TileUpdater updater, final int maxCachedTiles,
final AlgorithmId algorithmID, final EllipsoidId ellipsoidID,
final InertialFrameId inertialFrameID, final BodyRotatingFrameId bodyRotatingFrameID,
final List<Pair<AbsoluteDate, PVCoordinates>> positionsVelocities, final int pvInterpolationOrder,
@@ -110,7 +113,7 @@ public class Rugged {
scToBody = new SpacecraftToObservedBody(frame, ellipsoid.getBodyFrame(), pvProvider, aProvider);
// intersection algorithm
- algorithm = selectAlgorithm(algorithmID);
+ algorithm = selectAlgorithm(algorithmID, updater, maxCachedTiles);
sensors = new HashMap<String, Sensor>();
@@ -125,6 +128,8 @@ public class Rugged {
* other methods will fail due to uninitialized context.
* </p>
* @param newReferenceDate reference date from which all other dates are computed
+ * @param updater updater used to load Digital Elevation Model tiles
+ * @param maxCachedTiles maximum number of tiles stored in the cache
* @param algorithmID identifier of algorithm to use for Digital Elevation Model intersection
* @param ellipsoidID identifier of reference ellipsoid
* @param inertialFrameID identifier of inertial frame
@@ -133,6 +138,7 @@ public class Rugged {
* @exception RuggedException if data needed for some frame cannot be loaded
*/
public Rugged(final AbsoluteDate newReferenceDate,
+ final TileUpdater updater, final int maxCachedTiles,
final AlgorithmId algorithmID, final EllipsoidId ellipsoidID,
final InertialFrameId inertialFrameID, final BodyRotatingFrameId bodyRotatingFrameID,
final Propagator propagator)
@@ -151,7 +157,7 @@ public class Rugged {
propagator, propagator.getAttitudeProvider());
// intersection algorithm
- algorithm = selectAlgorithm(algorithmID);
+ algorithm = selectAlgorithm(algorithmID, updater, maxCachedTiles);
sensors = new HashMap<String, Sensor>();
@@ -167,14 +173,6 @@ public class Rugged {
return referenceDate;
}
- /** Set up the tiles management.
- * @param updater updater used to load Digital Elevation Model tiles
- * @param maxCachedTiles maximum number of tiles stored in the cache
- */
- public void setUpTilesManagement(final TileUpdater updater, final int maxCachedTiles) {
- algorithm.setUpTilesManagement(updater, maxCachedTiles);
- }
-
/** Set up line sensor model.
* @param name name of the line sensor.
* @param pixels lines of sight for each pixels
@@ -324,16 +322,19 @@ public class Rugged {
/** Select DEM intersection algorithm.
* @param algorithmID intersection algorithm identifier
+ * @param updater updater used to load Digital Elevation Model tiles
+ * @param maxCachedTiles maximum number of tiles stored in the cache
* @return selected algorithm
*/
- private IntersectionAlgorithm selectAlgorithm(final AlgorithmId algorithmID) {
+ private IntersectionAlgorithm selectAlgorithm(final AlgorithmId algorithmID,
+ final TileUpdater updater, final int maxCachedTiles) {
// set up the algorithm
switch (algorithmID) {
case DUVENHAGE :
- return new DuvenhageAlgorithm();
+ return new DuvenhageAlgorithm(updater, maxCachedTiles);
case BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY :
- return new BasicScanAlgorithm();
+ return new BasicScanAlgorithm(updater, maxCachedTiles);
case IGNORE_DEM_USE_ELLIPSOID :
return new IgnoreDEMAlgorithm();
default :
diff --git a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
index ea8c0f78..446c9d92 100644
--- a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
@@ -41,7 +41,7 @@ import org.orekit.rugged.core.raster.TilesCache;
public class BasicScanAlgorithm implements IntersectionAlgorithm {
/** Cache for DEM tiles. */
- private TilesCache<SimpleTile> cache;
+ private final TilesCache<SimpleTile> cache;
/** Minimum altitude encountered. */
private double hMin;
@@ -50,13 +50,10 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
private double hMax;
/** Simple constructor.
+ * @param updater updater used to load Digital Elevation Model tiles
+ * @param maxCachedTiles maximum number of tiles stored in the cache
*/
- public BasicScanAlgorithm() {
- }
-
- /** {@inheritDoc} */
- @Override
- public void setUpTilesManagement(final TileUpdater updater, final int maxCachedTiles) {
+ public BasicScanAlgorithm(final TileUpdater updater, final int maxCachedTiles) {
cache = new TilesCache<SimpleTile>(new SimpleTileFactory(), updater, maxCachedTiles);
hMin = Double.POSITIVE_INFINITY;
hMax = Double.NEGATIVE_INFINITY;
diff --git a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
index 6f04136e..e288daa3 100644
--- a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
@@ -20,7 +20,6 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.core.raster.IntersectionAlgorithm;
/** Intersection ignoring Digital Elevation Model.
@@ -36,12 +35,6 @@ public class IgnoreDEMAlgorithm implements IntersectionAlgorithm {
public IgnoreDEMAlgorithm() {
}
- /** {@inheritDoc} */
- @Override
- public void setUpTilesManagement(final TileUpdater updater, final int maxCachedTiles) {
- // we ignore the DEM
- }
-
/** {@inheritDoc} */
@Override
public GeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
index 34607974..a1a51530 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
@@ -42,16 +42,13 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
private static final double STEP = 0.01;
/** Cache for DEM tiles. */
- private TilesCache<MinMaxTreeTile> cache;
+ private final TilesCache<MinMaxTreeTile> cache;
/** Simple constructor.
+ * @param updater updater used to load Digital Elevation Model tiles
+ * @param maxCachedTiles maximum number of tiles stored in the cache
*/
- public DuvenhageAlgorithm() {
- }
-
- /** {@inheritDoc} */
- @Override
- public void setUpTilesManagement(final TileUpdater updater, final int maxCachedTiles) {
+ public DuvenhageAlgorithm(final TileUpdater updater, final int maxCachedTiles) {
cache = new TilesCache<MinMaxTreeTile>(new MinMaxTreeTileFactory(), updater, maxCachedTiles);
}
diff --git a/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java b/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
index 9a50e6be..b8eb3010 100644
--- a/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
@@ -19,7 +19,6 @@ package org.orekit.rugged.core.raster;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.core.ExtendedEllipsoid;
/** Interface for Digital Elevation Model intersection algorithm.
@@ -27,12 +26,6 @@ import org.orekit.rugged.core.ExtendedEllipsoid;
*/
public interface IntersectionAlgorithm {
- /** Set up the tiles management.
- * @param updater updater used to load Digital Elevation Model tiles
- * @param maxCachedTiles maximum number of tiles stored in the cache
- */
- void setUpTilesManagement(TileUpdater updater, int maxCachedTiles);
-
/** Compute intersection of line with Digital Elevation Model.
* @param ellipsoid reference ellipsoid
* @param position pixel position in ellipsoid frame
diff --git a/src/test/java/org/orekit/rugged/api/RuggedTest.java b/src/test/java/org/orekit/rugged/api/RuggedTest.java
index 279ce356..a9ef8e60 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedTest.java
@@ -138,7 +138,12 @@ public class RuggedTest {
createQ(t0,19.000, 0.522119033749, -0.395304129256, 0.577847874330, 0.487050504694),
createQ(t0,20.000, 0.522421006719, -0.395049578765, 0.577574493570, 0.487257453954));
- Rugged rugged = new Rugged(t0,
+ TileUpdater updater =
+ new VolcanicConeElevationUpdater(new GeodeticPoint(FastMath.toRadians(13.25667), FastMath.toRadians(123.685), 2463.0),
+ FastMath.toRadians(30.0), 16.0,
+ FastMath.toRadians(1.0), 1201);
+
+ Rugged rugged = new Rugged(t0, updater, 8,
AlgorithmId.DUVENHAGE,
EllipsoidId.WGS84,
InertialFrameId.EME2000,
@@ -161,7 +166,12 @@ public class RuggedTest {
Orbit orbit = createOrbit(gravityField);
Propagator propagator = createPropagator(earth, gravityField, orbit);
- Rugged rugged = new Rugged(propagator.getInitialState().getDate(),
+ TileUpdater updater =
+ new VolcanicConeElevationUpdater(new GeodeticPoint(FastMath.toRadians(13.25667), FastMath.toRadians(123.685), 2463.0),
+ FastMath.toRadians(30.0), 16.0,
+ FastMath.toRadians(1.0), 1201);
+
+ Rugged rugged = new Rugged(propagator.getInitialState().getDate(), updater, 8,
AlgorithmId.DUVENHAGE,
EllipsoidId.WGS84,
InertialFrameId.EME2000,
@@ -211,13 +221,12 @@ public class RuggedTest {
propagator.propagate(crossing.shiftedBy(lineDatation.getDate(lastLine) + 1.0));
Propagator ephemeris = propagator.getGeneratedEphemeris();
- Rugged rugged = new Rugged(crossing,
+ Rugged rugged = new Rugged(crossing, updater, 8,
AlgorithmId.DUVENHAGE,
EllipsoidId.WGS84,
InertialFrameId.EME2000,
BodyRotatingFrameId.ITRF,
ephemeris);
- rugged.setUpTilesManagement(updater, 8);
rugged.setLineSensor("line", los, lineDatation);
diff --git a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
index 6605d82b..42c8b297 100644
--- a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
@@ -52,7 +52,7 @@ import org.orekit.utils.PVCoordinates;
public abstract class AbstractAlgorithmTest {
- protected abstract IntersectionAlgorithm createAlgorithm();
+ protected abstract IntersectionAlgorithm createAlgorithm(TileUpdater updater, int maxCachedTiles);
@Test
public void testMayonVolcanoOnSubTileCorner()
@@ -71,8 +71,7 @@ public abstract class AbstractAlgorithmTest {
final GeodeticPoint groundGP = new GeodeticPoint(latitude, longitude, altitude);
Vector3D groundP = earth.transform(groundGP);
- final IntersectionAlgorithm algorithm = createAlgorithm();
- algorithm.setUpTilesManagement(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
// preliminary check: the point has been chosen in the spacecraft (YZ) plane
Transform earthToSpacecraft = new Transform(state.getDate(),
@@ -106,8 +105,7 @@ public abstract class AbstractAlgorithmTest {
final GeodeticPoint groundGP = new GeodeticPoint(latitude, longitude, altitude);
Vector3D groundP = earth.transform(groundGP);
- final IntersectionAlgorithm algorithm = createAlgorithm();
- algorithm.setUpTilesManagement(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
// test direct localization
Vector3D position = state.getPVCoordinates(earth.getBodyFrame()).getPosition();
@@ -133,8 +131,7 @@ public abstract class AbstractAlgorithmTest {
final GeodeticPoint groundGP = new GeodeticPoint(latitude, longitude, altitude);
Vector3D groundP = earth.transform(groundGP);
- final IntersectionAlgorithm algorithm = createAlgorithm();
- algorithm.setUpTilesManagement(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
// preliminary check: the point has been chosen in the spacecraft (YZ) plane
Transform earthToSpacecraft = new Transform(state.getDate(),
diff --git a/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java b/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
index 4181b840..29ba657c 100644
--- a/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
@@ -17,12 +17,13 @@
package org.orekit.rugged.core;
+import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.core.raster.IntersectionAlgorithm;
public class BasicScanAlgorithmTest extends AbstractAlgorithmTest {
- public IntersectionAlgorithm createAlgorithm() {
- return new BasicScanAlgorithm();
+ public IntersectionAlgorithm createAlgorithm(final TileUpdater updater, final int maxCachedTiles) {
+ return new BasicScanAlgorithm(updater, maxCachedTiles);
}
}
diff --git a/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java b/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
index e8307b68..2d0d4045 100644
--- a/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
@@ -22,20 +22,20 @@ import org.junit.Test;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
+import org.orekit.rugged.api.TileUpdater;
import org.orekit.rugged.core.AbstractAlgorithmTest;
import org.orekit.rugged.core.raster.IntersectionAlgorithm;
public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
- protected IntersectionAlgorithm createAlgorithm() {
- return new DuvenhageAlgorithm();
+ protected IntersectionAlgorithm createAlgorithm(final TileUpdater updater, final int maxCachedTiles) {
+ return new DuvenhageAlgorithm(updater, maxCachedTiles);
}
@Test
public void testNumericalIssueAtTileExit() throws RuggedException, OrekitException {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm();
- algorithm.setUpTilesManagement(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
Vector3D los = new Vector3D( 0.5127552821932051, -0.8254313129088879, -0.2361041470463311);
GeodeticPoint intersection = algorithm.intersection(earth, position, los);
@@ -45,8 +45,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
@Test
public void testCrossingBeforeLineSegmentStart() throws RuggedException, OrekitException {
setUpMayonVolcanoContext();
- final IntersectionAlgorithm algorithm = createAlgorithm();
- algorithm.setUpTilesManagement(updater, 8);
+ final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
Vector3D los = new Vector3D( 0.42804005978915904, -0.8670291034054828, -0.2550338037664377);
GeodeticPoint intersection = algorithm.intersection(earth, position, los);
--
GitLab