From 78331762d8e4b81a51040ec30bad78fc23aea66f Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Tue, 10 Jun 2014 17:56:16 +0200
Subject: [PATCH] Added error detection for dates out of supported time span.
---
.../org/orekit/rugged/api/RuggedMessages.java | 1 +
.../utils/SpacecraftToObservedBody.java | 24 +++++-
.../org/orekit/rugged/RuggedMessages_en.utf8 | 3 +
.../org/orekit/rugged/RuggedMessages_fr.utf8 | 3 +
.../orekit/rugged/api/RuggedMessagesTest.java | 2 +-
.../org/orekit/rugged/api/RuggedTest.java | 76 +++++++++++++++++++
6 files changed, 106 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/orekit/rugged/api/RuggedMessages.java b/core/src/main/java/org/orekit/rugged/api/RuggedMessages.java
index f89ba5f5..9e3f9409 100644
--- a/core/src/main/java/org/orekit/rugged/api/RuggedMessages.java
+++ b/core/src/main/java/org/orekit/rugged/api/RuggedMessages.java
@@ -53,6 +53,7 @@ public enum RuggedMessages implements Localizable {
INTERNAL_ERROR("internal error, contact maintenance at {0}"),
OUT_OF_TILE_INDICES("no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)"),
OUT_OF_TILE_ANGLES("no data at latitude {0} and longitude {1}, tile covers only latitudes {2} to {3} and longitudes {4} to {5}"),
+ OUT_OF_TIME_RANGE("date {0} is out of time span [{1}, {2}]"),
UNINITIALIZED_CONTEXT("general context has not been initialized"),
EMPTY_TILE("tile is empty: {0} ⨉ {1}"),
UNKNOWN_SENSOR("unknown sensor {0}"),
diff --git a/core/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java b/core/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
index 91bc441f..97799836 100644
--- a/core/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
+++ b/core/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
@@ -30,6 +30,7 @@ import org.orekit.frames.Transform;
import org.orekit.orbits.CartesianOrbit;
import org.orekit.orbits.Orbit;
import org.orekit.rugged.api.RuggedException;
+import org.orekit.rugged.api.RuggedMessages;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.Constants;
import org.orekit.utils.ImmutableTimeStampedCache;
@@ -70,8 +71,27 @@ public class SpacecraftToObservedBody {
final List<Pair<AbsoluteDate, Rotation>> quaternions, final int aInterpolationOrder)
throws RuggedException {
- this.inertialFrame = inertialFrame;
- this.bodyFrame = bodyFrame;
+ // safety checks
+ final AbsoluteDate minPVDate = positionsVelocities.get(0).getFirst();
+ final AbsoluteDate maxPVDate = positionsVelocities.get(positionsVelocities.size() - 1).getFirst();
+ if (minDate.compareTo(minPVDate) < 0) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, minDate, minPVDate, maxPVDate);
+ }
+ if (maxDate.compareTo(maxPVDate) > 0) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, maxDate, minPVDate, maxPVDate);
+ }
+
+ final AbsoluteDate minQDate = quaternions.get(0).getFirst();
+ final AbsoluteDate maxQDate = quaternions.get(quaternions.size() - 1).getFirst();
+ if (minDate.compareTo(minQDate) < 0) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, minDate, minQDate, maxQDate);
+ }
+ if (maxDate.compareTo(maxQDate) > 0) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, maxDate, minQDate, maxQDate);
+ }
+
+ this.inertialFrame = inertialFrame;
+ this.bodyFrame = bodyFrame;
// set up the orbit provider
final List<Orbit> orbits = new ArrayList<Orbit>(positionsVelocities.size());
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8 b/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
index c96b7991..e7e552e8 100644
--- a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
+++ b/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
@@ -7,6 +7,9 @@ OUT_OF_TILE_INDICES = no data at indices [{0}, {1}], tile only covers from [0, 0
# no data at latitude {0} and longitude {1}, tile covers only latitudes {2} to {3} and longitudes {4} to {5}
OUT_OF_TILE_ANGLES = no data at latitude {0} and longitude {1}, tile covers only latitudes {2} to {3} and longitudes {4} to {5}
+# date {0} is out of time span [{1}, {2}]
+OUT_OF_TIME_RANGE = date {0} is out of time span [{1}, {2}]
+
# general context has not been initialized
UNINITIALIZED_CONTEXT = general context has not been initialized
diff --git a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8 b/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
index 27f7da0f..db99c921 100644
--- a/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
+++ b/core/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
@@ -7,6 +7,9 @@ OUT_OF_TILE_INDICES = aucune donnée aux indices [{0}, {1}], la tuile ne couvre
# no data at latitude {0} and longitude {1}, tile covers only latitudes {2} to {3} and longitudes {4} to {5}
OUT_OF_TILE_ANGLES = aucune donnée à la latitude {0} et à la longitude {1}, la tuile ne couvre que les latitudes de {2} à {3} et les longitudes de {4} à {5}
+# date {0} is out of time span [{1}, {2}]
+OUT_OF_TIME_RANGE = la date {0} est hors de la plage temporelle [{1}, {2}]
+
# general context has not been initialized
UNINITIALIZED_CONTEXT = le contexte général n''a pas été initialisé
diff --git a/core/src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java b/core/src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java
index ac332f98..0d96c5d1 100644
--- a/core/src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java
+++ b/core/src/test/java/org/orekit/rugged/api/RuggedMessagesTest.java
@@ -29,7 +29,7 @@ public class RuggedMessagesTest {
@Test
public void testMessageNumber() {
- Assert.assertEquals(10, RuggedMessages.values().length);
+ Assert.assertEquals(11, RuggedMessages.values().length);
}
@Test
diff --git a/core/src/test/java/org/orekit/rugged/api/RuggedTest.java b/core/src/test/java/org/orekit/rugged/api/RuggedTest.java
index 84cc4ce0..486f63c5 100644
--- a/core/src/test/java/org/orekit/rugged/api/RuggedTest.java
+++ b/core/src/test/java/org/orekit/rugged/api/RuggedTest.java
@@ -186,6 +186,82 @@ public class RuggedTest {
}
+ @Test
+ public void testOutOfTimeRange()
+ throws RuggedException, OrekitException, URISyntaxException {
+
+ String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ AbsoluteDate t0 = new AbsoluteDate("2012-01-01T00:00:00", TimeScalesFactory.getUTC());
+
+ @SuppressWarnings("unchecked")
+ List<Pair<AbsoluteDate, PVCoordinates>> pv = Arrays.asList(
+ createPV(t0, 0.000, -1545168.478, -7001985.361, 0.000, -1095.152224, 231.344922, -7372.851944),
+ createPV(t0, 1.000, -1546262.794, -7001750.226, -7372.851, -1093.478904, 238.925123, -7372.847995),
+ createPV(t0, 2.000, -1547355.435, -7001507.511, -14745.693, -1091.804408, 246.505033, -7372.836044),
+ createPV(t0, 3.000, -1548446.402, -7001257.216, -22118.520, -1090.128736, 254.084644, -7372.816090),
+ createPV(t0, 4.000, -1549535.693, -7000999.342, -29491.323, -1088.451892, 261.663949, -7372.788133),
+ createPV(t0, 5.000, -1550623.306, -7000733.888, -36864.094, -1086.773876, 269.242938, -7372.752175),
+ createPV(t0, 6.000, -1551709.240, -7000460.856, -44236.825, -1085.094690, 276.821604, -7372.708214),
+ createPV(t0, 7.000, -1552793.495, -7000180.245, -51609.507, -1083.414336, 284.399938, -7372.656251),
+ createPV(t0, 8.000, -1553876.068, -6999892.056, -58982.134, -1081.732817, 291.977932, -7372.596287),
+ createPV(t0, 9.000, -1554956.960, -6999596.289, -66354.697, -1080.050134, 299.555578, -7372.528320),
+ createPV(t0,10.000, -1556036.168, -6999292.945, -73727.188, -1078.366288, 307.132868, -7372.452352));
+
+ @SuppressWarnings("unchecked")
+ List<Pair<AbsoluteDate, Rotation>> q = Arrays.asList(
+ createQ(t0, 4.000, 0.517572246112, -0.399109487434, 0.581929667081, 0.483930211565),
+ createQ(t0, 5.000, 0.517876365096, -0.398856552030, 0.581658654071, 0.484139165451),
+ createQ(t0, 6.000, 0.518180341637, -0.398603508416, 0.581387482627, 0.484347986126),
+ createQ(t0, 7.000, 0.518484175647, -0.398350356669, 0.581116152834, 0.484556673529),
+ createQ(t0, 8.000, 0.518787867035, -0.398097096866, 0.580844664773, 0.484765227599));
+
+ 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);
+
+ Assert.assertNotNull(new Rugged(updater, 8, AlgorithmId.DUVENHAGE,
+ EllipsoidId.WGS84, InertialFrameId.EME2000, BodyRotatingFrameId.ITRF,
+ t0.shiftedBy(4), t0.shiftedBy(6), pv, 2, q, 2));
+ try {
+ new Rugged(updater, 8, AlgorithmId.DUVENHAGE,
+ EllipsoidId.WGS84, InertialFrameId.EME2000, BodyRotatingFrameId.ITRF,
+ t0.shiftedBy(-1), t0.shiftedBy(6), pv, 2, q, 2);
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.OUT_OF_TIME_RANGE, re.getSpecifier());
+ Assert.assertEquals(t0.shiftedBy(-1), re.getParts()[0]);
+ }
+
+ try {
+ new Rugged(updater, 8, AlgorithmId.DUVENHAGE,
+ EllipsoidId.WGS84, InertialFrameId.EME2000, BodyRotatingFrameId.ITRF,
+ t0.shiftedBy(2), t0.shiftedBy(6), pv, 2, q, 2);
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.OUT_OF_TIME_RANGE, re.getSpecifier());
+ Assert.assertEquals(t0.shiftedBy(2), re.getParts()[0]);
+ }
+
+ try {
+ new Rugged(updater, 8, AlgorithmId.DUVENHAGE,
+ EllipsoidId.WGS84, InertialFrameId.EME2000, BodyRotatingFrameId.ITRF,
+ t0.shiftedBy(4), t0.shiftedBy(9), pv, 2, q, 2);
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.OUT_OF_TIME_RANGE, re.getSpecifier());
+ Assert.assertEquals(t0.shiftedBy(9), re.getParts()[0]);
+ }
+
+ try {
+ new Rugged(updater, 8, AlgorithmId.DUVENHAGE,
+ EllipsoidId.WGS84, InertialFrameId.EME2000, BodyRotatingFrameId.ITRF,
+ t0.shiftedBy(4), t0.shiftedBy(12), pv, 2, q, 2);
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.OUT_OF_TIME_RANGE, re.getSpecifier());
+ Assert.assertEquals(t0.shiftedBy(12), re.getParts()[0]);
+ }
+
+ }
+
// the following test is disabled by default
// it is only used to check timings, and also creates a large (66M) temporary file
@Test
--
GitLab