From 53785b4ea9ad03b1477dafe26b944e76f16d36f3 Mon Sep 17 00:00:00 2001
From: Jonathan Guinet <jonathan.guinet@c-s.fr>
Date: Wed, 22 Feb 2017 10:24:49 -0500
Subject: [PATCH] checkstyle
---
.../java/org/orekit/rugged/api/Rugged.java | 59 +------------------
.../rugged/refining/measures/Observables.java | 21 ++++---
.../measures/SensorToGroundMapping.java | 3 -
.../measures/SensorToSensorMapping.java | 8 +--
4 files changed, 16 insertions(+), 75 deletions(-)
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 019451c7..023b3561 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -764,26 +764,6 @@ public class Rugged {
final Vector3D sB = trasnformScToBodyB.transformPosition(sBLocal);
final Vector3D vB = trasnformScToBodyB.transformVector(vBLocal);
- final GeodeticPoint gpB = algorithm
- .refineIntersection(ellipsoid,sB, vB, algorithm
- .intersection(ellipsoid, sB, vB));
-
-
- GeodeticPoint gpB2 = directLocation(dateB, sensorB.getPosition(),
- sensorB.getLOS(dateB, pixelB));
- /*double GEOdistance = DistanceTools.computeDistanceRad(gpB.getLongitude(), gpB.getLatitude(),
- gpB2.getLongitude(), gpB2.getLatitude());
-
- System.out.format("GEO dist %1.6e %n",GEOdistance);
- System.out.format(Locale.US, "%n geodetic position B: φ = %8.10f °, λ = %8.10f °, h = %8.3f m%n",
- FastMath.toDegrees(gpB.getLatitude()),
- FastMath.toDegrees(gpB.getLongitude()),gpB.getAltitude());
-
- System.out.format(Locale.US, "geodetic position B2 : φ = %8.10f °, λ = %8.10f °, h = %8.3f m%n%n",
- FastMath.toDegrees(gpB2.getLatitude()),
- FastMath.toDegrees(gpB2.getLongitude()),gpB2.getAltitude()); */
-
-
final Vector3D vBase = sB.subtract(sA); // S_b - S_a
final double svA = Vector3D.dotProduct(vBase, vA); // SV_a = (S_b -
// S_a).V_a
@@ -815,20 +795,9 @@ public class Rugged {
final Vector3D vDistance = mB.subtract(mA); // M_b - M_a
final Vector3D midPoint = (mB.add(mA)).scalarMultiply(0.5);
- //System.out.format("mid Point x %f y %f z %f %n",midPoint.getX(),midPoint.getY(),midPoint.getZ());
- //System.out.format("mid Point Norm %f %n",midPoint.getNorm());
-
-
- // System.out.format("vDistance %f %f %f
- // ",vDistance.getX(),vDistance.getY(),vDistance.getZ());
-
- // equA and equB should be 0
- // final Vector3D mAmB= mB.subtract(mA);
- // final double equA = Vector3D.dotProduct(mAmB, vA);
- // final double equB = Vector3D.dotProduct(mAmB, vB);
// Get the euclidean norm
- final double[] d = {vDistance.getNorm(),midPoint.getNorm()};
+ final double[] d = {vDistance.getNorm(), midPoint.getNorm()};
return d;
}
@@ -895,8 +864,6 @@ public class Rugged {
final FieldVector3D<DerivativeStructure> vB = trasnformScToBodyB
.transformVector(vBLocal); // V_b
- // Get sensors's position into local frame TODO: check if we have to
- // implement getPositionDerivatives() method & CO
final Vector3D sAtmp = sensorA.getPosition(); // S_a : sensorA 's
// position
final Vector3D sBtmp = sensorB.getPosition(); // S_b : sensorB 's
@@ -916,10 +883,6 @@ public class Rugged {
final FieldVector3D<DerivativeStructure> sB = trasnformScToBodyB
.transformPosition(sBLocal);
- // final FieldVector3D<DerivativeStructure> sA =
- // sensorA.getPositionDerivatives(); // S_a : sensorA 's position
- // final FieldVector3D<DerivativeStructure> sB =
- // sensorB.getPositionDerivatives(); // S_b
final FieldVector3D<DerivativeStructure> vBase = sB.subtract(sA); // S_b
// -
@@ -937,14 +900,6 @@ public class Rugged {
final DerivativeStructure vAvB = FieldVector3D.dotProduct(vA, vB); // V_a.V_b
- // Test using |SaSb,Va,Vb |/||Va^Vb||
- // final FieldVector3D<DerivativeStructure> w =
- // FieldVector3D.crossProduct(vA, vB);
- // final FieldVector3D<DerivativeStructure> vect =
- // FieldVector3D.crossProduct(vBase,vA);
- // final DerivativeStructure k = FieldVector3D.dotProduct(vect, vB);
- // final DerivativeStructure dist = k.abs().divide(w.getNorm());
-
// Compute lambda_b = (SV_a * V_a.V_b - SV_b) / (1 - (V_a.V_b)²)
final DerivativeStructure lambdaB = (svA.multiply(vAvB).subtract(svB))
.divide(vAvB.multiply(vAvB).subtract(1).negate());
@@ -964,17 +919,7 @@ public class Rugged {
// Get the euclidean norm
final FieldVector3D<DerivativeStructure> midPoint = (mB.add(mA)).scalarMultiply(0.5);
- //System.out.format("mid Point x %f y %f z %f %n",midPoint.getX(),midPoint.getY(),midPoint.getZ());
- //System.out.format("mid Point Norm %f %n",midPoint.getNorm());
-
-
- // System.out.format("vDistance %f %f %f
- // ",vDistance.getX(),vDistance.getY(),vDistance.getZ());
- // equA and equB should be 0
- // final Vector3D mAmB= mB.subtract(mA);
- // final double equA = Vector3D.dotProduct(mAmB, vA);
- // final double equB = Vector3D.dotProduct(mAmB, vB);
// Get the euclidean norm
final DerivativeStructure dEarth = midPoint.getNorm();
@@ -1200,7 +1145,7 @@ public class Rugged {
}
/**
- * Get converter between spacecraft and body
+ * Get converter between spacecraft and body.
*
* @return the scToBody
*/
diff --git a/src/main/java/org/orekit/rugged/refining/measures/Observables.java b/src/main/java/org/orekit/rugged/refining/measures/Observables.java
index 4e2318b4..30859183 100644
--- a/src/main/java/org/orekit/rugged/refining/measures/Observables.java
+++ b/src/main/java/org/orekit/rugged/refining/measures/Observables.java
@@ -28,19 +28,18 @@ import java.util.Map;
*/
public class Observables {
- /** Sensor to ground mapping structure (example: for GCP points) */
+ /** Sensor to ground mapping structure (example: for GCP points).*/
private final Map<String, SensorToGroundMapping> groundMappings;
/** Sensor to sensor mappings structure (liaison points). */
private final Map<String, SensorToSensorMapping> interMappings;
- /** Number of viewing models to map */
+ /** Number of viewing models to map.*/
private final int nbModels;
/** Build a new instance.
- * @param sensorName name of the sensor to which mapping applies
- * @param nbMeasures number of viewing models
+ * @param nbModels number of viewing models
*/
public Observables(final int nbModels) {
this.groundMappings = new LinkedHashMap<String, SensorToGroundMapping>();
@@ -48,16 +47,15 @@ public class Observables {
this.nbModels = nbModels;
}
- /** Add a mapping between two viewing models
- * @param SensorToSensorMapping sensor to sensor mapping
+ /** Add a mapping between two viewing models.
+ * @param interMapping sensor to sensor mapping
*/
public void addInterMapping(final SensorToSensorMapping interMapping) {
- final String key = this.createKey(interMapping);
- interMappings.put(this.createKey(interMapping),interMapping);
+ interMappings.put(this.createKey(interMapping), interMapping);
}
- /** Add a ground mapping between
- * @param SensorToGroundMapping sensor to ground mapping
+ /** Add a ground mapping between.
+ * @param groundMapping sensor to ground mapping
*/
public void addGroundMapping(final SensorToGroundMapping groundMapping) {
groundMappings.put(this.createKey(groundMapping), groundMapping);
@@ -75,6 +73,7 @@ public class Observables {
/**
* Get a ground Mapping for a sensor.
*
+ * @param ruggedName rugged name
* @param sensorName sensor name
* @return selected ground mapping or null of sensorName is not found
*/
@@ -127,7 +126,7 @@ public class Observables {
}
/** create key for SensorToSensorMapping map.
- * @param groundMapping the groundMapping
+ * @param sensorMapping the interMapping
* @return the key
*/
private String createKey(final SensorToSensorMapping sensorMapping)
diff --git a/src/main/java/org/orekit/rugged/refining/measures/SensorToGroundMapping.java b/src/main/java/org/orekit/rugged/refining/measures/SensorToGroundMapping.java
index f9410bc8..26663576 100644
--- a/src/main/java/org/orekit/rugged/refining/measures/SensorToGroundMapping.java
+++ b/src/main/java/org/orekit/rugged/refining/measures/SensorToGroundMapping.java
@@ -83,7 +83,4 @@ public class SensorToGroundMapping {
return Collections.unmodifiableSet(groundMapping.getMapping());
}
-
- //public Boolean Match(final String SensorName,final String )
-
}
diff --git a/src/main/java/org/orekit/rugged/refining/measures/SensorToSensorMapping.java b/src/main/java/org/orekit/rugged/refining/measures/SensorToSensorMapping.java
index 22d01216..0967fdc1 100644
--- a/src/main/java/org/orekit/rugged/refining/measures/SensorToSensorMapping.java
+++ b/src/main/java/org/orekit/rugged/refining/measures/SensorToSensorMapping.java
@@ -43,17 +43,17 @@ public class SensorToSensorMapping {
/** Mapping from sensor A to sensor B. */
private final SensorMapping<SensorPixel> interMapping;
- /** Distance between two LOS */
+ /** Distance between two LOS. */
private final List<Double> losDistances;
- /** Earth distance associated with pixel A */
+ /** Earth distance associated with pixel A. */
private final List<Double> earthDistances;
- /** Earth constraint weight */
+ /** Earth constraint weight. */
private double earthConstraintWeight;
- /** Build a new instance without Earth constraints
+ /** Build a new instance without Earth constraints.
* @param sensorNameA name of the sensor A to which mapping applies
* @param sensorNameB name of the sensor B to which mapping applies
*/
--
GitLab