From fd9b226a926450212179ee6c8bb96e9c5f8ddc68 Mon Sep 17 00:00:00 2001 From: Luc Maisonobe <luc@orekit.org> Date: Wed, 25 Feb 2015 09:40:29 +0100 Subject: [PATCH] Added forgotten dump of algorithm. --- .../org/orekit/rugged/intersection/BasicScanAlgorithm.java | 1 + .../rugged/intersection/ConstantElevationAlgorithm.java | 1 + .../org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java | 1 + .../rugged/intersection/duvenhage/DuvenhageAlgorithm.java | 1 + src/test/resources/replay/replay-inverse-loc-01.txt | 7 ++++--- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java index c4d54ef4..743b4491 100644 --- a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java +++ b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java @@ -185,6 +185,7 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm { @Override public double getElevation(final double latitude, final double longitude) throws RuggedException { + DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY); final Tile tile = cache.getTile(latitude, longitude); return tile.interpolateElevation(latitude, longitude); } diff --git a/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java index f4337b64..828ccb0c 100644 --- a/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java +++ b/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java @@ -83,6 +83,7 @@ public class ConstantElevationAlgorithm implements IntersectionAlgorithm { */ @Override public double getElevation(final double latitude, final double longitude) { + DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation); return constantElevation; } diff --git a/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java index c63eb800..477cdc2e 100644 --- a/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java +++ b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java @@ -63,6 +63,7 @@ public class IgnoreDEMAlgorithm implements IntersectionAlgorithm { */ @Override public double getElevation(final double latitude, final double longitude) { + DumpManager.dumpAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID); return 0.0; } diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java index 16aef60e..2bb58d4f 100644 --- a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java +++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java @@ -199,6 +199,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm { @Override public double getElevation(final double latitude, final double longitude) throws RuggedException { + DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE); final Tile tile = cache.getTile(latitude, longitude); return tile.interpolateElevation(latitude, longitude); } diff --git a/src/test/resources/replay/replay-inverse-loc-01.txt b/src/test/resources/replay/replay-inverse-loc-01.txt index 51981332..0f0a3c0c 100644 --- a/src/test/resources/replay/replay-inverse-loc-01.txt +++ b/src/test/resources/replay/replay-inverse-loc-01.txt @@ -1,5 +1,6 @@ -# Rugged library dump file, created on 2015-02-24T16:50:12Z +# Rugged library dump file, created on 2015-02-25T08:35:47Z # all units are SI units (m, m/s, rad ...) +algorithm: DUVENHAGE DEM tile: t0 latMin -4.014257279586958e-01 latStep 6.817692390602850e-05 latRows 257 lonMin 2.495820830351891e+00 lonStep 6.817692390602850e-05 lonCols 257 DEM cell: t0 latIndex 192 lonIndex 0 elevation -6.124011631478857e+02 DEM cell: t0 latIndex 128 lonIndex 128 elevation 3.151327114467009e+03 @@ -12,11 +13,11 @@ sensor: sensorName line nbPixels 2000 position 1.500000000000000e+00 0.0000000 sensor mean plane: sensorName line minLine 0 maxLine 2000 maxEval 50 accuracy 1.000000000000000e-02 normal 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 sensor date: sensorName line lineNumber 1.000000000000000e+03 => 2012-01-01T12:30:00.00000000000000Z span: minDate 2012-01-01T12:29:57.50000000000000Z maxDate 2012-01-01T12:30:02.50000000000000Z tStep 1.000000000000000e-03 tolerance 5.000000000000000e+00 inertialFrame EME2000 -transform: index 2500 body r -8.085963389171905e-01 -3.465415132416125e-04 4.896468952533137e-04 -5.883634938068593e-01 Ω -8.740475534355122e-08 1.215132763920864e-09 -7.292109805268457e-05 ΩDot -1.642299174832679e-16 8.973031065665686e-17 1.983408395824453e-19 spacecraft p 1.384770770635060e+04 3.157810312896036e+03 -7.179504513258174e+06 v -3.180198832979256e+01 -6.779040795561070e+00 8.276861119339028e+00 a -9.324121873999545e-01 -8.319728238691058e+00 1.345786832372742e-03 r -6.828948903548651e-01 4.142451171315383e-01 -3.878489660867486e-01 4.600312284675194e-01 Ω -1.009782076972198e-03 1.982726233227751e-04 1.647740165426390e-04 ΩDot -3.649972672343429e-07 2.007836645730816e-07 -1.257082123046451e-06 +transform: index 2500 body r -8.085963389171905e-01 -3.465415132416124e-04 4.896468952533136e-04 -5.883634938068593e-01 Ω -8.740475534355121e-08 1.215132763920863e-09 -7.292109805268457e-05 ΩDot -1.642299174832473e-16 8.973031065833714e-17 1.983408395826415e-19 spacecraft p 1.384770770635060e+04 3.157810312896036e+03 -7.179504513258174e+06 v -3.180198832979256e+01 -6.779040795561070e+00 8.276861119339028e+00 a -9.324121873999545e-01 -8.319728238691058e+00 1.345786832372742e-03 r -6.828948903548651e-01 4.142451171315383e-01 -3.878489660867486e-01 4.600312284675194e-01 Ω -1.009782076972198e-03 1.982726233227751e-04 1.647740165426390e-04 ΩDot -3.649972672343429e-07 2.007836645730816e-07 -1.257082123046451e-06 ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP sensor rate: sensorName line lineNumber 1000.0 => 6.666666666666666e+02 sensor date: sensorName line lineNumber 1.753125119831697e+03 => 2012-01-01T12:30:01.12968767974755Z -transform: index 3630 body r -8.086205790715331e-01 -3.465213511527127e-04 4.896611176157392e-04 -5.883301787746077e-01 Ω -8.740475552913246e-08 1.215132865316382e-09 -7.292109805268537e-05 ΩDot -1.642303315278223e-16 8.973086775113133e-17 1.983413459365331e-19 spacecraft p 1.381161686138390e+04 3.149035127746873e+03 -7.179495156850004e+06 v -3.198309695268937e+01 -7.869713919215563e+00 8.283718407079078e+00 a -9.313885738644379e-01 -8.324782304826440e+00 1.354189237138481e-03 r -6.826577475060918e-01 4.145470548488056e-01 -3.882264160785311e-01 4.597927673908209e-01 Ω -1.009835304084986e-03 1.983572786405474e-04 1.645625945551068e-04 ΩDot -3.648903522451360e-07 2.009701619867746e-07 -1.257044812963575e-06 +transform: index 3630 body r -8.086205790715331e-01 -3.465213511527127e-04 4.896611176157392e-04 -5.883301787746077e-01 Ω -8.740475552913246e-08 1.215132865316375e-09 -7.292109805268537e-05 ΩDot -1.642303315278493e-16 8.973086775115428e-17 1.983413459366029e-19 spacecraft p 1.381161686138390e+04 3.149035127746873e+03 -7.179495156850004e+06 v -3.198309695268937e+01 -7.869713919215563e+00 8.283718407079078e+00 a -9.313885738644379e-01 -8.324782304826440e+00 1.354189237138481e-03 r -6.826577475060918e-01 4.145470548488056e-01 -3.882264160785311e-01 4.597927673908209e-01 Ω -1.009835304084986e-03 1.983572786405474e-04 1.645625945551068e-04 ΩDot -3.648903522451360e-07 2.009701619867746e-07 -1.257044812963575e-06 sensor rate: sensorName line lineNumber 1753.125119831697 => 6.666666666666666e+02 sensor date: sensorName line lineNumber 1.753079999999987e+03 => 2012-01-01T12:30:01.12961999999998Z sensor rate: sensorName line lineNumber 1753.0799999999872 => 6.666666666666666e+02 -- GitLab