From f67ff9911e4bf5253f3f5b852d9a83a8a77fd44f Mon Sep 17 00:00:00 2001
From: Jonathan Guinet <jonathan.guinet@c-s.fr>
Date: Thu, 10 Nov 2016 11:19:38 -0500
Subject: [PATCH] distanceBetweenLOS should be handle multiple Rugged instances
---
.../java/org/orekit/rugged/api/Rugged.java | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 3143976f..23a2759b 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -587,23 +587,23 @@ public class Rugged {
}
/** Compute distance between two line sensors.
- * @param sensorNameA name of the line sensor A
+ * @param sensorA line sensor A
* @param dateA current date for sensor A
* @param pixelA pixel index for sensor A
- * @param sensorNameB name of the line sensor B
+ * @param sensorB line sensor B
* @param dateB current date for sensor B
* @param pixelB pixel index for sensor B
* @return distance computing
* @exception RuggedException if sensor is unknown
*/
- public double distanceBetweenLOS(final String sensorNameA,
+ public double distanceBetweenLOS(final LineSensor sensorA,
final AbsoluteDate dateA, final int pixelA,
- final String sensorNameB,
+ final LineSensor sensorB,
final AbsoluteDate dateB, final int pixelB)
throws RuggedException {
- final LineSensor sensorA = getLineSensor(sensorNameA);
- final LineSensor sensorB = getLineSensor(sensorNameB);
+ //final LineSensor sensorA = getLineSensor(sensorNameA);
+ //final LineSensor sensorB = getLineSensor(sensorNameB);
// Get sensors's position and LOS
final Vector3D vA = sensorA.getLOS(dateA, pixelA); // V_a : line of sight's vectorA
@@ -633,10 +633,10 @@ public class Rugged {
return d;
}
/** Compute distance between two line sensors with derivatives.
- * @param sensorNameA name of the line sensor A
+ * @param sensorA line sensor A
* @param dateA current date for sensor A
* @param pixelA pixel index for sensor A
- * @param sensorNameB name of the line sensor B
+ * @param sensorB line sensor B
* @param dateB current date for sensor B
* @param pixelB pixel index for sensor B
* @param generator generator to use for building {@link DerivativeStructure} instances
@@ -644,15 +644,15 @@ public class Rugged {
* @exception RuggedException if sensor is unknown
* @see #distanceBetweenLOS(String, AbsoluteDate, int, String, AbsoluteDate, int)
*/
- private DerivativeStructure[] distanceBetweenLOSDerivatives(final String sensorNameA,
+ private DerivativeStructure[] distanceBetweenLOSDerivatives(final LineSensor sensorA,
final AbsoluteDate dateA, final int pixelA,
- final String sensorNameB,
+ final LineSensor sensorB,
final AbsoluteDate dateB, final int pixelB,
final DSGenerator generator)
throws RuggedException {
- final LineSensor sensorA = getLineSensor(sensorNameA);
- final LineSensor sensorB = getLineSensor(sensorNameB);
+ //final LineSensor sensorA = getLineSensor(sensorNameA);
+ //final LineSensor sensorB = getLineSensor(sensorNameB);
// Get sensors's LOS
final FieldVector3D<DerivativeStructure> vA = sensorA.getLOSDerivatives(dateA, pixelA, generator); // V_a : line of sight's vectorA
--
GitLab