From 9c2ddc73a68d3abdb8fbb2f21de87b3a04114d0b Mon Sep 17 00:00:00 2001
From: Guylaine Prat <guylaine.prat@c-s.fr>
Date: Fri, 27 Oct 2017 12:35:10 +0200
Subject: [PATCH] Rename residue to residual
---
.../java/RefiningPleiades/GroundRefining.java | 12 +++++-----
.../java/RefiningPleiades/InterRefining.java | 8 +++----
.../java/RefiningPleiades/Refining.java | 12 +++++-----
.../metrics/LocalisationMetrics.java | 22 +++++++++----------
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/tutorials/java/RefiningPleiades/GroundRefining.java b/src/tutorials/java/RefiningPleiades/GroundRefining.java
index b7735ffb..1aafed44 100644
--- a/src/tutorials/java/RefiningPleiades/GroundRefining.java
+++ b/src/tutorials/java/RefiningPleiades/GroundRefining.java
@@ -188,8 +188,8 @@ public class GroundRefining extends Refining {
noise);
refining.setMeasurements(measurements);
- // Compute ground truth residues
- // -----------------------------
+ // Compute ground truth residuals
+ // ------------------------------
System.out.format("\n**** Ground truth residuals **** %n");
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false);
@@ -198,8 +198,8 @@ public class GroundRefining extends Refining {
System.out.format("\n**** Initialize physical model without disruptions: reset Roll/Pitch/Factor **** %n");
refining.resetModel(refining.getRugged(), refining.getSensorName(), true);
- // Compute initial residues
- // ------------------------
+ // Compute initial residuals
+ // -------------------------
System.out.format("\n**** Initial Residuals **** %n");
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false);
@@ -222,10 +222,10 @@ public class GroundRefining extends Refining {
// ------------------
System.out.format("\n**** Compute Statistics **** %n");
- // Residues computed in meters
+ // Residuals computed in meters
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false);
- // Residues computed in degrees
+ // Residuals computed in degrees
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), true);
} catch (OrekitException oe) {
diff --git a/src/tutorials/java/RefiningPleiades/InterRefining.java b/src/tutorials/java/RefiningPleiades/InterRefining.java
index 613b269b..a4d32f92 100644
--- a/src/tutorials/java/RefiningPleiades/InterRefining.java
+++ b/src/tutorials/java/RefiningPleiades/InterRefining.java
@@ -275,8 +275,8 @@ public class InterRefining extends Refining {
noise);
refining.setMeasurements(measurements);
- // Compute ground truth residues
- // -----------------------------
+ // Compute ground truth residuals
+ // ------------------------------
System.out.format("\n**** Ground truth residuals **** %n");
refining.computeMetrics(measurements.getInterMapping(), refining.getRuggedA(), refining.getRuggedB(), false);
@@ -286,8 +286,8 @@ public class InterRefining extends Refining {
refining.resetModel(refining.getRuggedA(), refining.getSensorNameA(), false);
refining.resetModel(refining.getRuggedB(), refining.getSensorNameB(), false);
- // Compute initial residues
- // ------------------------
+ // Compute initial residuals
+ // -------------------------
System.out.format("\n**** Initial Residuals **** %n");
refining.computeMetrics(measurements.getInterMapping(), refining.getRuggedA(), refining.getRuggedB(), false);
diff --git a/src/tutorials/java/RefiningPleiades/Refining.java b/src/tutorials/java/RefiningPleiades/Refining.java
index 5e08a4e1..f72256a3 100644
--- a/src/tutorials/java/RefiningPleiades/Refining.java
+++ b/src/tutorials/java/RefiningPleiades/Refining.java
@@ -235,8 +235,8 @@ public class Refining {
stUnit="meters";
}
- LocalisationMetrics residues = new LocalisationMetrics(groundMapping, rugged, unit);
- System.out.format("Max: %3.4e Mean: %3.4e %s%n",residues.getMaxResidual(),residues.getMeanResidual(), stUnit);
+ LocalisationMetrics residuals = new LocalisationMetrics(groundMapping, rugged, unit);
+ System.out.format("Max: %3.4e Mean: %3.4e %s%n",residuals.getMaxResidual(),residuals.getMeanResidual(), stUnit);
}
/** Compute metrics to evaluate geometric performances in location,
@@ -255,10 +255,10 @@ public class Refining {
if(unit) stUnit="degrees";
else stUnit="meters";
- LocalisationMetrics residues = new LocalisationMetrics(interMapping, ruggedA, ruggedB, unit);
- System.out.format("Max: %1.4e Mean: %1.4e %s%n",residues.getMaxResidual(),residues.getMeanResidual(), stUnit);
- System.out.format("LOS distance Max: %1.4e Mean: %1.4e %s%n",residues.getLosMaxDistance(),residues.getLosMeanDistance(), stUnit);
- System.out.format("Earth distance Max: %1.4e Mean: %1.4e %s%n",residues.getEarthMaxDistance(),residues.getEarthMeanDistance(), stUnit);
+ LocalisationMetrics residuals = new LocalisationMetrics(interMapping, ruggedA, ruggedB, unit);
+ System.out.format("Max: %1.4e Mean: %1.4e %s%n",residuals.getMaxResidual(),residuals.getMeanResidual(), stUnit);
+ System.out.format("LOS distance Max: %1.4e Mean: %1.4e %s%n",residuals.getLosMaxDistance(),residuals.getLosMeanDistance(), stUnit);
+ System.out.format("Earth distance Max: %1.4e Mean: %1.4e %s%n",residuals.getEarthMaxDistance(),residuals.getEarthMeanDistance(), stUnit);
}
/** Reset a model
diff --git a/src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java b/src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java
index d87437c4..0d1cd624 100644
--- a/src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java
+++ b/src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java
@@ -45,10 +45,10 @@ import org.orekit.time.AbsoluteDate;
*/
public class LocalisationMetrics {
- /** Maximum residue distance. */
+ /** Maximum residual distance. */
private double resMax;
- /** Mean residue distance. */
+ /** Mean residual distance. */
private double resMean;
/** LOS distance max. */
@@ -152,7 +152,7 @@ public class LocalisationMetrics {
resMax = distance;
}
}
- // Mean of residues
+ // Mean of residuals
resMean = count / nbMeas;
}
@@ -248,15 +248,15 @@ public class LocalisationMetrics {
earthDistanceMean = earthDistanceCount / nbMeas;
}
- /** Get the max residue.
- * @return maximum of residues
+ /** Get the max residual.
+ * @return maximum of residuals
*/
public double getMaxResidual() {
return resMax;
}
- /** Get the mean of residues.
- * @return mean of residues
+ /** Get the mean of residuals.
+ * @return mean of residuals
*/
public double getMeanResidual() {
return resMean;
@@ -276,15 +276,15 @@ public class LocalisationMetrics {
return losDistanceMean;
}
- /** Get the Earth distance maximum residue.
- * @return Earth distance max residue
+ /** Get the Earth distance maximum residual.
+ * @return Earth distance max residual
*/
public double getEarthMaxDistance() {
return earthDistanceMax;
}
- /** Get the Earth distance mean residue.
- * @return Earth distance mean residue
+ /** Get the Earth distance mean residual.
+ * @return Earth distance mean residual
*/
public double getEarthMeanDistance() {
return earthDistanceMean;
--
GitLab