From 6159fed91ec3df46e157f72ebb8c3151055e642a Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Tue, 2 Jun 2015 09:34:01 +0200
Subject: [PATCH] Updated to current Orekit development version.
Some attitude laws constructors used in tests have been deprecated.
---
src/test/java/org/orekit/rugged/TestUtils.java | 15 +++++++--------
.../org/orekit/rugged/api/RuggedBuilderTest.java | 11 +++++------
.../linesensor/SensorMeanPlaneCrossingTest.java | 12 ++++--------
3 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/test/java/org/orekit/rugged/TestUtils.java b/src/test/java/org/orekit/rugged/TestUtils.java
index 4abca5c7..2e31a38d 100644
--- a/src/test/java/org/orekit/rugged/TestUtils.java
+++ b/src/test/java/org/orekit/rugged/TestUtils.java
@@ -31,7 +31,6 @@ import org.orekit.bodies.BodyShape;
import org.orekit.bodies.CelestialBodyFactory;
import org.orekit.bodies.OneAxisEllipsoid;
import org.orekit.errors.OrekitException;
-import org.orekit.errors.PropagationException;
import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
import org.orekit.forces.gravity.ThirdBodyAttraction;
import org.orekit.forces.gravity.potential.GravityFieldFactory;
@@ -121,11 +120,11 @@ public class TestUtils {
}
public static Propagator createPropagator(BodyShape earth,
- NormalizedSphericalHarmonicsProvider gravityField,
- Orbit orbit)
+ NormalizedSphericalHarmonicsProvider gravityField,
+ Orbit orbit)
throws OrekitException {
- AttitudeProvider yawCompensation = new YawCompensation(new NadirPointing(earth));
+ AttitudeProvider yawCompensation = new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth));
SpacecraftState state = new SpacecraftState(orbit,
yawCompensation.getAttitude(orbit,
orbit.getDate(),
@@ -176,9 +175,9 @@ public class TestUtils {
public static List<TimeStampedPVCoordinates> orbitToPV(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
double step)
- throws PropagationException {
+ throws OrekitException {
Propagator propagator = new KeplerianPropagator(orbit);
- propagator.setAttitudeProvider(new YawCompensation(new NadirPointing(earth)));
+ propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
propagator.setMasterMode(step, new OrekitFixedStepHandler() {
@@ -198,9 +197,9 @@ public class TestUtils {
public static List<TimeStampedAngularCoordinates> orbitToQ(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
double step)
- throws PropagationException {
+ throws OrekitException {
Propagator propagator = new KeplerianPropagator(orbit);
- propagator.setAttitudeProvider(new YawCompensation(new NadirPointing(earth)));
+ propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
propagator.setMasterMode(step, new OrekitFixedStepHandler() {
diff --git a/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java b/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
index fc528531..e8cd88ec 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
@@ -47,7 +47,6 @@ import org.orekit.bodies.OneAxisEllipsoid;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
-import org.orekit.errors.PropagationException;
import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
import org.orekit.forces.gravity.ThirdBodyAttraction;
import org.orekit.forces.gravity.potential.GravityFieldFactory;
@@ -636,7 +635,7 @@ public class RuggedBuilderTest {
Orbit orbit)
throws OrekitException {
- AttitudeProvider yawCompensation = new YawCompensation(new NadirPointing(earth));
+ AttitudeProvider yawCompensation = new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth));
SpacecraftState state = new SpacecraftState(orbit,
yawCompensation.getAttitude(orbit,
orbit.getDate(),
@@ -690,9 +689,9 @@ public class RuggedBuilderTest {
private List<TimeStampedPVCoordinates> orbitToPV(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
double step)
- throws PropagationException {
+ throws OrekitException {
Propagator propagator = new KeplerianPropagator(orbit);
- propagator.setAttitudeProvider(new YawCompensation(new NadirPointing(earth)));
+ propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
propagator.setMasterMode(step, new OrekitFixedStepHandler() {
@@ -712,9 +711,9 @@ public class RuggedBuilderTest {
private List<TimeStampedAngularCoordinates> orbitToQ(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
double step)
- throws PropagationException {
+ throws OrekitException {
Propagator propagator = new KeplerianPropagator(orbit);
- propagator.setAttitudeProvider(new YawCompensation(new NadirPointing(earth)));
+ propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
propagator.setMasterMode(step, new OrekitFixedStepHandler() {
diff --git a/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java b/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
index 27674522..83adee24 100644
--- a/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
+++ b/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
@@ -35,7 +35,6 @@ import org.orekit.bodies.OneAxisEllipsoid;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
-import org.orekit.errors.PropagationException;
import org.orekit.frames.FramesFactory;
import org.orekit.orbits.CircularOrbit;
import org.orekit.orbits.Orbit;
@@ -45,9 +44,6 @@ import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.analytical.KeplerianPropagator;
import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.linesensor.LinearLineDatation;
-import org.orekit.rugged.linesensor.SensorMeanPlaneCrossing;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
@@ -150,9 +146,9 @@ public class SensorMeanPlaneCrossingTest {
private List<TimeStampedPVCoordinates> orbitToPV(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
double step)
- throws PropagationException {
+ throws OrekitException {
Propagator propagator = new KeplerianPropagator(orbit);
- propagator.setAttitudeProvider(new YawCompensation(new NadirPointing(earth)));
+ propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
propagator.setMasterMode(step, new OrekitFixedStepHandler() {
@@ -172,9 +168,9 @@ public class SensorMeanPlaneCrossingTest {
private List<TimeStampedAngularCoordinates> orbitToQ(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
double step)
- throws PropagationException {
+ throws OrekitException {
Propagator propagator = new KeplerianPropagator(orbit);
- propagator.setAttitudeProvider(new YawCompensation(new NadirPointing(earth)));
+ propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
propagator.setMasterMode(step, new OrekitFixedStepHandler() {
--
GitLab