diff --git a/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java b/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
index e06953bc452ab3cf92f2743a5f307c2396550797..22dbfc5ac45ae8376ab45e2c398d4bc8756c9b13 100644
--- a/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
+++ b/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
@@ -33,7 +33,6 @@ import org.orekit.rugged.errors.RuggedExceptionWrapper;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.adjustment.measurements.Observables;
-import org.orekit.utils.ParameterDriver;
/** Create adjustment context for viewing model refining.
* @author Lucie LabatAllee
@@ -60,7 +59,7 @@ public class AdjustmentContext {
* @param measurements control and tie points
*/
public AdjustmentContext(final Collection<Rugged> viewingModel, final Observables measurements) {
-
+
this.viewingModel = new HashMap<String, Rugged>();
for (final Rugged r : viewingModel) {
this.viewingModel.put(r.getName(), r);
@@ -85,15 +84,15 @@ public class AdjustmentContext {
* parameters, like rotation angles polynomial coefficients.
* </p>
* <p>
- * Before using this method, the {@link ParameterDriver viewing model
+ * Before using this method, the {@link org.orekit.utils.ParameterDriver viewing model
* parameters} retrieved by calling the
* {@link LineSensor#getParametersDrivers() getParametersDrivers()} method
* on the desired sensors must be configured. The parameters that should be
- * estimated must have their {@link ParameterDriver#setSelected(boolean)
+ * estimated must have their {@link org.orekit.utils.ParameterDriver#setSelected(boolean)
* selection status} set to {@code true} whereas the parameters that should
* retain their current value must have their
- * {@link ParameterDriver#setSelected(boolean) selection status} set to
- * {@code false}. If needed, the {@link ParameterDriver#setValue(double)
+ * {@link org.orekit.utils.ParameterDriver#setSelected(boolean) selection status} set to
+ * {@code false}. If needed, the {@link org.orekit.utils.ParameterDriver#setValue(double)
* value} of the estimated/selected parameters can also be changed before
* calling the method, as this value will serve as the initial value in the
* estimation process.
@@ -125,9 +124,9 @@ public class AdjustmentContext {
* ill-conditioned problem ...)
*/
public Optimum estimateFreeParameters(final Collection<String> ruggedNameList, final int maxEvaluations,
- final double parametersConvergenceThreshold)
+ final double parametersConvergenceThreshold)
throws RuggedException {
-
+
try {
final List<Rugged> ruggedList = new ArrayList<Rugged>();
diff --git a/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
index 60abb145377b0040716017823d5104763f96626d..455f75af86e746b31c4f4a30ea84303ddeb8a935 100644
--- a/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
@@ -84,7 +84,7 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
public GroundOptimizationProblemBuilder(final List<LineSensor> sensors,
final Observables measurements, final Rugged rugged)
throws RuggedException {
-
+
super(sensors, measurements);
this.rugged = rugged;
this.initMapping();
@@ -95,7 +95,7 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
*/
@Override
protected void initMapping() {
-
+
final String ruggedName = rugged.getName();
this.sensorToGroundMappings = new ArrayList<SensorToGroundMapping>();
for (final LineSensor lineSensor : sensors) {
@@ -111,7 +111,7 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
*/
@Override
protected void createTargetAndWeight() throws RuggedException {
-
+
try {
int n = 0;
for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
@@ -156,7 +156,7 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
*/
@Override
protected MultivariateJacobianFunction createFunction() {
-
+
// model function
final MultivariateJacobianFunction model = point -> {
try {
diff --git a/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
index d73fb7112d176a75d7e7dc7f61830a423aa8bce4..4f38a71e720acb576539c0e6405b847ed6c8fc10 100644
--- a/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
@@ -80,7 +80,7 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
public InterSensorsOptimizationProblemBuilder(final List<LineSensor> sensors,
final Observables measurements, final Collection<Rugged> ruggedList)
throws RuggedException {
-
+
super(sensors, measurements);
this.ruggedMap = new LinkedHashMap<String, Rugged>();
for (final Rugged rugged : ruggedList) {
@@ -95,25 +95,25 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
@Override
protected void initMapping() {
- this.sensorToSensorMappings = new ArrayList<SensorToSensorMapping>();
-
- for (final String ruggedNameA : this.ruggedMap.keySet()) {
- for (final String ruggedNameB : this.ruggedMap.keySet()) {
-
- for (final LineSensor sensorA : this.sensors) {
- for (final LineSensor sensorB : this.sensors) {
-
- final String sensorNameA = sensorA.getName();
- final String sensorNameB = sensorB.getName();
- final SensorToSensorMapping mapping = this.measurements.getInterMapping(ruggedNameA, sensorNameA, ruggedNameB, sensorNameB);
-
- if (mapping != null) {
- this.sensorToSensorMappings.add(mapping);
- }
- }
- }
- }
- }
+ this.sensorToSensorMappings = new ArrayList<SensorToSensorMapping>();
+
+ for (final String ruggedNameA : this.ruggedMap.keySet()) {
+ for (final String ruggedNameB : this.ruggedMap.keySet()) {
+
+ for (final LineSensor sensorA : this.sensors) {
+ for (final LineSensor sensorB : this.sensors) {
+
+ final String sensorNameA = sensorA.getName();
+ final String sensorNameB = sensorB.getName();
+ final SensorToSensorMapping mapping = this.measurements.getInterMapping(ruggedNameA, sensorNameA, ruggedNameB, sensorNameB);
+
+ if (mapping != null) {
+ this.sensorToSensorMappings.add(mapping);
+ }
+ }
+ }
+ }
+ }
}
/* (non-Javadoc)
@@ -122,51 +122,51 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
@Override
protected void createTargetAndWeight() throws RuggedException {
- try {
- int n = 0;
- for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
- n += reference.getMapping().size();
- }
- if (n == 0) {
- throw new RuggedException(RuggedMessages.NO_REFERENCE_MAPPINGS);
- }
-
- n = 2 * n;
-
- final double[] target = new double[n];
- final double[] weight = new double[n];
-
- int k = 0;
- for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
-
- // Get Earth constraint weight
- final double earthConstraintWeight = reference.getEarthConstraintWeight();
-
- int i = 0;
- for (Iterator<Map.Entry<SensorPixel, SensorPixel>> gtIt = reference.getMapping().iterator(); gtIt.hasNext(); i++) {
-
- if (i == reference.getMapping().size()) break;
-
- // Get LOS distance
- final Double losDistance = reference.getLosDistance(i);
-
- weight[k] = 1.0 - earthConstraintWeight;
- target[k++] = losDistance.doubleValue();
-
- // Get Earth distance (constraint)
- final Double earthDistance = reference.getEarthDistance(i);
- weight[k] = earthConstraintWeight;
- target[k++] = earthDistance.doubleValue();
- }
- }
-
- this.targetAndWeight = new HashMap<String, double[]>();
- this.targetAndWeight.put(TARGET, target);
- this.targetAndWeight.put(WEIGHT, weight);
-
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
- }
+ try {
+ int n = 0;
+ for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
+ n += reference.getMapping().size();
+ }
+ if (n == 0) {
+ throw new RuggedException(RuggedMessages.NO_REFERENCE_MAPPINGS);
+ }
+
+ n = 2 * n;
+
+ final double[] target = new double[n];
+ final double[] weight = new double[n];
+
+ int k = 0;
+ for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
+
+ // Get Earth constraint weight
+ final double earthConstraintWeight = reference.getEarthConstraintWeight();
+
+ int i = 0;
+ for (Iterator<Map.Entry<SensorPixel, SensorPixel>> gtIt = reference.getMapping().iterator(); gtIt.hasNext(); i++) {
+
+ if (i == reference.getMapping().size()) break;
+
+ // Get LOS distance
+ final Double losDistance = reference.getLosDistance(i);
+
+ weight[k] = 1.0 - earthConstraintWeight;
+ target[k++] = losDistance.doubleValue();
+
+ // Get Earth distance (constraint)
+ final Double earthDistance = reference.getEarthDistance(i);
+ weight[k] = earthConstraintWeight;
+ target[k++] = earthDistance.doubleValue();
+ }
+ }
+
+ this.targetAndWeight = new HashMap<String, double[]>();
+ this.targetAndWeight.put(TARGET, target);
+ this.targetAndWeight.put(WEIGHT, weight);
+
+ } catch (RuggedExceptionWrapper rew) {
+ throw rew.getException();
+ }
}
/* (non-Javadoc)
@@ -174,11 +174,11 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
*/
@Override
protected MultivariateJacobianFunction createFunction() {
-
+
// model function
final MultivariateJacobianFunction model = point -> {
- try {
+ try {
// set the current parameters values
int i = 0;
for (final ParameterDriver driver : this.drivers) {
@@ -223,8 +223,8 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
final DerivativeStructure[] ilResult =
- ruggedB.distanceBetweenLOSDerivatives(lineSensorA, dateA, pixelA, scToBodyA,
- lineSensorB, dateB, pixelB, generator);
+ ruggedB.distanceBetweenLOSDerivatives(lineSensorA, dateA, pixelA, scToBodyA,
+ lineSensorB, dateB, pixelB, generator);
if (ilResult == null) {
// TODO GP manque code
diff --git a/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java b/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
index edc5dc5ba9bf9250c294d4957fb178149b8b095f..ee8f1490dc29c34708457af16ae2e1bd4d2df741 100644
--- a/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
+++ b/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
@@ -41,7 +41,7 @@ public class LeastSquareAdjuster {
*/
// TODO GP public protected ???
LeastSquareAdjuster(final OptimizerId optimizerID) {
-
+
this.optimizerID = optimizerID;
this.adjuster = this.selectOptimizer();
}
@@ -49,7 +49,7 @@ public class LeastSquareAdjuster {
/** Default constructor with Gauss Newton with QR decomposition algorithm.*/
// TODO GP public protected ???
LeastSquareAdjuster() {
-
+
this.optimizerID = OptimizerId.GAUSS_NEWTON_QR;
this.adjuster = this.selectOptimizer();
}
@@ -66,7 +66,7 @@ public class LeastSquareAdjuster {
* @return the least square optimizer
*/
private LeastSquaresOptimizer selectOptimizer() {
-
+
// Set up the optimizer
switch (this.optimizerID) {
diff --git a/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
index 366190ecb547c914f5475d4a617230db6f8b306a..369f03c346ce2d340bf154ed6da8dec9d58e63b3 100644
--- a/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
@@ -75,7 +75,7 @@ abstract class OptimizationProblemBuilder {
* @throws RuggedException an exception is generated if no parameters has been selected for refining
*/
OptimizationProblemBuilder(final List<LineSensor> sensors, final Observables measurements) throws RuggedException {
-
+
try {
this.generator = this.createGenerator(sensors);
this.drivers = this.generator.getSelected();
@@ -134,12 +134,12 @@ abstract class OptimizationProblemBuilder {
final ConvergenceChecker<LeastSquaresProblem.Evaluation>
createChecker(final double parametersConvergenceThreshold) {
- // TODO GP description a completer
- final ConvergenceChecker<LeastSquaresProblem.Evaluation> checker =
- (iteration, previous, current)
- -> current.getPoint().getLInfDistance(previous.getPoint())
- <= parametersConvergenceThreshold;
-
+ // TODO GP description a completer
+ final ConvergenceChecker<LeastSquaresProblem.Evaluation> checker =
+ (iteration, previous, current)
+ -> current.getPoint().getLInfDistance(previous.getPoint())
+ <= parametersConvergenceThreshold;
+
return checker;
}
@@ -147,7 +147,7 @@ abstract class OptimizationProblemBuilder {
* @return start parameters values (normalized)
*/
final double[] createStartTab() {
-
+
// Get start points (as a normalized value)
final double[] start = new double[this.nbParams];
int iStart = 0;
@@ -170,14 +170,14 @@ abstract class OptimizationProblemBuilder {
* @return parameter validator
*/
final ParameterValidator createParameterValidator() {
-
+
// Prevent parameters to exceed their prescribed bounds
// TODO GP description a completer
final ParameterValidator validator = params -> {
try {
int i = 0;
for (final ParameterDriver driver : this.drivers) {
-
+
// let the parameter handle min/max clipping
driver.setNormalizedValue(params.getEntry(i));
params.setEntry(i++, driver.getNormalizedValue());
@@ -199,15 +199,15 @@ abstract class OptimizationProblemBuilder {
private DSGenerator createGenerator(final List<LineSensor> selectedSensors) {
// Initialize set of drivers name
- final Set<String> names = new HashSet<>();
+ final Set<String> names = new HashSet<>();
// Get the drivers name
for (final LineSensor sensor : selectedSensors) {
-
- // Get the drivers name for the sensor
+
+ // Get the drivers name for the sensor
sensor.getParametersDrivers().forEach(driver -> {
-
- // Add the name of the driver to the set of drivers name
+
+ // Add the name of the driver to the set of drivers name
if (names.contains(driver.getName()) == false) {
names.add(driver.getName());
}
@@ -220,7 +220,7 @@ abstract class OptimizationProblemBuilder {
// Get the list of selected drivers
for (final LineSensor sensor : selectedSensors) {
-
+
sensor.getParametersDrivers().filter(driver -> driver.isSelected()).forEach(driver -> {
if (map.get(driver.getName()) == null) {
map.put(driver.getName(), map.size());
@@ -249,7 +249,7 @@ abstract class OptimizationProblemBuilder {
/** {@inheritDoc} */
@Override
public DerivativeStructure variable(final ParameterDriver driver) {
-
+
final Integer index = map.get(driver.getName());
if (index == null) {
return constant(driver.getValue());
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/Noise.java b/src/main/java/org/orekit/rugged/adjustment/measurements/Noise.java
index 1e2f3f97bf1ac0682989ba2f5064d73178a2c5be..8498df8f60d2baa79c77b9f881161a229f1d657b 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/Noise.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/Noise.java
@@ -44,7 +44,7 @@ public class Noise {
* @param dimension noise dimension
*/
public Noise(final int distribution, final int dimension) {
-
+
this.mean = new double[dimension];
this.standardDeviation = new double[dimension];
Noise.dimension = dimension;
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
index 4864f42827b130e77e82726f8972365642f0f6da..2ab234b223a3f54bba3b69a2160c3c33b853ce2a 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
@@ -49,7 +49,7 @@ public class Observables {
* @param nbModels number of viewing models to map
*/
public Observables(final int nbModels) {
-
+
this.groundMappings = new LinkedHashMap<String, SensorToGroundMapping>();
this.interMappings = new LinkedHashMap<String, SensorToSensorMapping>();
this.nbModels = nbModels;
@@ -59,7 +59,7 @@ public class Observables {
* @param interMapping sensor to sensor mapping
*/
public void addInterMapping(final SensorToSensorMapping interMapping) {
-
+
interMappings.put(this.createKey(interMapping), interMapping);
}
@@ -68,7 +68,7 @@ public class Observables {
* @param groundMapping sensor to ground mapping
*/
public void addGroundMapping(final SensorToGroundMapping groundMapping) {
-
+
groundMappings.put(this.createKey(groundMapping), groundMapping);
}
@@ -86,7 +86,7 @@ public class Observables {
* @return selected ground mapping or null if sensor is not found
*/
public SensorToGroundMapping getGroundMapping(final String ruggedName, final String sensorName) {
-
+
final SensorToGroundMapping mapping = this.groundMappings.get(ruggedName + RUGGED_SENSOR_SEPARATOR + sensorName);
return mapping;
}
@@ -116,9 +116,9 @@ public class Observables {
* @return selected ground mapping or null if a sensor is not found
*/
public SensorToSensorMapping getInterMapping(final String ruggedNameA, final String sensorNameA,
- final String ruggedNameB, final String sensorNameB) {
+ final String ruggedNameB, final String sensorNameB) {
- //TODO GP revoir la creation de string par "+"
+ //TODO GP revoir la creation de string par "+"
final String keyA = ruggedNameA + RUGGED_SENSOR_SEPARATOR + sensorNameA;
final String keyB = ruggedNameB + RUGGED_SENSOR_SEPARATOR + sensorNameB;
final SensorToSensorMapping mapping = interMappings.get(keyA + SENSORS_SEPARATOR + keyB);
@@ -131,7 +131,7 @@ public class Observables {
*/
private String createKey(final SensorToGroundMapping groundMapping)
{
- //TODO GP revoir la creation de string par "+"
+ //TODO GP revoir la creation de string par "+"
final String key = groundMapping.getRuggedName() + RUGGED_SENSOR_SEPARATOR + groundMapping.getSensorName();
return key;
}
@@ -142,7 +142,7 @@ public class Observables {
*/
private String createKey(final SensorToSensorMapping sensorMapping)
{
- //TODO GP revoir la creation de string par "+"
+ //TODO GP revoir la creation de string par "+"
final String keyA = sensorMapping.getRuggedNameA() + RUGGED_SENSOR_SEPARATOR + sensorMapping.getSensorNameA();
final String keyB = sensorMapping.getRuggedNameB() + RUGGED_SENSOR_SEPARATOR + sensorMapping.getSensorNameB();
return keyA + SENSORS_SEPARATOR + keyB;
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
index 199e3139b334c5381bb5fd927947aab68e78724b..ccf28f9fd371aab5ca554b49e2918b5b1364bb7d 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
@@ -55,7 +55,7 @@ public class SensorMapping<T> {
* @param ruggedName name of the Rugged to which mapping applies
*/
public SensorMapping(final String sensorName, final String ruggedName) {
-
+
this.sensorName = sensorName;
this.ruggedName = ruggedName;
this.mapping = new LinkedHashMap<SensorPixel, T>();
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
index 5cb1f228206deefe1b0f8761703b82a294b7488a..29d40d0e55ae36bb8115de2a5cf06bd999951ca1 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
@@ -54,7 +54,7 @@ public class SensorToGroundMapping {
* @param sensorName name of the sensor to which mapping applies
*/
public SensorToGroundMapping(final String ruggedName, final String sensorName) {
-
+
this.sensorName = sensorName;
this.groundMapping = new SensorMapping<GeodeticPoint>(sensorName, ruggedName);
}
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
index 931adaa5356a8d31812111764841674fb54441af..2b425d4d6ef63e3c89aa5832d5404e175abec2de 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
@@ -28,7 +29,7 @@ import org.orekit.time.AbsoluteDate;
/** Container for mapping sensors pixels of two viewing models.
* Store the distance between both lines of sight computed with
- * {@link org.orekit.rugged.api.Rugged#distanceBetweenLOS(LineSensor, AbsoluteDate, double, SpacecraftToObservedBody, LineSensor, AbsoluteDate, double)}
+ * {@link Rugged#distanceBetweenLOS(LineSensor, AbsoluteDate, double, SpacecraftToObservedBody, LineSensor, AbsoluteDate, double)}
* <p> Constraints in relation to Earth distance can be added.
* @see SensorMapping
* @author Lucie LabatAllee
@@ -64,7 +65,7 @@ public class SensorToSensorMapping {
* @param sensorNameB name of the sensor B to which mapping applies
*/
public SensorToSensorMapping(final String sensorNameA, final String sensorNameB) {
-
+
this(sensorNameA, RUGGED, sensorNameB, RUGGED, 0.0);
}
@@ -82,10 +83,10 @@ public class SensorToSensorMapping {
* </ul>
*/
public SensorToSensorMapping(final String sensorNameA, final String ruggedNameA,
- final String sensorNameB, final String ruggedNameB,
- final double earthConstraintWeight) {
-
- this.interMapping = new SensorMapping<SensorPixel>(sensorNameA, ruggedNameA);
+ final String sensorNameB, final String ruggedNameB,
+ final double earthConstraintWeight) {
+
+ this.interMapping = new SensorMapping<SensorPixel>(sensorNameA, ruggedNameA);
this.sensorNameB = sensorNameB;
this.ruggedNameB = ruggedNameB;
this.losDistances = new ArrayList<Double>();
@@ -100,8 +101,8 @@ public class SensorToSensorMapping {
* @param ruggedNameB name of the Rugged B to which mapping applies
*/
public SensorToSensorMapping(final String sensorNameA, final String ruggedNameA,
- final String sensorNameB, final String ruggedNameB) {
-
+ final String sensorNameB, final String ruggedNameB) {
+
this(sensorNameA, ruggedNameA, sensorNameB, ruggedNameB, 0.0);
}
@@ -119,7 +120,7 @@ public class SensorToSensorMapping {
*/
public SensorToSensorMapping(final String sensorNameA, final String sensorNameB,
final double earthConstraintWeight) {
-
+
this(sensorNameA, RUGGED, sensorNameB, RUGGED, earthConstraintWeight);
}
@@ -201,7 +202,7 @@ public class SensorToSensorMapping {
* @param losDistance distance between both line of sight
*/
public void addMapping(final SensorPixel pixelA, final SensorPixel pixelB, final Double losDistance) {
-
+
interMapping.addMapping(pixelA, pixelB);
losDistances.add(losDistance);
}
@@ -215,7 +216,7 @@ public class SensorToSensorMapping {
*/
public void addMapping(final SensorPixel pixelA, final SensorPixel pixelB,
final Double losDistance, final Double earthDistance) {
-
+
interMapping.addMapping(pixelA, pixelB);
losDistances.add(losDistance);
earthDistances.add(earthDistance);
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index aeb95d14f5d8191f7138547dbd460f9fdfcd330a..94de337350c95225f8b40bf0245dfd2db3256dff 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -631,7 +631,7 @@ public class Rugged {
throws RuggedException {
// Compute the approximate transform between spacecraft and observed body
- // from Rugged instance A
+ // from Rugged instance A
final Transform scToInertA = scToBodyA.getScToInertial(dateA);
final Transform inertToBodyA = scToBodyA.getInertialToBody(dateA);
final Transform transformScToBodyA = new Transform(dateA, scToInertA, inertToBodyA);
@@ -699,20 +699,20 @@ public class Rugged {
* @see #distanceBetweenLOS(LineSensor, AbsoluteDate, double, SpacecraftToObservedBody, LineSensor, AbsoluteDate, double)
*/
public DerivativeStructure[] distanceBetweenLOSDerivatives(
- final LineSensor sensorA, final AbsoluteDate dateA, final double pixelA,
- final SpacecraftToObservedBody scToBodyA,
- final LineSensor sensorB, final AbsoluteDate dateB, final double pixelB,
- final DSGenerator generator)
+ final LineSensor sensorA, final AbsoluteDate dateA, final double pixelA,
+ final SpacecraftToObservedBody scToBodyA,
+ final LineSensor sensorB, final AbsoluteDate dateB, final double pixelB,
+ final DSGenerator generator)
throws RuggedException {
// Compute the approximate transforms between spacecraft and observed body
- // from Rugged instance A
- final Transform scToInertA = scToBodyA.getScToInertial(dateA);
+ // from Rugged instance A
+ final Transform scToInertA = scToBodyA.getScToInertial(dateA);
final Transform inertToBodyA = scToBodyA.getInertialToBody(dateA);
final Transform transformScToBodyA = new Transform(dateA, scToInertA, inertToBodyA);
-
- // from (current) Rugged instance B
- final Transform scToInertB = scToBody.getScToInertial(dateB);
+
+ // from (current) Rugged instance B
+ final Transform scToInertB = scToBody.getScToInertial(dateB);
final Transform inertToBodyB = scToBody.getInertialToBody(dateB);
final Transform transformScToBodyB = new Transform(dateB, scToInertB, inertToBodyB);