From aab672b0f92e95b4806e8d77d07f4189727c7363 Mon Sep 17 00:00:00 2001 From: Luc Maisonobe <luc@orekit.org> Date: Thu, 23 Jul 2015 16:28:58 +0200 Subject: [PATCH] Enlarged margin along line for inverse loc. --- .../linesensor/SensorPixelCrossing.java | 2 +- .../rugged/errors/DumpReplayerTest.java | 22 ++++++++++++++++++ .../replay/replay-inverse-loc-03.txt | 23 +++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/replay/replay-inverse-loc-03.txt diff --git a/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java b/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java index 0e972175..38918a9d 100644 --- a/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java +++ b/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java @@ -36,7 +36,7 @@ import org.orekit.time.AbsoluteDate; public class SensorPixelCrossing { /** Margin before and after end pixels, in order to avoid search failures near boundaries. */ - private static final double MARGIN = 5.0; + private static final double MARGIN = 10.0; /** Line sensor. */ private final LineSensor sensor; diff --git a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java index 31afa97d..d5fc491a 100644 --- a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java +++ b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java @@ -146,4 +146,26 @@ public class DumpReplayerTest { } + @Test + public void testInverseLoc03() throws URISyntaxException, IOException, OrekitException, RuggedException { + + String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath(); + DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath))); + + String dumpPath = getClass().getClassLoader().getResource("replay/replay-inverse-loc-03.txt").toURI().getPath(); + DumpReplayer replayer = new DumpReplayer(); + replayer.parse(new File(dumpPath)); + Rugged rugged = replayer.createRugged(); + DumpReplayer.Result[] results = replayer.execute(rugged); + + Assert.assertEquals(1, results.length); + for (final DumpReplayer.Result result : results) { + SensorPixel expectedSP = (SensorPixel) result.getExpected(); + SensorPixel replayedSP = (SensorPixel) result.getReplayed(); + Assert.assertEquals(expectedSP.getLineNumber(), replayedSP.getLineNumber(), 1.0e-6); + Assert.assertEquals(expectedSP.getPixelNumber(), replayedSP.getPixelNumber(), 1.0e-6); + } + + } + } diff --git a/src/test/resources/replay/replay-inverse-loc-03.txt b/src/test/resources/replay/replay-inverse-loc-03.txt new file mode 100644 index 00000000..dcdf6eef --- /dev/null +++ b/src/test/resources/replay/replay-inverse-loc-03.txt @@ -0,0 +1,23 @@ +# Rugged library dump file, created on 2015-07-23T14:25:51Z +# all units are SI units (m, m/s, rad ...) +sensor: sensorName s0 nbPixels 2552 position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 +inverse location: sensorName s0 latitude 1.426113542156674e+00 longitude -8.868185262195961e-01 elevation 3.102209319249422e+01 minLine -23040 maxLine 39851 lightTime false aberration false +sensor mean plane: sensorName s0 minLine -23040 maxLine 39851 maxEval 50 accuracy 1.000000000000000e-02 normal 9.994827482027009e-01 -2.652758464258975e-02 1.818029972819145e-02 cachedResults 6 lineNumber 2.496503931691230e+04 date 2015-07-07T18:40:12.48786757028467Z target 5.829885691015603e+05 -7.150938152185429e+05 6.289925119642745e+06 targetDirection -1.574993670955663e-02 8.911384689865436e-02 9.958969132317702e-01 -2.069121568391233e-07 2.118875364268554e-08 -2.069121568391233e-07 lineNumber 2.498990311831761e+04 date 2015-07-07T18:40:12.52680428328538Z target 5.827831035018093e+05 -7.152819110623585e+05 6.290040934506435e+06 targetDirection -1.574653262138034e-02 8.923613956787135e-02 9.958860166231007e-01 -2.106025594148216e-07 6.293169679808365e-08 -2.106025594148216e-07 lineNumber 2.501446735659665e+04 date 2015-07-07T18:40:12.56527188043036Z target 5.825914009565986e+05 -7.154869255677856e+05 6.290306437975926e+06 targetDirection -1.574243698611968e-02 8.937839743168323e-02 9.958733241483490e-01 -2.139580511938570e-07 1.003165269577007e-07 -2.139580511938570e-07 lineNumber 2.503906484840334e+04 date 2015-07-07T18:40:12.60379155259964Z target 5.823982602071301e+05 -7.156902096509174e+05 6.290556499572599e+06 targetDirection -1.573844749711850e-02 8.951962023030334e-02 9.958607025403716e-01 -2.164310151145369e-07 1.276529299636964e-07 -2.164310151145369e-07 lineNumber 2.506393183649445e+04 date 2015-07-07T18:40:12.64273325595032Z target 5.821928312311379e+05 -7.158784186376551e+05 6.290673076115117e+06 targetDirection -1.573492577246402e-02 8.964463942750402e-02 9.958495120914844e-01 -2.189036239175299e-07 1.552935576937779e-07 -2.189036239175299e-07 lineNumber 2.508894303441162e+04 date 2015-07-07T18:40:12.68190079188860Z target 5.819807540563018e+05 -7.160584640312950e+05 6.290717393595084e+06 targetDirection -1.573177124337613e-02 8.976098395370098e-02 9.958390819470831e-01 -2.207684005657831e-07 1.758718590383612e-07 -2.207684005657831e-07 +sensor datation: sensorName s0 lineNumber 8.405500000000000e+03 date 2015-07-07T18:39:46.55562900000000Z +span: minDate 2015-07-07T18:38:55.00000000000000Z maxDate 2015-07-07T18:40:35.80000000000000Z tStep 1.000000000000000e-01 tolerance 1.000000000000000e+01 inertialFrame EME2000 +transform: index 516 body r -2.177937215786530e-01 -7.327669555860111e-04 1.897190121950331e-04 -9.759945296466600e-01 Ω -1.102119044807511e-07 3.608696529657919e-09 -7.292106718403156e-05 ΩDot -1.242024347024099e-16 -2.613635776865916e-17 1.864594523542536e-19 spacecraft p -3.566422630398301e+02 -4.258914869799046e+02 -7.158956735101774e+06 v -7.418089019766342e+01 -3.428198127164766e+02 -1.850797604708845e-01 a 1.095670688921161e+02 1.182390694645536e+03 -7.505797508270007e-02 r -6.234703793985741e-02 7.494015157786920e-01 6.578869048593570e-01 4.117080790195870e-02 Ω 1.016965607321450e-03 -1.766672912355467e-04 2.200251772998514e-04 ΩDot -8.541831902061166e-07 1.677502045483661e-04 4.581593874451730e-05 +ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP +sensor datation: sensorName s0 lineNumber 2.496503925597668e+04 date 2015-07-07T18:40:12.48786747485948Z +transform: index 775 body r -2.187152841723702e-01 -7.325893313267924e-04 1.904097590204008e-04 -9.757884255956278e-01 Ω -1.102119076976303e-07 3.608695853043322e-09 -7.292106718404156e-05 ΩDot -1.242034967780088e-16 -2.611193104220005e-17 1.864622725616803e-19 spacecraft p 5.893360284424853e+01 2.270010215908405e+02 -7.158967334657327e+06 v -1.256875338933382e+02 -2.315544869961368e+02 -6.143872625348799e-01 a -2.991050511747990e+02 -4.922561897467523e+03 -1.631427367003653e-01 r -7.121951955935480e-02 7.504990196615283e-01 6.562822802914443e-01 3.118605611938691e-02 Ω 1.025791280551210e-03 -1.602743286567663e-04 2.237358366388949e-04 ΩDot -5.506323746359040e-05 -6.847191984170615e-04 5.295499556290598e-05 +sensor rate: sensorName s0 lineNumber 2.496503925597668e+04 rate 6.385696040868454e+02 +sensor datation: sensorName s0 lineNumber 2.496503931691246e+04 date 2015-07-07T18:40:12.48786757028491Z +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48786757028491Z pixelNumber 1275 los -1.530469679155502e-02 1.052282317151670e-01 9.943303201181274e-01 +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48786757028491Z pixelNumber 1276 los -1.530505436550880e-02 1.052156640641227e-01 9.943316445464334e-01 +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48786757028491Z pixelNumber 0 los -1.481288944757218e-02 1.212648644244146e-01 9.925096528308137e-01 +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48786757028491Z pixelNumber 1 los -1.481330341735178e-02 1.212522760703962e-01 9.925111846168859e-01 +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48786757028491Z pixelNumber 2550 los -1.572509919997303e-02 8.921598849965143e-02 9.958881607144354e-01 +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48786757028491Z pixelNumber 2551 los -1.572540117814331e-02 8.920343838289327e-02 9.958892801604283e-01 +sensor datation: sensorName s0 lineNumber 2.496331776312614e+04 date 2015-07-07T18:40:12.48517161705554Z +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48517161705554Z pixelNumber 2550 los -1.572509919997303e-02 8.921598849965143e-02 9.958881607144354e-01 +sensor LOS: sensorName s0 date 2015-07-07T18:40:12.48517161705554Z pixelNumber 2551 los -1.572540117814331e-02 8.920343838289327e-02 9.958892801604283e-01 +inverse location result: lineNumber 2.496331776312614e+04 pixelNumber 2.558141579736633e+03 -- GitLab