Skip to content
Snippets Groups Projects
Commit 9c2ddc73 authored by Guylaine Prat's avatar Guylaine Prat
Browse files

Rename residue to residual

parent 47b9ea8b
No related branches found
No related tags found
No related merge requests found
...@@ -188,8 +188,8 @@ public class GroundRefining extends Refining { ...@@ -188,8 +188,8 @@ public class GroundRefining extends Refining {
noise); noise);
refining.setMeasurements(measurements); refining.setMeasurements(measurements);
// Compute ground truth residues // Compute ground truth residuals
// ----------------------------- // ------------------------------
System.out.format("\n**** Ground truth residuals **** %n"); System.out.format("\n**** Ground truth residuals **** %n");
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false); refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false);
...@@ -198,8 +198,8 @@ public class GroundRefining extends Refining { ...@@ -198,8 +198,8 @@ public class GroundRefining extends Refining {
System.out.format("\n**** Initialize physical model without disruptions: reset Roll/Pitch/Factor **** %n"); System.out.format("\n**** Initialize physical model without disruptions: reset Roll/Pitch/Factor **** %n");
refining.resetModel(refining.getRugged(), refining.getSensorName(), true); refining.resetModel(refining.getRugged(), refining.getSensorName(), true);
// Compute initial residues // Compute initial residuals
// ------------------------ // -------------------------
System.out.format("\n**** Initial Residuals **** %n"); System.out.format("\n**** Initial Residuals **** %n");
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false); refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false);
...@@ -222,10 +222,10 @@ public class GroundRefining extends Refining { ...@@ -222,10 +222,10 @@ public class GroundRefining extends Refining {
// ------------------ // ------------------
System.out.format("\n**** Compute Statistics **** %n"); System.out.format("\n**** Compute Statistics **** %n");
// Residues computed in meters // Residuals computed in meters
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false); refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), false);
// Residues computed in degrees // Residuals computed in degrees
refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), true); refining.computeMetrics(measurements.getGroundMapping(), refining.getRugged(), true);
} catch (OrekitException oe) { } catch (OrekitException oe) {
......
...@@ -275,8 +275,8 @@ public class InterRefining extends Refining { ...@@ -275,8 +275,8 @@ public class InterRefining extends Refining {
noise); noise);
refining.setMeasurements(measurements); refining.setMeasurements(measurements);
// Compute ground truth residues // Compute ground truth residuals
// ----------------------------- // ------------------------------
System.out.format("\n**** Ground truth residuals **** %n"); System.out.format("\n**** Ground truth residuals **** %n");
refining.computeMetrics(measurements.getInterMapping(), refining.getRuggedA(), refining.getRuggedB(), false); refining.computeMetrics(measurements.getInterMapping(), refining.getRuggedA(), refining.getRuggedB(), false);
...@@ -286,8 +286,8 @@ public class InterRefining extends Refining { ...@@ -286,8 +286,8 @@ public class InterRefining extends Refining {
refining.resetModel(refining.getRuggedA(), refining.getSensorNameA(), false); refining.resetModel(refining.getRuggedA(), refining.getSensorNameA(), false);
refining.resetModel(refining.getRuggedB(), refining.getSensorNameB(), false); refining.resetModel(refining.getRuggedB(), refining.getSensorNameB(), false);
// Compute initial residues // Compute initial residuals
// ------------------------ // -------------------------
System.out.format("\n**** Initial Residuals **** %n"); System.out.format("\n**** Initial Residuals **** %n");
refining.computeMetrics(measurements.getInterMapping(), refining.getRuggedA(), refining.getRuggedB(), false); refining.computeMetrics(measurements.getInterMapping(), refining.getRuggedA(), refining.getRuggedB(), false);
......
...@@ -235,8 +235,8 @@ public class Refining { ...@@ -235,8 +235,8 @@ public class Refining {
stUnit="meters"; stUnit="meters";
} }
LocalisationMetrics residues = new LocalisationMetrics(groundMapping, rugged, unit); LocalisationMetrics residuals = new LocalisationMetrics(groundMapping, rugged, unit);
System.out.format("Max: %3.4e Mean: %3.4e %s%n",residues.getMaxResidual(),residues.getMeanResidual(), stUnit); System.out.format("Max: %3.4e Mean: %3.4e %s%n",residuals.getMaxResidual(),residuals.getMeanResidual(), stUnit);
} }
/** Compute metrics to evaluate geometric performances in location, /** Compute metrics to evaluate geometric performances in location,
...@@ -255,10 +255,10 @@ public class Refining { ...@@ -255,10 +255,10 @@ public class Refining {
if(unit) stUnit="degrees"; if(unit) stUnit="degrees";
else stUnit="meters"; else stUnit="meters";
LocalisationMetrics residues = new LocalisationMetrics(interMapping, ruggedA, ruggedB, unit); LocalisationMetrics residuals = 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("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",residues.getLosMaxDistance(),residues.getLosMeanDistance(), 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",residues.getEarthMaxDistance(),residues.getEarthMeanDistance(), stUnit); System.out.format("Earth distance Max: %1.4e Mean: %1.4e %s%n",residuals.getEarthMaxDistance(),residuals.getEarthMeanDistance(), stUnit);
} }
/** Reset a model /** Reset a model
......
...@@ -45,10 +45,10 @@ import org.orekit.time.AbsoluteDate; ...@@ -45,10 +45,10 @@ import org.orekit.time.AbsoluteDate;
*/ */
public class LocalisationMetrics { public class LocalisationMetrics {
/** Maximum residue distance. */ /** Maximum residual distance. */
private double resMax; private double resMax;
/** Mean residue distance. */ /** Mean residual distance. */
private double resMean; private double resMean;
/** LOS distance max. */ /** LOS distance max. */
...@@ -152,7 +152,7 @@ public class LocalisationMetrics { ...@@ -152,7 +152,7 @@ public class LocalisationMetrics {
resMax = distance; resMax = distance;
} }
} }
// Mean of residues // Mean of residuals
resMean = count / nbMeas; resMean = count / nbMeas;
} }
...@@ -248,15 +248,15 @@ public class LocalisationMetrics { ...@@ -248,15 +248,15 @@ public class LocalisationMetrics {
earthDistanceMean = earthDistanceCount / nbMeas; earthDistanceMean = earthDistanceCount / nbMeas;
} }
/** Get the max residue. /** Get the max residual.
* @return maximum of residues * @return maximum of residuals
*/ */
public double getMaxResidual() { public double getMaxResidual() {
return resMax; return resMax;
} }
/** Get the mean of residues. /** Get the mean of residuals.
* @return mean of residues * @return mean of residuals
*/ */
public double getMeanResidual() { public double getMeanResidual() {
return resMean; return resMean;
...@@ -276,15 +276,15 @@ public class LocalisationMetrics { ...@@ -276,15 +276,15 @@ public class LocalisationMetrics {
return losDistanceMean; return losDistanceMean;
} }
/** Get the Earth distance maximum residue. /** Get the Earth distance maximum residual.
* @return Earth distance max residue * @return Earth distance max residual
*/ */
public double getEarthMaxDistance() { public double getEarthMaxDistance() {
return earthDistanceMax; return earthDistanceMax;
} }
/** Get the Earth distance mean residue. /** Get the Earth distance mean residual.
* @return Earth distance mean residue * @return Earth distance mean residual
*/ */
public double getEarthMeanDistance() { public double getEarthMeanDistance() {
return earthDistanceMean; return earthDistanceMean;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment