diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000000000000000000000000000000000..69e40fdf3ea7dfbeacc20b49b7b4a27007e9b17e
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,50 @@
+pipeline {
+
+ agent any
+ tools {
+ maven 'mvn-default'
+ jdk 'openjdk-8'
+ }
+
+ options {
+ timeout(time: 60, unit: 'MINUTES')
+ }
+
+ stages {
+
+ stage('Cleaning') {
+ steps {
+ sh 'git clean -fdx'
+ }
+ }
+
+ stage('Build') {
+ steps {
+ script {
+ if ( env.BRANCH_NAME ==~ /^release-[.0-9]+$/ ) {
+ sh 'mvn verify assembly:single'
+ }
+ else {
+ sh 'mvn verify site'
+ }
+ }
+ }
+ }
+ }
+
+ post {
+ always {
+ archiveArtifacts artifacts: 'target/*.jar', fingerprint: true
+ script {
+ if ( env.BRANCH_NAME ==~ /^release-[.0-9]+$/ ) {
+ archiveArtifacts artifacts: 'target/*.zip', fingerprint: true
+ }
+ }
+ junit testResults: '**/target/surefire-reports/*.xml'
+ jacoco execPattern:'target/**.exec', classPattern: '**/classes', sourcePattern: '**/src/main/java'
+ recordIssues enabledForFailure: true, tools: [mavenConsole(), java(), javaDoc()]
+ recordIssues enabledForFailure: true, tool: checkStyle()
+ recordIssues enabledForFailure: true, tool: spotBugs()
+ }
+ }
+}
diff --git a/NOTICE.txt b/NOTICE.txt
index 434e21116408403a9e5fb8c0fe92293945672c3f..3ab722542a0cd55c15513e6214857f13aa43a63d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
RUGGED
-Copyright 2013-2017 CS Systèmes d'Information
+Copyright 2013-2019 CS Systèmes d'Information
This product includes software developed by
CS Systèmes d'Information (http://www.c-s.fr/)
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..56ca011b1c9ab15a42c6fd36094d834ecdf6ff44
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,41 @@
+<!--- Copyright 2013-2019 CS Systèmes d'Information
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<h1 style="color:blue;" align="center">
+ Rugged
+</h1>
+<h1>
+ <img src="src/site/resources/images/rugged-logo-small.jpg" alt="Rugged"/>
+ A sensor-to-terrain mapping tool
+</h1>
+
+<h4 align="center">Rugged is a free java library for geolocation and used for satellite imagery.</h4>
+
+Rugged is an add-on for [Orekit](https://www.orekit.org/ "Orekit homepage") handling Digital Elevation Models contribution to
+line of sight computation. It is a free software intermediate-level library written in Java.
+
+It mainly provides direct and inverse location, i.e. it allows to compute accurately
+which ground point is looked at from a specific pixel in a spacecraft instrument,
+and conversely which pixel will see a specified ground point. This mapping between
+ground and sensor is computed with a viewing model taking into account:
+* ground Digital Elevation Model (DEM),
+* Earth rotation will all its tiny irregularities,
+* on-board sensor pixels individual line-of-sights,
+* spacecraft motion and attitude,
+* several physical effects.
+
+Direct and inverse location can be used to perform full ortho-rectification of
+images and correlation between sensors observing the same area.
+
+Homepage: [www.orekit.org/rugged/](https://www.orekit.org/rugged/ "Rugged homepage")
diff --git a/checkstyle.xml b/checkstyle.xml
index 3ae86a87f2276219715fb33432085ff4b56fae1a..7fc65ee528ab744db95b38dbad022ac812bc301b 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -31,7 +31,7 @@
<module name="IllegalImport"/>
<module name="Indentation">
<property name="basicOffset" value="4"/>
- <property name="caseIndent" value="4"/>
+ <property name="caseIndent" value="4"/>
</module>
<module name="JavadocMethod">
<property name="allowUndeclaredRTE" value="true"/>
@@ -71,26 +71,35 @@
PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
SR_ASSIGN, STAR, STAR_ASSIGN"/>
</module>
- <module name="FileContentsHolder"/>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable check"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume JavadocVariable check"/>
<property name="checkFormat" value="JavadocVariable"/>
</module>
<module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifierCheck"/>
- <property name="onCommentFormat" value="CHECKSTYLE\: resume VisibilityModifierCheck"/>
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifier check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume VisibilityModifier check"/>
<property name="checkFormat" value="VisibilityModifierCheck"/>
</module>
<module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter"/>
- <property name="onCommentFormat" value="CHECKSTYLE\: resume NoWhitespaceAfter"/>
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume NoWhitespaceAfter check"/>
<property name="checkFormat" value="NoWhitespaceAfter"/>
</module>
<module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\: stop FallThrough check"/>
- <property name="onCommentFormat" value="CHECKSTYLE\: resume FallThrough check"/>
- <property name="checkFormat" value="FallThrough"/>
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop Indentation check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume Indentation check"/>
+ <property name="checkFormat" value="IndentationCheck"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop MultipleStringLiterals check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume MultipleStringLiterals check"/>
+ <property name="checkFormat" value="MultipleStringLiteralsCheck"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE\: stop UnnecessaryParentheses check"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\: resume UnnecessaryParentheses check"/>
+ <property name="checkFormat" value="UnnecessaryParentheses"/>
</module>
</module>
<module name="RegexpHeader">
diff --git a/pom.xml b/pom.xml
index 194caf01431593393e6db9da89d4c19968e027e6..a7802b6fc98ac0d20ee2ef6dac1b2436d4c69d94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.orekit</groupId>
<artifactId>rugged</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<packaging>jar</packaging>
<name>Rugged</name>
<url>https://www.orekit.org/rugged</url>
@@ -16,39 +16,46 @@
</description>
<properties>
+
+
+ <!-- COTS version -->
+ <rugged.orekit.version>9.3.1</rugged.orekit.version>
+ <rugged.hipparchus.version>1.4</rugged.hipparchus.version>
+ <rugged.junit.version>4.12</rugged.junit.version>
+
+ <!-- Compilers and Tools version -->
+ <rugged.compiler.source>1.8</rugged.compiler.source>
+ <rugged.compiler.target>1.8</rugged.compiler.target>
+ <rugged.implementation.build>${git.revision}; ${maven.build.timestamp}</rugged.implementation.build>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <rugged.findbugs-maven-plugin.version>3.0.4</rugged.findbugs-maven-plugin.version>
- <rugged.jacoco-maven-plugin.version>0.7.9</rugged.jacoco-maven-plugin.version>
- <rugged.maven-assembly-plugin.version>3.0.0</rugged.maven-assembly-plugin.version>
- <rugged.maven-bundle-plugin.version>3.3.0</rugged.maven-bundle-plugin.version>
+ <rugged.spotbugs-maven-plugin.version>3.1.7</rugged.spotbugs-maven-plugin.version>
+ <rugged.jacoco-maven-plugin.version>0.8.2</rugged.jacoco-maven-plugin.version>
+ <rugged.maven-assembly-plugin.version>3.1.0</rugged.maven-assembly-plugin.version>
+ <rugged.maven-bundle-plugin.version>4.1.0</rugged.maven-bundle-plugin.version>
<rugged.maven-changes-plugin.version>2.12.1</rugged.maven-changes-plugin.version>
- <rugged.maven-checkstyle-plugin.version>2.17</rugged.maven-checkstyle-plugin.version>
- <rugged.checkstyle.version>8.1</rugged.checkstyle.version>
- <rugged.maven-clean-plugin.version>3.0.0</rugged.maven-clean-plugin.version>
- <rugged.maven-compiler-plugin.version>3.6.1</rugged.maven-compiler-plugin.version>
- <rugged.maven-javadoc-plugin.version>2.10.4</rugged.maven-javadoc-plugin.version>
- <rugged.maven-jar-plugin.version>3.0.2</rugged.maven-jar-plugin.version>
- <rugged.maven-jxr-plugin.version>2.5</rugged.maven-jxr-plugin.version>
+ <rugged.maven-checkstyle-plugin.version>3.0.0</rugged.maven-checkstyle-plugin.version>
+ <rugged.checkstyle.version>8.14</rugged.checkstyle.version>
+ <rugged.maven-clean-plugin.version>3.1.0</rugged.maven-clean-plugin.version>
+ <rugged.maven-compiler-plugin.version>3.8.0</rugged.maven-compiler-plugin.version>
+ <rugged.maven-javadoc-plugin.version>3.0.1</rugged.maven-javadoc-plugin.version>
+ <rugged.maven-jar-plugin.version>3.1.0</rugged.maven-jar-plugin.version>
+ <rugged.maven-jxr-plugin.version>3.0.0</rugged.maven-jxr-plugin.version>
<rugged.plantuml-maven-plugin.version>1.2</rugged.plantuml-maven-plugin.version>
- <rugged.plantuml.version>1.2017.15</rugged.plantuml.version>
- <rugged.maven-project-info-reports-plugin.version>2.9</rugged.maven-project-info-reports-plugin.version>
- <rugged.maven-resources-plugin.version>3.0.2</rugged.maven-resources-plugin.version>
- <rugged.maven-site-plugin.version>3.6</rugged.maven-site-plugin.version>
- <rugged.maven-surefire-plugin.version>2.20</rugged.maven-surefire-plugin.version>
- <rugged.maven-surefire-report-plugin.version>2.20</rugged.maven-surefire-report-plugin.version>
+ <rugged.plantuml.version>1.2018.12</rugged.plantuml.version>
+ <rugged.maven-project-info-reports-plugin.version>3.0.0</rugged.maven-project-info-reports-plugin.version>
+ <rugged.maven-resources-plugin.version>3.1.0</rugged.maven-resources-plugin.version>
+ <rugged.maven-site-plugin.version>3.7.1</rugged.maven-site-plugin.version>
+ <rugged.maven-source-plugin.version>3.0.1</rugged.maven-source-plugin.version>
+ <rugged.maven-surefire-plugin.version>2.22.1</rugged.maven-surefire-plugin.version>
+ <rugged.maven-surefire-report-plugin.version>2.22.1</rugged.maven-surefire-report-plugin.version>
<rugged.jgit.buildnumber.version>1.2.10</rugged.jgit.buildnumber.version>
<rugged.build-helper-maven-plugin.version>3.0.0</rugged.build-helper-maven-plugin.version>
<rugged.nexus-staging-maven-plugin.version>1.6.8</rugged.nexus-staging-maven-plugin.version>
<rugged.maven-gpg-plugin.version>1.6</rugged.maven-gpg-plugin.version>
- <rugged.maven-install-plugin.version>2.5.2</rugged.maven-install-plugin.version>
- <rugged.orekit.version>9.1</rugged.orekit.version>
- <rugged.hipparchus.version>1.2</rugged.hipparchus.version>
- <rugged.junit.version>4.12</rugged.junit.version>
- <rugged.compiler.source>1.8</rugged.compiler.source>
- <rugged.compiler.target>1.8</rugged.compiler.target>
- <rugged.implementation.build>${git.revision}; ${maven.build.timestamp}</rugged.implementation.build>
-
+ <rugged.maven-install-plugin.version>3.0.0-M1</rugged.maven-install-plugin.version>
+
</properties>
<developers>
@@ -123,39 +130,16 @@
</licenses>
<scm>
- <connection>scm:git:https://www.orekit.org/git/rugged-main.git</connection>
- <developerConnection>scm:git:ssh://git@www.orekit.org/rugged-main.git</developerConnection>
- <url>https://www.orekit.org/forge/projects/rugged/repository</url>
+ <connection>scm:git:https://gitlab.orekit.org/orekit/rugged.git</connection>
+ <developerConnection>scm:git:ssh://git@gitlab.orekit.org/orekit/rugged.git</developerConnection>
+ <url>https://gitlab.orekit.org/orekit/rugged/tree/master</url>
</scm>
<issueManagement>
- <system>Redmine</system>
- <url>https://www.orekit.org/forge/projects/rugged/issues</url>
+ <system>Gitlab</system>
+ <url>https://gitlab.orekit.org/orekit/rugged/issues</url>
</issueManagement>
- <mailingLists>
- <mailingList>
- <name>Shared Orekit/Rugged announces mailing list</name>
- <subscribe>https://www.orekit.org/wws/subscribe/orekit-announces</subscribe>
- <unsubscribe>https://www.orekit.org/wws/signoff/orekit-announces</unsubscribe>
- <archive>https://www.orekit.org/wws/arc/orekit-announces</archive>
- </mailingList>
- <mailingList>
- <name>Rugged users mailing list</name>
- <subscribe>https://www.orekit.org/wws/subscribe/rugged-users</subscribe>
- <unsubscribe>https://www.orekit.org/wws/signoff/rugged-users</unsubscribe>
- <post>rugged-users@orekit.org</post>
- <archive>https://www.orekit.org/wws/arc/rugged-users</archive>
- </mailingList>
- <mailingList>
- <name>Rugged developers mailing list</name>
- <subscribe>https://www.orekit.org/wws/subscribe/rugged-developers</subscribe>
- <unsubscribe>https://www.orekit.org/wws/signoff/rugged-developers</unsubscribe>
- <post>rugged-developers@orekit.org</post>
- <archive>https://www.orekit.org/wws/arc/rugged-developers</archive>
- </mailingList>
- </mailingLists>
-
<distributionManagement>
<site>
<id>rugged.website</id>
@@ -313,32 +297,32 @@
<limit>
<counter>CLASS</counter>
<value>COVEREDRATIO</value>
- <minimum>0.92</minimum>
+ <minimum>1.00</minimum>
</limit>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
- <minimum>0.85</minimum>
+ <minimum>0.90</minimum>
</limit>
<limit>
<counter>METHOD</counter>
<value>COVEREDRATIO</value>
- <minimum>0.85</minimum>
+ <minimum>0.95</minimum>
</limit>
<limit>
<counter>BRANCH</counter>
<value>COVEREDRATIO</value>
- <minimum>0.77</minimum>
+ <minimum>0.85</minimum>
</limit>
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
- <minimum>0.74</minimum>
+ <minimum>0.85</minimum>
</limit>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
- <minimum>0.83</minimum>
+ <minimum>0.90</minimum>
</limit>
</limits>
</rule>
@@ -356,6 +340,11 @@
<artifactId>maven-site-plugin</artifactId>
<version>${rugged.maven-site-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${rugged.maven-changes-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>com.github.jeluard</groupId>
<artifactId>plantuml-maven-plugin</artifactId>
@@ -448,14 +437,14 @@
<version>${rugged.maven-project-info-reports-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${rugged.findbugs-maven-plugin.version}</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${rugged.spotbugs-maven-plugin.version}</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
- <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
+ <excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -488,9 +477,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>${rugged.maven-changes-plugin.version}</version>
- <configuration>
- <xmlPath>${basedir}/src/site/xdoc/changes.xml</xmlPath>
- </configuration>
<reportSets>
<reportSet>
<reports>
@@ -515,11 +501,10 @@
<configuration>
<bottom><![CDATA[Copyright © ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Systèmes d'information</a>. All rights reserved.]]></bottom>
<links>
- <link>http://docs.oracle.com/javase/8/docs/api/</link>
- <link>http://hipparchus.org/apidocs/</link>
- <link>http://www.orekit.org/site-orekit-${rugged.orekit.version}/apidocs/</link>
+ <link>https://docs.oracle.com/javase/8/docs/api/</link>
+ <link>https://www.hipparchus.org/apidocs/</link>
+ <link>https://www.orekit.org/site-orekit-${rugged.orekit.version}/apidocs/</link>
</links>
- <charset>${project.reporting.outputEncoding}</charset>
</configuration>
<reportSets>
<reportSet>
@@ -584,6 +569,19 @@
<id>release</id>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${rugged.maven-source-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/findbugs-exclude-filter.xml b/spotbugs-exclude-filter.xml
similarity index 76%
rename from findbugs-exclude-filter.xml
rename to spotbugs-exclude-filter.xml
index ea36a9e9c86089cdee6bb556df0ee49d9a2d691b..f06c28a6db3204c09a1c41ab9da95459eee03108 100644
--- a/findbugs-exclude-filter.xml
+++ b/spotbugs-exclude-filter.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- This file contains some false positive bugs detected by findbugs. Their
+ This file contains some false positive bugs detected by spotbugs. Their
false positive nature has been analyzed individually and they have been
put here to instruct findbugs it must ignore them.
-->
diff --git a/src/site/xdoc/changes.xml b/src/changes/changes.xml
similarity index 86%
rename from src/site/xdoc/changes.xml
rename to src/changes/changes.xml
index b4d52fc998ba33f512d9c7e98bf8478053d8fa0a..4932efc04c2d60b99ec7589f94bf08970898d830 100644
--- a/src/site/xdoc/changes.xml
+++ b/src/changes/changes.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Copyright 2013-2017 CS Systèmes d'Information
+<!-- Copyright 2013-2019 CS Systèmes d'Information
Licensed to CS Systèmes d'Information (CS) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -20,7 +20,78 @@
<title>Rugged Changes</title>
</properties>
<body>
- <release version="2.0" date="2017-12-22" description="This is a major release.
+ <release version="2.1" date="2019-03-14" description="This is a minor release.
+ It adds refraction in inverse location and fixes a few bugs. This version depends
+ on Orekit 9.3 and Hipparchus 1.4.">
+ <action dev="guylaine" type="update">
+ Updated dependencies to Orekit 9.3 and Hipparchus 1.4.
+ </action>
+ <action dev="luc" type="fix" issue="376">
+ Direct location may result to a null result in some very rugged region.
+ In Duvenhage algorithm, in the refineIntersection method for the DEM,
+ some rare cases led to no intersection (as a result from SimpleTile.cellIntersection)
+ with the closeGuess given as input of refineIntersection.By shifting the solution
+ along the LOS direction, with an iterative process, we are able to find the intersection.
+ </action>
+ <action dev="guylaine" type="fix" issue="377">
+ Add the possibility to suspend and resume the dump.
+ When performing a dump, in some cases, some extra informations are dumped
+ but are not relevant.
+ For instance when updating a tile for a SRTM tile, we need to add the geoid
+ value of the current point. In the dump file, the geoid tile is also dumped
+ and it leads to bad results when performing the DumpReplayer, as the geoid
+ elevations are read instead of the real elevations.
+ </action>
+ <action dev="guylaine" type="update">
+ Enable null in dump of direct or inverse location results.
+ If direct or inverse location gave "null" as a result, it was not dumped.
+ </action>
+ <action dev="guylaine" type="update">
+ Improve test coverage of classes related to dump (org.orekit.rugged.errors).
+ </action>
+ <action dev="guylaine" type="fix" issue="373">
+ Changed RuggedException from checked to unchecked exception.
+ Most functions do throw such exceptions. As they are unchecked, they are
+ not advertised in either `throws` statements in the function signature or
+ in the javadoc. So users must consider that as soon as they use any Rugged
+ feature, an unchecked `RuggedException` may be thrown. In most cases, users
+ will not attempt to recover for this but will only use them to display or
+ log a meaningful error message.
+ </action>
+ <action dev="guylaine" type="fix" issue="372">
+ Add (optional) atmospheric refraction for inverse location.
+ In Rugged 2.0, only the direct location can take into account the atmospheric refraction.
+ </action>
+ <action dev="guylaine" type="add" due-to="Issam Boukerch">
+ Changed terms for refining tutorials.
+ The "fulcrum points" term is changed into "Ground Control Points (GCP)" and
+ the "liaison points" term into "tie points".
+ </action>
+ <action dev="luc" type="fix" issue="371">
+ For refining computation, correct the constructor of the class
+ adjustment.measurements.SensorToGroundMapping due to a parameters reversal error.
+ </action>
+ <action dev="guylaine" type="fix" issue="256">
+ Bad check of maxDate validity in utils.SpacecraftToObservedBody.SpacecraftToObservedBody
+ method.
+ </action>
+
+ <action dev="luc" type="add" due-to="Lars Næsbye Christensen">
+ Updated Danish translations of error messages.
+ </action>
+ <action dev="luc" type="add" due-to="Roberto Alacevich">
+ Updated Italian translations of error messages.
+ </action>
+ <action dev="guylaine" type="add" due-to="Espen Bjørntvedt">
+ Updated Norwegian translations of error messages.
+ </action>
+ <action dev="luc" type="add" due-to="Beatriz Salazar GarcÃa">
+ Updated Spanish translations of error messages.
+ </action>
+
+ </release>
+
+ <release version="2.0" date="2017-12-19" description="This is a major release.
It mainly provides a refinement feature (i.e. adjusting the viewing model
parameters to match ground control points.">
<action dev="guylaine" type="update">
diff --git a/src/design/dem-loading-class-diagram.puml b/src/design/dem-loading-class-diagram.puml
index 08102c7f655f48a54f58271980585fd87bff2788..360ba2320e6d3f90d52bd462c3c6f17bb658a07c 100644
--- a/src/design/dem-loading-class-diagram.puml
+++ b/src/design/dem-loading-class-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/direct-location-class-diagram.puml b/src/design/direct-location-class-diagram.puml
index 5425c284a7d532d8a13e677e0c9b2e397fb0c74d..345691fba32960f492ad90e3e9f6c5f5c2da42f8 100644
--- a/src/design/direct-location-class-diagram.puml
+++ b/src/design/direct-location-class-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/direct-location-sequence-diagram.puml b/src/design/direct-location-sequence-diagram.puml
index e2fa64b23017becfdca9da75ba84914d6966b463..dd2e5f18ad3fb046e99a7995e236659b853ced66 100644
--- a/src/design/direct-location-sequence-diagram.puml
+++ b/src/design/direct-location-sequence-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/duvenhage-inner-recursion-activity-diagram.puml b/src/design/duvenhage-inner-recursion-activity-diagram.puml
index b57df73c4a54df5fa675dcb58b759a820f4db419..d7ea4581f16daf14edf257a205ab4caf81ac02e4 100644
--- a/src/design/duvenhage-inner-recursion-activity-diagram.puml
+++ b/src/design/duvenhage-inner-recursion-activity-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/duvenhage-top-loop-activity-diagram.puml b/src/design/duvenhage-top-loop-activity-diagram.puml
index fd54d5bc7227b55f38c478a63b832107dd39828e..25772bb1788aac3261ab90d17fce375a84053365 100644
--- a/src/design/duvenhage-top-loop-activity-diagram.puml
+++ b/src/design/duvenhage-top-loop-activity-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/initialization-class-diagram.puml b/src/design/initialization-class-diagram.puml
index a3d127516d453b245d8c4de1f05b4c5a84179530..f13e184c759a0af9ec66cd3da0e1530f5cb2a3d7 100644
--- a/src/design/initialization-class-diagram.puml
+++ b/src/design/initialization-class-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/initialization-sequence-diagram.puml b/src/design/initialization-sequence-diagram.puml
index fa8701ec508c731f0a8dfeb73ea8fefcdedd4ac1..d9259e5ea383fce6fbd952df92362e2b1ae96c1a 100644
--- a/src/design/initialization-sequence-diagram.puml
+++ b/src/design/initialization-sequence-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/inverse-location-sequence-diagram.puml b/src/design/inverse-location-sequence-diagram.puml
index dd621c9099219108eadc1426269669696c66c3f9..8f7eb05cbd0ef2ddf672fdd8292b810184e968c8 100644
--- a/src/design/inverse-location-sequence-diagram.puml
+++ b/src/design/inverse-location-sequence-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/design/parametric-los-class-diagram.puml b/src/design/parametric-los-class-diagram.puml
index dd036c8e9389fc61c2d0c3e68ae2c410d6fd883b..f75085512a2fbaa603bedf14e275f9515fbf1916 100644
--- a/src/design/parametric-los-class-diagram.puml
+++ b/src/design/parametric-los-class-diagram.puml
@@ -1,4 +1,4 @@
-' Copyright 2013-2017 CS Systèmes d'Information
+' Copyright 2013-2019 CS Systèmes d'Information
' Licensed to CS Systèmes d'Information (CS) under one or more
' contributor license agreements. See the NOTICE file distributed with
' this work for additional information regarding copyright ownership.
diff --git a/src/main/assembly/source-distribution-assembly.xml b/src/main/assembly/source-distribution-assembly.xml
index 91abe41918453dd3a7acea9970c8745a7ede56c4..c7f81d8b88bc8dfa23c5c9b0e9ab14ef1d51de83 100644
--- a/src/main/assembly/source-distribution-assembly.xml
+++ b/src/main/assembly/source-distribution-assembly.xml
@@ -12,7 +12,7 @@
<include>BUILDING.txt</include>
<include>pom.xml</include>
<include>checkstyle.xml</include>
- <include>findbugs-exclude-filter.xml</include>
+ <include>spotbugs-exclude-filter.xml</include>
<include>license-header.txt</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
@@ -22,4 +22,4 @@
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java b/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
index f50e47c8e71c0358ce5a1f0814b86c796cee57f9..bddfcd96406a0580f383b4aebda1bd14bd1fe255 100644
--- a/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
+++ b/src/main/java/org/orekit/rugged/adjustment/AdjustmentContext.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -25,14 +25,11 @@ import java.util.Map;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer.Optimum;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem;
-import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
+import org.orekit.rugged.adjustment.measurements.Observables;
import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.adjustment.measurements.Observables;
/** Create adjustment context for viewing model refining.
* @author Lucie LabatAllee
@@ -118,54 +115,40 @@ public class AdjustmentContext {
* @param parametersConvergenceThreshold convergence threshold on normalized
* parameters (dimensionless, related to parameters scales)
* @return optimum of the least squares problem
- * @exception RuggedException if several parameters with the same name
- * exist, if no parameters have been selected for estimation, or
- * if parameters cannot be estimated (too few measurements,
- * ill-conditioned problem ...)
*/
public Optimum estimateFreeParameters(final Collection<String> ruggedNameList, final int maxEvaluations,
- final double parametersConvergenceThreshold)
- throws RuggedException {
-
- try {
-
- final List<Rugged> ruggedList = new ArrayList<Rugged>();
- final List<LineSensor> selectedSensors = new ArrayList<LineSensor>();
- for (String ruggedName : ruggedNameList) {
- final Rugged rugged = this.viewingModel.get(ruggedName);
- if (rugged == null) {
- throw new RuggedException(RuggedMessages.INVALID_RUGGED_NAME);
- }
-
- ruggedList.add(rugged);
- selectedSensors.addAll(rugged.getLineSensors());
+ final double parametersConvergenceThreshold) {
+
+ final List<Rugged> ruggedList = new ArrayList<Rugged>();
+ final List<LineSensor> selectedSensors = new ArrayList<LineSensor>();
+ for (String ruggedName : ruggedNameList) {
+ final Rugged rugged = this.viewingModel.get(ruggedName);
+ if (rugged == null) {
+ throw new RuggedException(RuggedMessages.INVALID_RUGGED_NAME);
}
- final LeastSquareAdjuster adjuster = new LeastSquareAdjuster(this.optimizerID);
- LeastSquaresProblem theProblem = null;
-
- // builder
- switch (ruggedList.size()) {
- case 1:
- final Rugged rugged = ruggedList.get(0);
- final GroundOptimizationProblemBuilder groundOptimizationProblem = new GroundOptimizationProblemBuilder(selectedSensors, measurements, rugged);
- theProblem = groundOptimizationProblem.build(maxEvaluations, parametersConvergenceThreshold);
- break;
- case 2:
- final InterSensorsOptimizationProblemBuilder interSensorsOptimizationProblem = new InterSensorsOptimizationProblemBuilder(selectedSensors, measurements, ruggedList);
- theProblem = interSensorsOptimizationProblem.build(maxEvaluations, parametersConvergenceThreshold);
- break;
- default :
- throw new RuggedException(RuggedMessages.UNSUPPORTED_REFINING_CONTEXT, ruggedList.size());
- }
-
- return adjuster.optimize(theProblem);
+ ruggedList.add(rugged);
+ selectedSensors.addAll(rugged.getLineSensors());
+ }
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
- } catch (OrekitExceptionWrapper oew) {
- final OrekitException oe = oew.getException();
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
+ final LeastSquareAdjuster adjuster = new LeastSquareAdjuster(this.optimizerID);
+ LeastSquaresProblem theProblem = null;
+
+ // builder
+ switch (ruggedList.size()) {
+ case 1:
+ final Rugged rugged = ruggedList.get(0);
+ final GroundOptimizationProblemBuilder groundOptimizationProblem = new GroundOptimizationProblemBuilder(selectedSensors, measurements, rugged);
+ theProblem = groundOptimizationProblem.build(maxEvaluations, parametersConvergenceThreshold);
+ break;
+ case 2:
+ final InterSensorsOptimizationProblemBuilder interSensorsOptimizationProblem = new InterSensorsOptimizationProblemBuilder(selectedSensors, measurements, ruggedList);
+ theProblem = interSensorsOptimizationProblem.build(maxEvaluations, parametersConvergenceThreshold);
+ break;
+ default :
+ throw new RuggedException(RuggedMessages.UNSUPPORTED_REFINING_CONTEXT, ruggedList.size());
}
+
+ return adjuster.optimize(theProblem);
}
}
diff --git a/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
index 3773d5c73c9b17226e81157a0c237afded58f006..51d3f62d5b1381fd25adb36fe894d84afe11c17f 100644
--- a/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilder.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -34,16 +34,13 @@ import org.hipparchus.optim.nonlinear.vector.leastsquares.ParameterValidator;
import org.hipparchus.util.FastMath;
import org.hipparchus.util.Pair;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorPixel;
-import org.orekit.rugged.adjustment.measurements.Observables;
-import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.utils.ParameterDriver;
/** Ground optimization problem builder.
@@ -82,20 +79,16 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
* @param sensors list of sensors to refine
* @param measurements set of observables
* @param rugged name of rugged to refine
- * @throws RuggedException an exception is generated if no parameters has been selected for refining
*/
public GroundOptimizationProblemBuilder(final List<LineSensor> sensors,
- final Observables measurements, final Rugged rugged)
- throws RuggedException {
+ final Observables measurements, final Rugged rugged) {
super(sensors, measurements);
this.rugged = rugged;
this.initMapping();
}
- /* (non-Javadoc)
- * @see org.orekit.rugged.adjustment.OptimizationProblemBuilder#initMapping()
- */
+ /** {@inheritDoc} */
@Override
protected void initMapping() {
@@ -109,120 +102,104 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
}
}
- /* (non-Javadoc)
- * @see org.orekit.rugged.adjustment.OptimizationProblemBuilder#createTargetAndWeight()
- */
+ /** {@inheritDoc} */
@Override
- protected void createTargetAndWeight() throws RuggedException {
+ protected void createTargetAndWeight() {
- try {
- int n = 0;
- for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
- n += reference.getMapping().size();
- }
-
- if (n == 0) {
- throw new RuggedException(RuggedMessages.NO_REFERENCE_MAPPINGS);
- }
- final double[] target = new double[2 * n];
- final double[] weight = new double[2 * n];
-
- double min = Double.POSITIVE_INFINITY;
- double max = Double.NEGATIVE_INFINITY;
- int k = 0;
+ int n = 0;
+ for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
+ n += reference.getMapping().size();
+ }
- for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
- for (final Map.Entry<SensorPixel, GeodeticPoint> mapping : reference.getMapping()) {
- final SensorPixel sp = mapping.getKey();
- weight[k] = 1.0;
- target[k++] = sp.getLineNumber();
- weight[k] = 1.0;
- target[k++] = sp.getPixelNumber();
- min = FastMath.min(min, sp.getLineNumber());
- max = FastMath.max(max, sp.getLineNumber());
- }
+ if (n == 0) {
+ throw new RuggedException(RuggedMessages.NO_REFERENCE_MAPPINGS);
+ }
+ final double[] target = new double[2 * n];
+ final double[] weight = new double[2 * n];
+
+ double min = Double.POSITIVE_INFINITY;
+ double max = Double.NEGATIVE_INFINITY;
+ int k = 0;
+
+ for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
+ for (final Map.Entry<SensorPixel, GeodeticPoint> mapping : reference.getMapping()) {
+ final SensorPixel sp = mapping.getKey();
+ weight[k] = 1.0;
+ target[k++] = sp.getLineNumber();
+ weight[k] = 1.0;
+ target[k++] = sp.getPixelNumber();
+ min = FastMath.min(min, sp.getLineNumber());
+ max = FastMath.max(max, sp.getLineNumber());
}
-
- this.minLine = (int) FastMath.floor(min - ESTIMATION_LINE_RANGE_MARGIN);
- this.maxLine = (int) FastMath.ceil(max - ESTIMATION_LINE_RANGE_MARGIN);
- this.targetAndWeight = new HashMap<String, double[]>();
- this.targetAndWeight.put(TARGET, target);
- this.targetAndWeight.put(WEIGHT, weight);
-
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
}
+
+ this.minLine = (int) FastMath.floor(min - ESTIMATION_LINE_RANGE_MARGIN);
+ this.maxLine = (int) FastMath.ceil(max - ESTIMATION_LINE_RANGE_MARGIN);
+ this.targetAndWeight = new HashMap<String, double[]>();
+ this.targetAndWeight.put(TARGET, target);
+ this.targetAndWeight.put(WEIGHT, weight);
}
- /* (non-Javadoc)
- * @see org.orekit.rugged.adjustment.OptimizationProblemBuilder#createFunction()
- */
+ /** {@inheritDoc} */
@Override
protected MultivariateJacobianFunction createFunction() {
// model function
final MultivariateJacobianFunction model = point -> {
- try {
- // set the current parameters values
- int i = 0;
- for (final ParameterDriver driver : this.getDrivers()) {
- driver.setNormalizedValue(point.getEntry(i++));
- }
+ // set the current parameters values
+ int i = 0;
+ for (final ParameterDriver driver : this.getDrivers()) {
+ driver.setNormalizedValue(point.getEntry(i++));
+ }
- final double[] target = this.targetAndWeight.get(TARGET);
-
- // compute inverse loc and its partial derivatives
- final RealVector value = new ArrayRealVector(target.length);
- final RealMatrix jacobian = new Array2DRowRealMatrix(target.length, this.getNbParams());
- int l = 0;
- for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
- for (final Map.Entry<SensorPixel, GeodeticPoint> mapping : reference.getMapping()) {
- final GeodeticPoint gp = mapping.getValue();
- final DerivativeStructure[] ilResult = this.rugged.inverseLocationDerivatives(reference.getSensorName(), gp, minLine, maxLine, this.getGenerator());
-
- if (ilResult == null) {
- value.setEntry(l, minLine - 100.0); // arbitrary
- // line far
- // away
- value.setEntry(l + 1, -100.0); // arbitrary
- // pixel far away
- } else {
- // extract the value
- value.setEntry(l, ilResult[0].getValue());
- value.setEntry(l + 1, ilResult[1].getValue());
-
- // extract the Jacobian
- final int[] orders = new int[this.getNbParams()];
- int m = 0;
- for (final ParameterDriver driver : this.getDrivers()) {
- final double scale = driver.getScale();
- orders[m] = 1;
- jacobian.setEntry(l, m,
- ilResult[0]
- .getPartialDerivative(orders) *
- scale);
- jacobian.setEntry(l + 1, m,
- ilResult[1]
- .getPartialDerivative(orders) *
- scale);
- orders[m] = 0;
- m++;
- }
- }
+ final double[] target = this.targetAndWeight.get(TARGET);
- l += 2;
+ // compute inverse loc and its partial derivatives
+ final RealVector value = new ArrayRealVector(target.length);
+ final RealMatrix jacobian = new Array2DRowRealMatrix(target.length, this.getNbParams());
+ int l = 0;
+ for (final SensorToGroundMapping reference : this.sensorToGroundMappings) {
+ for (final Map.Entry<SensorPixel, GeodeticPoint> mapping : reference.getMapping()) {
+ final GeodeticPoint gp = mapping.getValue();
+ final DerivativeStructure[] ilResult = this.rugged.inverseLocationDerivatives(reference.getSensorName(), gp, minLine, maxLine, this.getGenerator());
+
+ if (ilResult == null) {
+ value.setEntry(l, minLine - 100.0); // arbitrary
+ // line far
+ // away
+ value.setEntry(l + 1, -100.0); // arbitrary
+ // pixel far away
+ } else {
+ // extract the value
+ value.setEntry(l, ilResult[0].getValue());
+ value.setEntry(l + 1, ilResult[1].getValue());
+
+ // extract the Jacobian
+ final int[] orders = new int[this.getNbParams()];
+ int m = 0;
+ for (final ParameterDriver driver : this.getDrivers()) {
+ final double scale = driver.getScale();
+ orders[m] = 1;
+ jacobian.setEntry(l, m,
+ ilResult[0]
+ .getPartialDerivative(orders) *
+ scale);
+ jacobian.setEntry(l + 1, m,
+ ilResult[1]
+ .getPartialDerivative(orders) *
+ scale);
+ orders[m] = 0;
+ m++;
+ }
}
- }
- // inverse loc result with Jacobian for all reference points
- return new Pair<RealVector, RealMatrix>(value, jacobian);
-
- } catch (RuggedException re) {
- throw new RuggedExceptionWrapper(re);
- } catch (OrekitException oe) {
- throw new OrekitExceptionWrapper(oe);
+ l += 2;
+ }
}
+
+ // inverse loc result with Jacobian for all reference points
+ return new Pair<RealVector, RealMatrix>(value, jacobian);
};
return model;
@@ -232,11 +209,10 @@ public class GroundOptimizationProblemBuilder extends OptimizationProblemBuilder
/** Least square problem builder.
* @param maxEvaluations maxIterations and evaluations
* @param convergenceThreshold parameter convergence threshold
- * @throws RuggedException if sensor is not found
* @return the least square problem
*/
@Override
- public final LeastSquaresProblem build(final int maxEvaluations, final double convergenceThreshold) throws RuggedException {
+ public final LeastSquaresProblem build(final int maxEvaluations, final double convergenceThreshold) {
this.createTargetAndWeight();
final double[] target = this.targetAndWeight.get(TARGET);
diff --git a/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
index 41dd778e7fccc6527200dde289f5190e531f91c8..7083a59b2fc1d2353ef7fb45e3654148e853ca58 100644
--- a/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/InterSensorsOptimizationProblemBuilder.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -35,16 +35,13 @@ import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem;
import org.hipparchus.optim.nonlinear.vector.leastsquares.MultivariateJacobianFunction;
import org.hipparchus.optim.nonlinear.vector.leastsquares.ParameterValidator;
import org.hipparchus.util.Pair;
-import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorPixel;
-import org.orekit.rugged.adjustment.measurements.Observables;
-import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -77,11 +74,9 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
* @param sensors list of sensors to refine
* @param measurements set of observables
* @param ruggedList names of rugged to refine
- * @throws RuggedException an exception is generated if no parameters has been selected for refining
*/
public InterSensorsOptimizationProblemBuilder(final List<LineSensor> sensors,
- final Observables measurements, final Collection<Rugged> ruggedList)
- throws RuggedException {
+ final Observables measurements, final Collection<Rugged> ruggedList) {
super(sensors, measurements);
this.ruggedMap = new LinkedHashMap<String, Rugged>();
@@ -91,9 +86,7 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
this.initMapping();
}
- /* (non-Javadoc)
- * @see org.orekit.rugged.adjustment.OptimizationProblemBuilder#initMapping()
- */
+ /** {@inheritDoc} */
@Override
protected void initMapping() {
@@ -118,145 +111,129 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
}
}
- /* (non-Javadoc)
- * @see org.orekit.rugged.adjustment.OptimizationProblemBuilder#createTargetAndWeight()
- */
+ /** {@inheritDoc} */
@Override
- protected void createTargetAndWeight() throws RuggedException {
+ protected void createTargetAndWeight() {
- try {
- int n = 0;
- for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
- n += reference.getMapping().size();
- }
- if (n == 0) {
- throw new RuggedException(RuggedMessages.NO_REFERENCE_MAPPINGS);
- }
+ int n = 0;
+ for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
+ n += reference.getMapping().size();
+ }
+ if (n == 0) {
+ throw new RuggedException(RuggedMessages.NO_REFERENCE_MAPPINGS);
+ }
- n = 2 * n;
+ n = 2 * n;
- final double[] target = new double[n];
- final double[] weight = new double[n];
+ final double[] target = new double[n];
+ final double[] weight = new double[n];
- int k = 0;
- for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
+ int k = 0;
+ for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
- // Get central body constraint weight
- final double bodyConstraintWeight = reference.getBodyConstraintWeight();
+ // Get central body constraint weight
+ final double bodyConstraintWeight = reference.getBodyConstraintWeight();
- int i = 0;
- for (Iterator<Map.Entry<SensorPixel, SensorPixel>> gtIt = reference.getMapping().iterator(); gtIt.hasNext(); i++) {
+ int i = 0;
+ for (Iterator<Map.Entry<SensorPixel, SensorPixel>> gtIt = reference.getMapping().iterator(); gtIt.hasNext(); i++) {
- if (i == reference.getMapping().size()) break;
+ if (i == reference.getMapping().size()) break;
- // Get LOS distance
- final Double losDistance = reference.getLosDistance(i);
+ // Get LOS distance
+ final Double losDistance = reference.getLosDistance(i);
- weight[k] = 1.0 - bodyConstraintWeight;
- target[k++] = losDistance.doubleValue();
+ weight[k] = 1.0 - bodyConstraintWeight;
+ target[k++] = losDistance.doubleValue();
- // Get central body distance (constraint)
- final Double bodyDistance = reference.getBodyDistance(i);
- weight[k] = bodyConstraintWeight;
- target[k++] = bodyDistance.doubleValue();
- }
+ // Get central body distance (constraint)
+ final Double bodyDistance = reference.getBodyDistance(i);
+ weight[k] = bodyConstraintWeight;
+ target[k++] = bodyDistance.doubleValue();
}
-
- this.targetAndWeight = new HashMap<String, double[]>();
- this.targetAndWeight.put(TARGET, target);
- this.targetAndWeight.put(WEIGHT, weight);
-
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
}
+
+ this.targetAndWeight = new HashMap<String, double[]>();
+ this.targetAndWeight.put(TARGET, target);
+ this.targetAndWeight.put(WEIGHT, weight);
}
- /* (non-Javadoc)
- * @see org.orekit.rugged.adjustment.OptimizationProblemBuilder#createFunction()
- */
+ /** {@inheritDoc} */
@Override
protected MultivariateJacobianFunction createFunction() {
// model function
final MultivariateJacobianFunction model = point -> {
- try {
- // set the current parameters values
- int i = 0;
- for (final ParameterDriver driver : this.getDrivers()) {
- driver.setNormalizedValue(point.getEntry(i++));
- }
-
- final double[] target = this.targetAndWeight.get(TARGET);
+ // set the current parameters values
+ int i = 0;
+ for (final ParameterDriver driver : this.getDrivers()) {
+ driver.setNormalizedValue(point.getEntry(i++));
+ }
- // compute distance and its partial derivatives
- final RealVector value = new ArrayRealVector(target.length);
- final RealMatrix jacobian = new Array2DRowRealMatrix(target.length, this.getNbParams());
+ final double[] target = this.targetAndWeight.get(TARGET);
- int l = 0;
- for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
+ // compute distance and its partial derivatives
+ final RealVector value = new ArrayRealVector(target.length);
+ final RealMatrix jacobian = new Array2DRowRealMatrix(target.length, this.getNbParams());
- final String ruggedNameA = reference.getRuggedNameA();
- final String ruggedNameB = reference.getRuggedNameB();
- final Rugged ruggedA = this.ruggedMap.get(ruggedNameA);
- if (ruggedA == null) {
- throw new RuggedException(RuggedMessages.INVALID_RUGGED_NAME);
- }
+ int l = 0;
+ for (final SensorToSensorMapping reference : this.sensorToSensorMappings) {
- final Rugged ruggedB = this.ruggedMap.get(ruggedNameB);
- if (ruggedB == null) {
- throw new RuggedException(RuggedMessages.INVALID_RUGGED_NAME);
- }
+ final String ruggedNameA = reference.getRuggedNameA();
+ final String ruggedNameB = reference.getRuggedNameB();
+ final Rugged ruggedA = this.ruggedMap.get(ruggedNameA);
+ if (ruggedA == null) {
+ throw new RuggedException(RuggedMessages.INVALID_RUGGED_NAME);
+ }
- for (final Map.Entry<SensorPixel, SensorPixel> mapping : reference.getMapping()) {
+ final Rugged ruggedB = this.ruggedMap.get(ruggedNameB);
+ if (ruggedB == null) {
+ throw new RuggedException(RuggedMessages.INVALID_RUGGED_NAME);
+ }
- final SensorPixel spA = mapping.getKey();
- final SensorPixel spB = mapping.getValue();
+ for (final Map.Entry<SensorPixel, SensorPixel> mapping : reference.getMapping()) {
- final LineSensor lineSensorB = ruggedB.getLineSensor(reference.getSensorNameB());
- final LineSensor lineSensorA = ruggedA.getLineSensor(reference.getSensorNameA());
+ final SensorPixel spA = mapping.getKey();
+ final SensorPixel spB = mapping.getValue();
- final AbsoluteDate dateA = lineSensorA.getDate(spA.getLineNumber());
- final AbsoluteDate dateB = lineSensorB.getDate(spB.getLineNumber());
+ final LineSensor lineSensorB = ruggedB.getLineSensor(reference.getSensorNameB());
+ final LineSensor lineSensorA = ruggedA.getLineSensor(reference.getSensorNameA());
- final double pixelA = spA.getPixelNumber();
- final double pixelB = spB.getPixelNumber();
+ final AbsoluteDate dateA = lineSensorA.getDate(spA.getLineNumber());
+ final AbsoluteDate dateB = lineSensorB.getDate(spB.getLineNumber());
- final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
+ final double pixelA = spA.getPixelNumber();
+ final double pixelB = spB.getPixelNumber();
- final DerivativeStructure[] ilResult =
- ruggedB.distanceBetweenLOSderivatives(lineSensorA, dateA, pixelA, scToBodyA,
- lineSensorB, dateB, pixelB, this.getGenerator());
+ final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
- // extract the value
- value.setEntry(l, ilResult[0].getValue());
- value.setEntry(l + 1, ilResult[1].getValue());
+ final DerivativeStructure[] ilResult =
+ ruggedB.distanceBetweenLOSderivatives(lineSensorA, dateA, pixelA, scToBodyA,
+ lineSensorB, dateB, pixelB, this.getGenerator());
- // extract the Jacobian
- final int[] orders = new int[this.getNbParams()];
- int m = 0;
+ // extract the value
+ value.setEntry(l, ilResult[0].getValue());
+ value.setEntry(l + 1, ilResult[1].getValue());
- for (final ParameterDriver driver : this.getDrivers()) {
- final double scale = driver.getScale();
- orders[m] = 1;
- jacobian.setEntry(l, m, ilResult[0].getPartialDerivative(orders) * scale);
- jacobian.setEntry(l + 1, m, ilResult[1].getPartialDerivative(orders) * scale);
- orders[m] = 0;
- m++;
- }
+ // extract the Jacobian
+ final int[] orders = new int[this.getNbParams()];
+ int m = 0;
- l += 2; // pass to the next evaluation
+ for (final ParameterDriver driver : this.getDrivers()) {
+ final double scale = driver.getScale();
+ orders[m] = 1;
+ jacobian.setEntry(l, m, ilResult[0].getPartialDerivative(orders) * scale);
+ jacobian.setEntry(l + 1, m, ilResult[1].getPartialDerivative(orders) * scale);
+ orders[m] = 0;
+ m++;
}
- }
- // distance result with Jacobian for all reference points
- return new Pair<RealVector, RealMatrix>(value, jacobian);
-
- } catch (RuggedException re) {
- throw new RuggedExceptionWrapper(re);
- } catch (OrekitException oe) {
- throw new OrekitExceptionWrapper(oe);
+ l += 2; // pass to the next evaluation
+ }
}
+
+ // distance result with Jacobian for all reference points
+ return new Pair<RealVector, RealMatrix>(value, jacobian);
};
return model;
@@ -266,11 +243,10 @@ public class InterSensorsOptimizationProblemBuilder extends OptimizationProblemB
/** Least square problem builder.
* @param maxEvaluations maxIterations and evaluations
* @param convergenceThreshold parameter convergence threshold
- * @throws RuggedException if sensor is not found
* @return the least square problem
*/
@Override
- public final LeastSquaresProblem build(final int maxEvaluations, final double convergenceThreshold) throws RuggedException {
+ public final LeastSquaresProblem build(final int maxEvaluations, final double convergenceThreshold) {
this.createTargetAndWeight();
final double[] target = this.targetAndWeight.get(TARGET);
diff --git a/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java b/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
index eb19e374348412deff5a543c70bfb7ddae9ed611..cbd228353c42049433f429517d091f0efc6dd44f 100644
--- a/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
+++ b/src/main/java/org/orekit/rugged/adjustment/LeastSquareAdjuster.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,12 +17,14 @@
package org.orekit.rugged.adjustment;
+import org.hipparchus.linear.LUDecomposer;
+import org.hipparchus.linear.QRDecomposer;
import org.hipparchus.optim.nonlinear.vector.leastsquares.GaussNewtonOptimizer;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer.Optimum;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LevenbergMarquardtOptimizer;
-import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
/** LeastSquareAdjuster
* Class for setting least square algorithm chosen for solving optimization problem.
@@ -75,14 +77,14 @@ public class LeastSquareAdjuster {
return new LevenbergMarquardtOptimizer();
case GAUSS_NEWTON_LU :
- return new GaussNewtonOptimizer().withDecomposition(GaussNewtonOptimizer.Decomposition.LU);
+ return new GaussNewtonOptimizer(new LUDecomposer(1e-11), true);
case GAUSS_NEWTON_QR :
- return new GaussNewtonOptimizer().withDecomposition(GaussNewtonOptimizer.Decomposition.QR);
+ return new GaussNewtonOptimizer(new QRDecomposer(1e-11), false);
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
}
diff --git a/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java b/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
index 2c607efedfb653e61ecad5606f6c0c12a1720da8..15891ca950a6715373b5fec67cdb9f43fdcf341b 100644
--- a/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
+++ b/src/main/java/org/orekit/rugged/adjustment/OptimizationProblemBuilder.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -30,13 +30,10 @@ import org.hipparchus.optim.ConvergenceChecker;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem;
import org.hipparchus.optim.nonlinear.vector.leastsquares.MultivariateJacobianFunction;
import org.hipparchus.optim.nonlinear.vector.leastsquares.ParameterValidator;
-import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
+import org.orekit.rugged.adjustment.measurements.Observables;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.adjustment.measurements.Observables;
import org.orekit.rugged.utils.DSGenerator;
import org.orekit.utils.ParameterDriver;
@@ -72,21 +69,15 @@ abstract class OptimizationProblemBuilder {
/** Constructor.
* @param sensors list of sensors to refine
* @param measurements set of observables
- * @throws RuggedException an exception is generated if no parameters has been selected for refining
*/
- OptimizationProblemBuilder(final List<LineSensor> sensors, final Observables measurements) throws RuggedException {
-
- try {
- this.generator = this.createGenerator(sensors);
- this.drivers = this.generator.getSelected();
- this.nbParams = this.drivers.size();
- if (this.nbParams == 0) {
- throw new RuggedException(RuggedMessages.NO_PARAMETERS_SELECTED);
- }
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
- }
+ OptimizationProblemBuilder(final List<LineSensor> sensors, final Observables measurements) {
+ this.generator = this.createGenerator(sensors);
+ this.drivers = this.generator.getSelected();
+ this.nbParams = this.drivers.size();
+ if (this.nbParams == 0) {
+ throw new RuggedException(RuggedMessages.NO_PARAMETERS_SELECTED);
+ }
this.measurements = measurements;
this.sensors = sensors;
}
@@ -94,12 +85,10 @@ abstract class OptimizationProblemBuilder {
/** Least squares problem builder.
* @param maxEvaluations maximum number of evaluations
* @param convergenceThreshold convergence threshold
- * @throws RuggedException if sensor is not found
* @return the least squares problem
*/
- public abstract LeastSquaresProblem build(int maxEvaluations, double convergenceThreshold)
- throws RuggedException;
+ public abstract LeastSquaresProblem build(int maxEvaluations, double convergenceThreshold);
/** Create the convergence check.
* <p>
@@ -131,10 +120,8 @@ abstract class OptimizationProblemBuilder {
return start;
}
- /** Create targets and weights of optimization problem.
- * @throws RuggedException if no reference mappings for parameters estimation are found
- */
- protected abstract void createTargetAndWeight() throws RuggedException;
+ /** Create targets and weights of optimization problem. */
+ protected abstract void createTargetAndWeight();
/** Create the model function value and its Jacobian.
* @return the model function value and its Jacobian
@@ -151,19 +138,14 @@ abstract class OptimizationProblemBuilder {
// Prevent parameters to exceed their prescribed bounds
final ParameterValidator validator = params -> {
- try {
- int i = 0;
- for (final ParameterDriver driver : this.drivers) {
-
- // let the parameter handle min/max clipping
- driver.setNormalizedValue(params.getEntry(i));
- params.setEntry(i++, driver.getNormalizedValue());
- }
- return params;
+ int i = 0;
+ for (final ParameterDriver driver : this.drivers) {
- } catch (OrekitException oe) {
- throw new OrekitExceptionWrapper(oe);
+ // let the parameter handle min/max clipping
+ driver.setNormalizedValue(params.getEntry(i));
+ params.setEntry(i++, driver.getNormalizedValue());
}
+ return params;
};
return validator;
diff --git a/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java b/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java
index 019c65436ff62090808e570cd028e4854bbfdcf5..30ad99bda7d8813e28bf92980a0d540751fdc64e 100644
--- a/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java
+++ b/src/main/java/org/orekit/rugged/adjustment/OptimizerId.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
index 845a1c2dd87b53454080f5dcfd1863d67d59e6d5..09ed8dfed9cb574b8737ff1f6c5f7933ca289881 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -35,10 +35,10 @@ public class Observables {
/** Separator between sensors. */
private static final String SENSORS_SEPARATOR = "__";
- /** Sensor to ground mapping structure (example: for GCP points).*/
+ /** Sensor to ground mapping structure (example: for Ground Control Points GCP points).*/
private final Map<String, SensorToGroundMapping> groundMappings;
- /** Sensor to sensor mappings structure (liaison points). */
+ /** Sensor to sensor mappings structure (Tie points). */
private final Map<String, SensorToSensorMapping> interMappings;
/** Number of viewing models to map.*/
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
index c718e4031471972b537f38bae07807cd6288b707..cc9719a3f1b21042ef64943a727ade2f2d7e7865 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorMapping.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
index b38c9c1fd9bc365c339f77191f1c8814cbefa9ae..6a2aa0a410e7bb853d0c9c2fd4bb6cd7daa8b60a 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToGroundMapping.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -46,7 +46,7 @@ public class SensorToGroundMapping {
* @param sensorName name of the sensor to which mapping applies
*/
public SensorToGroundMapping(final String sensorName) {
- this(sensorName, RUGGED);
+ this(RUGGED, sensorName);
}
/** Build a new instance with a specific Rugged name.
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
index cb87ba6001bdb68ccb559ac70b9ea33a501a1c5d..3c360c52aecb3a7146ac8c5b0597dbfda24a70d0 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/SensorToSensorMapping.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/api/AlgorithmId.java b/src/main/java/org/orekit/rugged/api/AlgorithmId.java
index e3e46c9395faa2ab7e9122ef5ff8cc68da904e1f..e5128966944e4ffee5fac2063b50b536242587c1 100644
--- a/src/main/java/org/orekit/rugged/api/AlgorithmId.java
+++ b/src/main/java/org/orekit/rugged/api/AlgorithmId.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java b/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
index 1ee7f79345628f7c3dcb3501690e4d74bfebd4af..fc6b0954908f2a77e0865457c85200c854d4f64c 100644
--- a/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
+++ b/src/main/java/org/orekit/rugged/api/BodyRotatingFrameId.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/api/EllipsoidId.java b/src/main/java/org/orekit/rugged/api/EllipsoidId.java
index bb371d04121e581401b9c95ee376b65643471f43..56976ceec6af8b491b6b0687e42c772be1b12596 100644
--- a/src/main/java/org/orekit/rugged/api/EllipsoidId.java
+++ b/src/main/java/org/orekit/rugged/api/EllipsoidId.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/api/InertialFrameId.java b/src/main/java/org/orekit/rugged/api/InertialFrameId.java
index 67b1b4bb92d9f860ddb238d030b9555c7974501e..e5ca74d969a36da58818cc5ee3d8a07a5b38803a 100644
--- a/src/main/java/org/orekit/rugged/api/InertialFrameId.java
+++ b/src/main/java/org/orekit/rugged/api/InertialFrameId.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 95f733edc2de2235f628ec264ddbe35a0d529f01..b7207f9bb3f1e70b70dcd25983556a8209d021ed 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +28,7 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.frames.Transform;
import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.linesensor.LineSensor;
@@ -46,9 +47,9 @@ import org.orekit.utils.PVCoordinates;
/** Main class of Rugged library API.
* @see RuggedBuilder
* @author Luc Maisonobe
- * @author Lucie LabatAllee
- * @author Jonathan Guinet
* @author Guylaine Prat
+ * @author Jonathan Guinet
+ * @author Lucie LabatAllee
*/
public class Rugged {
@@ -60,9 +61,20 @@ public class Rugged {
*/
private static final double COARSE_INVERSE_LOCATION_ACCURACY = 0.01;
- /** Maximum number of evaluations. */
+ /** Maximum number of evaluations for crossing algorithms. */
private static final int MAX_EVAL = 50;
+ /** Margin for computation of inverse location with atmospheric refraction correction. */
+ private static final double INVLOC_MARGIN = 0.8;
+
+ /** Threshold for pixel convergence in fixed point method
+ * (for inverse location with atmospheric refraction correction). */
+ private static final double PIXEL_CV_THRESHOLD = 1.e-4;
+
+ /** Threshold for line convergence in fixed point method
+ * (for inverse location with atmospheric refraction correction). */
+ private static final double LINE_CV_THRESHOLD = 1.e-4;
+
/** Reference ellipsoid. */
private final ExtendedEllipsoid ellipsoid;
@@ -226,67 +238,49 @@ public class Rugged {
* @param sensorName name of the line sensor
* @param lineNumber number of the line to localize on ground
* @return ground position of all pixels of the specified sensor line
- * @exception RuggedException if line cannot be localized, or sensor is unknown
*/
- public GeodeticPoint[] directLocation(final String sensorName, final double lineNumber)
- throws RuggedException {
+ public GeodeticPoint[] directLocation(final String sensorName, final double lineNumber) {
- // compute the approximate transform between spacecraft and observed body
- final LineSensor sensor = getLineSensor(sensorName);
- final AbsoluteDate date = sensor.getDate(lineNumber);
+ final LineSensor sensor = getLineSensor(sensorName);
+ final Vector3D sensorPosition = sensor.getPosition();
+ final AbsoluteDate date = sensor.getDate(lineNumber);
+
+ // Compute the transform for the date
+ // from spacecraft to inertial
final Transform scToInert = scToBody.getScToInertial(date);
+ // from inertial to body
final Transform inertToBody = scToBody.getInertialToBody(date);
- final Transform approximate = new Transform(date, scToInert, inertToBody);
- final Vector3D spacecraftVelocity =
- scToInert.transformPVCoordinates(PVCoordinates.ZERO).getVelocity();
+ // Compute spacecraft velocity in inertial frame
+ final Vector3D spacecraftVelocity = scToInert.transformPVCoordinates(PVCoordinates.ZERO).getVelocity();
+ // Compute sensor position in inertial frame
+ // TBN: for simplicity, due to the size of sensor, we consider each pixel to be at sensor position
+ final Vector3D pInert = scToInert.transformPosition(sensorPosition);
- // compute location of each pixel
- final Vector3D pInert = scToInert.transformPosition(sensor.getPosition());
+ // Compute location of each pixel
final GeodeticPoint[] gp = new GeodeticPoint[sensor.getNbPixels()];
for (int i = 0; i < sensor.getNbPixels(); ++i) {
- DumpManager.dumpDirectLocation(date, sensor.getPosition(), sensor.getLOS(date, i), lightTimeCorrection,
- aberrationOfLightCorrection, atmosphericRefraction != null);
+ final Vector3D los = sensor.getLOS(date, i);
+ DumpManager.dumpDirectLocation(date, sensorPosition, los, lightTimeCorrection,
+ aberrationOfLightCorrection, atmosphericRefraction != null);
- final Vector3D obsLInert = scToInert.transformVector(sensor.getLOS(date, i));
+ // compute the line of sight in inertial frame (without correction)
+ final Vector3D obsLInert = scToInert.transformVector(los);
final Vector3D lInert;
+
if (aberrationOfLightCorrection) {
- // apply aberration of light correction
- // as the spacecraft velocity is small with respect to speed of light,
- // we use classical velocity addition and not relativistic velocity addition
- // we look for a positive k such that: c * lInert + vsat = k * obsLInert
- // with lInert normalized
- final double a = obsLInert.getNormSq();
- final double b = -Vector3D.dotProduct(obsLInert, spacecraftVelocity);
- final double c = spacecraftVelocity.getNormSq() - Constants.SPEED_OF_LIGHT * Constants.SPEED_OF_LIGHT;
- final double s = FastMath.sqrt(b * b - a * c);
- final double k = (b > 0) ? -c / (s + b) : (s - b) / a;
- lInert = new Vector3D( k / Constants.SPEED_OF_LIGHT, obsLInert,
- -1.0 / Constants.SPEED_OF_LIGHT, spacecraftVelocity);
+ // apply aberration of light correction on LOS
+ lInert = applyAberrationOfLightCorrection(obsLInert, spacecraftVelocity);
} else {
- // don't apply aberration of light correction
+ // don't apply aberration of light correction on LOS
lInert = obsLInert;
}
if (lightTimeCorrection) {
// compute DEM intersection with light time correction
- final Vector3D sP = approximate.transformPosition(sensor.getPosition());
- final Vector3D sL = approximate.transformVector(sensor.getLOS(date, i));
- final Vector3D eP1 = ellipsoid.transform(ellipsoid.pointOnGround(sP, sL, 0.0));
- final double deltaT1 = eP1.distance(sP) / Constants.SPEED_OF_LIGHT;
- final Transform shifted1 = inertToBody.shiftedBy(-deltaT1);
- final NormalizedGeodeticPoint gp1 = algorithm.intersection(ellipsoid,
- shifted1.transformPosition(pInert),
- shifted1.transformVector(lInert));
-
- final Vector3D eP2 = ellipsoid.transform(gp1);
- final double deltaT2 = eP2.distance(sP) / Constants.SPEED_OF_LIGHT;
- final Transform shifted2 = inertToBody.shiftedBy(-deltaT2);
- gp[i] = algorithm.refineIntersection(ellipsoid,
- shifted2.transformPosition(pInert),
- shifted2.transformVector(lInert),
- gp1);
+ // TBN: for simplicity, due to the size of sensor, we consider each pixel to be at sensor position
+ gp[i] = computeWithLightTimeCorrection(date, sensorPosition, los, scToInert, inertToBody, pInert, lInert);
} else {
// compute DEM intersection without light time correction
@@ -296,113 +290,90 @@ public class Rugged {
algorithm.intersection(ellipsoid, pBody, lBody));
}
- if (atmosphericRefraction != null) {
+ // compute with atmospheric refraction correction if necessary
+ if (atmosphericRefraction != null && atmosphericRefraction.mustBeComputed()) {
+
// apply atmospheric refraction correction
final Vector3D pBody = inertToBody.transformPosition(pInert);
final Vector3D lBody = inertToBody.transformVector(lInert);
gp[i] = atmosphericRefraction.applyCorrection(pBody, lBody, (NormalizedGeodeticPoint) gp[i], algorithm);
}
-
DumpManager.dumpDirectLocationResult(gp[i]);
-
}
-
return gp;
-
}
/** Direct location of a single line-of-sight.
* @param date date of the location
- * @param position pixel position in spacecraft frame
+ * @param sensorPosition sensor position in spacecraft frame. For simplicity, due to the size of sensor,
+ * we consider each pixel to be at sensor position
* @param los normalized line-of-sight in spacecraft frame
* @return ground position of intersection point between specified los and ground
- * @exception RuggedException if line cannot be localized, or sensor is unknown
*/
- public GeodeticPoint directLocation(final AbsoluteDate date, final Vector3D position, final Vector3D los)
- throws RuggedException {
+ public GeodeticPoint directLocation(final AbsoluteDate date, final Vector3D sensorPosition, final Vector3D los) {
- DumpManager.dumpDirectLocation(date, position, los, lightTimeCorrection, aberrationOfLightCorrection,
+ DumpManager.dumpDirectLocation(date, sensorPosition, los, lightTimeCorrection, aberrationOfLightCorrection,
atmosphericRefraction != null);
- // compute the approximate transform between spacecraft and observed body
+ // Compute the transforms for the date
+ // from spacecraft to inertial
final Transform scToInert = scToBody.getScToInertial(date);
+ // from inertial to body
final Transform inertToBody = scToBody.getInertialToBody(date);
- final Transform approximate = new Transform(date, scToInert, inertToBody);
-
- final Vector3D spacecraftVelocity =
- scToInert.transformPVCoordinates(PVCoordinates.ZERO).getVelocity();
- // compute location of specified pixel
- final Vector3D pInert = scToInert.transformPosition(position);
+ // Compute spacecraft velocity in inertial frame
+ final Vector3D spacecraftVelocity = scToInert.transformPVCoordinates(PVCoordinates.ZERO).getVelocity();
+ // Compute sensor position in inertial frame
+ // TBN: for simplicity, due to the size of sensor, we consider each pixel to be at sensor position
+ final Vector3D pInert = scToInert.transformPosition(sensorPosition);
+ // Compute the line of sight in inertial frame (without correction)
final Vector3D obsLInert = scToInert.transformVector(los);
+
final Vector3D lInert;
if (aberrationOfLightCorrection) {
- // apply aberration of light correction
- // as the spacecraft velocity is small with respect to speed of light,
- // we use classical velocity addition and not relativistic velocity addition
- // we look for a positive k such that: c * lInert + vsat = k * obsLInert
- // with lInert normalized
- final double a = obsLInert.getNormSq();
- final double b = -Vector3D.dotProduct(obsLInert, spacecraftVelocity);
- final double c = spacecraftVelocity.getNormSq() - Constants.SPEED_OF_LIGHT * Constants.SPEED_OF_LIGHT;
- final double s = FastMath.sqrt(b * b - a * c);
- final double k = (b > 0) ? -c / (s + b) : (s - b) / a;
- lInert = new Vector3D( k / Constants.SPEED_OF_LIGHT, obsLInert,
- -1.0 / Constants.SPEED_OF_LIGHT, spacecraftVelocity);
+ // apply aberration of light correction on LOS
+ lInert = applyAberrationOfLightCorrection(obsLInert, spacecraftVelocity);
} else {
- // don't apply aberration of light correction
+ // don't apply aberration of light correction on LOS
lInert = obsLInert;
}
+ // Compute ground location of specified pixel
final NormalizedGeodeticPoint gp;
+
if (lightTimeCorrection) {
// compute DEM intersection with light time correction
- final Vector3D sP = approximate.transformPosition(position);
- final Vector3D sL = approximate.transformVector(los);
- final Vector3D eP1 = ellipsoid.transform(ellipsoid.pointOnGround(sP, sL, 0.0));
- final double deltaT1 = eP1.distance(sP) / Constants.SPEED_OF_LIGHT;
- final Transform shifted1 = inertToBody.shiftedBy(-deltaT1);
- final NormalizedGeodeticPoint gp1 = algorithm.intersection(ellipsoid,
- shifted1.transformPosition(pInert),
- shifted1.transformVector(lInert));
-
- final Vector3D eP2 = ellipsoid.transform(gp1);
- final double deltaT2 = eP2.distance(sP) / Constants.SPEED_OF_LIGHT;
- final Transform shifted2 = inertToBody.shiftedBy(-deltaT2);
- gp = algorithm.refineIntersection(ellipsoid,
- shifted2.transformPosition(pInert),
- shifted2.transformVector(lInert),
- gp1);
+ // TBN: for simplicity, due to the size of sensor, we consider each pixel to be at sensor position
+ gp = computeWithLightTimeCorrection(date, sensorPosition, los, scToInert, inertToBody, pInert, lInert);
} else {
// compute DEM intersection without light time correction
final Vector3D pBody = inertToBody.transformPosition(pInert);
final Vector3D lBody = inertToBody.transformVector(lInert);
gp = algorithm.refineIntersection(ellipsoid, pBody, lBody,
- algorithm.intersection(ellipsoid, pBody, lBody));
+ algorithm.intersection(ellipsoid, pBody, lBody));
}
- final NormalizedGeodeticPoint result;
- if (atmosphericRefraction != null) {
+ NormalizedGeodeticPoint result = gp;
+
+ // compute the ground location with atmospheric correction if asked for
+ if (atmosphericRefraction != null && atmosphericRefraction.mustBeComputed()) {
+
// apply atmospheric refraction correction
final Vector3D pBody = inertToBody.transformPosition(pInert);
final Vector3D lBody = inertToBody.transformVector(lInert);
result = atmosphericRefraction.applyCorrection(pBody, lBody, gp, algorithm);
- } else {
- // don't apply atmospheric refraction correction
- result = gp;
- }
+
+ } // end test on atmosphericRefraction != null
DumpManager.dumpDirectLocationResult(result);
return result;
-
}
/** Find the date at which sensor sees a ground point.
* <p>
- * This method is a partial {@link #inverseLocation(String,
- * GeodeticPoint, int, int) inverse location} focusing only on date.
+ * This method is a partial {@link #inverseLocation(String, GeodeticPoint, int, int) inverse location} focusing only on date.
* </p>
* <p>
* The point is given only by its latitude and longitude, the elevation is
@@ -427,14 +398,13 @@ public class Rugged {
* @param minLine minimum line number
* @param maxLine maximum line number
* @return date at which ground point is seen by line sensor
- * @exception RuggedException if line cannot be localized, or sensor is unknown
* @see #inverseLocation(String, double, double, int, int)
* @see org.orekit.rugged.utils.RoughVisibilityEstimator
*/
public AbsoluteDate dateLocation(final String sensorName,
final double latitude, final double longitude,
- final int minLine, final int maxLine)
- throws RuggedException {
+ final int minLine, final int maxLine) {
+
final GeodeticPoint groundPoint =
new GeodeticPoint(latitude, longitude, algorithm.getElevation(latitude, longitude));
return dateLocation(sensorName, groundPoint, minLine, maxLine);
@@ -463,13 +433,11 @@ public class Rugged {
* @param minLine minimum line number
* @param maxLine maximum line number
* @return date at which ground point is seen by line sensor
- * @exception RuggedException if line cannot be localized, or sensor is unknown
* @see #inverseLocation(String, GeodeticPoint, int, int)
* @see org.orekit.rugged.utils.RoughVisibilityEstimator
*/
public AbsoluteDate dateLocation(final String sensorName, final GeodeticPoint point,
- final int minLine, final int maxLine)
- throws RuggedException {
+ final int minLine, final int maxLine) {
final LineSensor sensor = getLineSensor(sensorName);
final SensorMeanPlaneCrossing planeCrossing = getPlaneCrossing(sensorName, minLine, maxLine);
@@ -483,7 +451,6 @@ public class Rugged {
} else {
return sensor.getDate(crossingResult.getLine());
}
-
}
/** Inverse location of a ground point.
@@ -511,15 +478,13 @@ public class Rugged {
* @param maxLine maximum line number
* @return sensor pixel seeing ground point, or null if ground point cannot
* be seen between the prescribed line numbers
- * @exception RuggedException if line cannot be localized, or sensor is unknown
* @see org.orekit.rugged.utils.RoughVisibilityEstimator
*/
public SensorPixel inverseLocation(final String sensorName,
final double latitude, final double longitude,
- final int minLine, final int maxLine)
- throws RuggedException {
- final GeodeticPoint groundPoint =
- new GeodeticPoint(latitude, longitude, algorithm.getElevation(latitude, longitude));
+ final int minLine, final int maxLine) {
+
+ final GeodeticPoint groundPoint = new GeodeticPoint(latitude, longitude, algorithm.getElevation(latitude, longitude));
return inverseLocation(sensorName, groundPoint, minLine, maxLine);
}
@@ -538,29 +503,108 @@ public class Rugged {
* are only an example and should be adjusted depending on mission needs.
* </p>
* @param sensorName name of the line sensor
- * @param point point to localize
- * @param minLine minimum line number
- * @param maxLine maximum line number
+ * @param point geodetic point to localize
+ * @param minLine minimum line number where the search will be performed
+ * @param maxLine maximum line number where the search will be performed
* @return sensor pixel seeing point, or null if point cannot be seen between the
* prescribed line numbers
- * @exception RuggedException if line cannot be localized, or sensor is unknown
* @see #dateLocation(String, GeodeticPoint, int, int)
* @see org.orekit.rugged.utils.RoughVisibilityEstimator
*/
public SensorPixel inverseLocation(final String sensorName, final GeodeticPoint point,
- final int minLine, final int maxLine)
- throws RuggedException {
+ final int minLine, final int maxLine) {
final LineSensor sensor = getLineSensor(sensorName);
- DumpManager.dumpInverseLocation(sensor, point, minLine, maxLine,
- lightTimeCorrection, aberrationOfLightCorrection);
+ DumpManager.dumpInverseLocation(sensor, point, ellipsoid, minLine, maxLine, lightTimeCorrection,
+ aberrationOfLightCorrection, atmosphericRefraction != null);
final SensorMeanPlaneCrossing planeCrossing = getPlaneCrossing(sensorName, minLine, maxLine);
-
DumpManager.dumpSensorMeanPlane(planeCrossing);
+ if (atmosphericRefraction == null || !atmosphericRefraction.mustBeComputed()) {
+ // Compute inverse location WITHOUT atmospheric refraction
+ return findSensorPixelWithoutAtmosphere(point, sensor, planeCrossing);
+ } else {
+ // Compute inverse location WITH atmospheric refraction
+ return findSensorPixelWithAtmosphere(point, sensor, minLine, maxLine);
+ }
+ }
+
+ /** Apply aberration of light correction (for direct location).
+ * @param spacecraftVelocity spacecraft velocity in inertial frame
+ * @param obsLInert line of sight in inertial frame
+ * @return line of sight with aberration of light correction
+ */
+ private Vector3D applyAberrationOfLightCorrection(final Vector3D obsLInert, final Vector3D spacecraftVelocity) {
+
+ // As the spacecraft velocity is small with respect to speed of light,
+ // we use classical velocity addition and not relativistic velocity addition
+ // we look for a positive k such that: c * lInert + vsat = k * obsLInert
+ // with lInert normalized
+ final double a = obsLInert.getNormSq();
+ final double b = -Vector3D.dotProduct(obsLInert, spacecraftVelocity);
+ final double c = spacecraftVelocity.getNormSq() - Constants.SPEED_OF_LIGHT * Constants.SPEED_OF_LIGHT;
+
+ // a > 0 and c < 0
+ final double s = FastMath.sqrt(b * b - a * c);
+
+ // Only the k > 0 are kept as solutions (the solutions: -(s+b)/a and c/(s-b) are useless)
+ final double k = (b > 0) ? -c / (s + b) : (s - b) / a;
+
+ final Vector3D lInert = new Vector3D( k / Constants.SPEED_OF_LIGHT, obsLInert, -1.0 / Constants.SPEED_OF_LIGHT, spacecraftVelocity);
+ return lInert;
+ }
+
+ /** Compute the DEM intersection with light time correction.
+ * @param date date of the los
+ * @param sensorPosition sensor position in spacecraft frame
+ * @param los los in spacecraft frame
+ * @param scToInert transform for the date from spacecraft to inertial
+ * @param inertToBody transform for the date from inertial to body
+ * @param pInert sensor position in inertial frame
+ * @param lInert line of sight in inertial frame
+ * @return geodetic point with light time correction
+ */
+ private NormalizedGeodeticPoint computeWithLightTimeCorrection(final AbsoluteDate date,
+ final Vector3D sensorPosition, final Vector3D los,
+ final Transform scToInert, final Transform inertToBody,
+ final Vector3D pInert, final Vector3D lInert) {
+
+ // compute the approximate transform between spacecraft and observed body
+ final Transform approximate = new Transform(date, scToInert, inertToBody);
+
+ final Vector3D sL = approximate.transformVector(los);
+ final Vector3D sP = approximate.transformPosition(sensorPosition);
+
+ final Vector3D eP1 = ellipsoid.transform(ellipsoid.pointOnGround(sP, sL, 0.0));
+ final double deltaT1 = eP1.distance(sP) / Constants.SPEED_OF_LIGHT;
+ final Transform shifted1 = inertToBody.shiftedBy(-deltaT1);
+ final NormalizedGeodeticPoint gp1 = algorithm.intersection(ellipsoid,
+ shifted1.transformPosition(pInert),
+ shifted1.transformVector(lInert));
+
+ final Vector3D eP2 = ellipsoid.transform(gp1);
+ final double deltaT2 = eP2.distance(sP) / Constants.SPEED_OF_LIGHT;
+ final Transform shifted2 = inertToBody.shiftedBy(-deltaT2);
+ return algorithm.refineIntersection(ellipsoid,
+ shifted2.transformPosition(pInert),
+ shifted2.transformVector(lInert),
+ gp1);
+ }
+
+ /**
+ * Find the sensor pixel WITHOUT atmospheric refraction correction.
+ * @param point geodetic point to localize
+ * @param sensor the line sensor
+ * @param planeCrossing the sensor mean plane crossing
+ * @return the sensor pixel crossing or null if cannot be found
+ * @since 2.1
+ */
+ private SensorPixel findSensorPixelWithoutAtmosphere(final GeodeticPoint point,
+ final LineSensor sensor, final SensorMeanPlaneCrossing planeCrossing) {
+
// find approximately the sensor line at which ground point crosses sensor mean plane
- final Vector3D target = ellipsoid.transform(point);
+ final Vector3D target = ellipsoid.transform(point);
final SensorMeanPlaneCrossing.CrossingResult crossingResult = planeCrossing.find(target);
if (crossingResult == null) {
// target is out of search interval
@@ -584,10 +628,8 @@ public class Rugged {
final Vector3D lowLOS = sensor.getLOS(crossingResult.getDate(), lowIndex);
final Vector3D highLOS = sensor.getLOS(crossingResult.getDate(), lowIndex + 1);
final Vector3D localZ = Vector3D.crossProduct(lowLOS, highLOS).normalize();
- final double beta = FastMath.acos(Vector3D.dotProduct(crossingResult.getTargetDirection(),
- localZ));
- final double s = Vector3D.dotProduct(crossingResult.getTargetDirectionDerivative(),
- localZ);
+ final double beta = FastMath.acos(Vector3D.dotProduct(crossingResult.getTargetDirection(), localZ));
+ final double s = Vector3D.dotProduct(crossingResult.getTargetDirectionDerivative(), localZ);
final double betaDer = -s / FastMath.sqrt(1 - s * s);
final double deltaL = (0.5 * FastMath.PI - beta) / betaDer;
final double fixedLine = crossingResult.getLine() + deltaL;
@@ -609,8 +651,226 @@ public class Rugged {
final SensorPixel result = new SensorPixel(fixedLine, fixedPixel);
DumpManager.dumpInverseLocationResult(result);
+
return result;
+ }
+ /**
+ * Find the sensor pixel WITH atmospheric refraction correction.
+ * @param point geodetic point to localize
+ * @param sensor the line sensor
+ * @param minLine minimum line number where the search will be performed
+ * @param maxLine maximum line number where the search will be performed
+ * @return the sensor pixel crossing or null if cannot be found
+ * @since 2.1
+ */
+ private SensorPixel findSensorPixelWithAtmosphere(final GeodeticPoint point,
+ final LineSensor sensor, final int minLine, final int maxLine) {
+
+ // TBN: there is no direct way to compute the inverse location.
+ // The method is based on an interpolation grid associated with the fixed point method
+
+ final String sensorName = sensor.getName();
+
+ // Compute a correction grid (at sensor level)
+ // ===========================================
+ // Need to be computed only once for a given sensor (with the same minLine and maxLine)
+ if (atmosphericRefraction.getBifPixel() == null || atmosphericRefraction.getBifLine() == null || // lazy evaluation
+ (!atmosphericRefraction.isSameContext(sensorName, minLine, maxLine))) { // Must be recomputed if the context changed
+
+ // Definition of a regular grid (at sensor level)
+ atmosphericRefraction.configureCorrectionGrid(sensor, minLine, maxLine);
+
+ // Get the grid nodes
+ final int nbPixelGrid = atmosphericRefraction.getComputationParameters().getNbPixelGrid();
+ final int nbLineGrid = atmosphericRefraction.getComputationParameters().getNbLineGrid();
+ final double[] pixelGrid = atmosphericRefraction.getComputationParameters().getUgrid();
+ final double[] lineGrid = atmosphericRefraction.getComputationParameters().getVgrid();
+
+ // Computation, for the sensor grid, of the direct location WITH atmospheric refraction
+ // (full computation)
+ atmosphericRefraction.reactivateComputation();
+ final GeodeticPoint[][] geodeticGridWithAtmosphere = computeDirectLocOnGridWithAtmosphere(pixelGrid, lineGrid, sensor);
+ // pixelGrid and lineGrid are the nodes where the direct loc is computed WITH atmosphere
+
+ // Computation of the inverse location WITHOUT atmospheric refraction for the grid nodes
+ atmosphericRefraction.deactivateComputation();
+ final SensorPixel[][] sensorPixelGridInverseWithout = computeInverseLocOnGridWithoutAtmosphere(geodeticGridWithAtmosphere,
+ nbPixelGrid, nbLineGrid, sensor, minLine, maxLine);
+ atmosphericRefraction.reactivateComputation();
+
+ // Compute the grid correction functions (for pixel and line)
+ atmosphericRefraction.computeGridCorrectionFunctions(sensorPixelGridInverseWithout);
+ }
+
+ // Fixed point method
+ // ==================
+ // Initialization
+ // --------------
+ // Deactivate the dump because no need to keep intermediate computations of inverse loc (can be regenerate)
+ final Boolean wasSuspended = DumpManager.suspend();
+
+ // compute the sensor pixel on the desired ground point WITHOUT atmosphere
+ atmosphericRefraction.deactivateComputation();
+ final SensorPixel sp0 = inverseLocation(sensorName, point, minLine, maxLine);
+ atmosphericRefraction.reactivateComputation();
+ // Reactivate the dump
+ DumpManager.resume(wasSuspended);
+
+ if (sp0 == null) {
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+ // Impossible to find the point in the given min line and max line (without atmosphere)
+ throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, "");
+ }
+
+ // set up the starting point of the fixed point method
+ final double pixel0 = sp0.getPixelNumber();
+ final double line0 = sp0.getLineNumber();
+ // Needed data for the dump
+ sensor.dumpRate(line0);
+
+ // Apply fixed point method until convergence in pixel and line
+ // ------------------------------------------------------------
+ // compute the first (pixel, line) value:
+ // initial sensor pixel value + correction due to atmosphere at this same sensor pixel
+ double corrPixelPrevious = pixel0 + atmosphericRefraction.getBifPixel().value(pixel0, line0);
+ double corrLinePrevious = line0 + atmosphericRefraction.getBifLine().value(pixel0, line0);
+
+ double deltaCorrPixel = Double.POSITIVE_INFINITY;
+ double deltaCorrLine = Double.POSITIVE_INFINITY;
+
+ while (deltaCorrPixel > PIXEL_CV_THRESHOLD && deltaCorrLine > LINE_CV_THRESHOLD) {
+ // Compute the current (pixel, line) value =
+ // initial sensor pixel value + correction due to atmosphere on the previous sensor pixel
+ final double corrPixelCurrent = pixel0 + atmosphericRefraction.getBifPixel().value(corrPixelPrevious, corrLinePrevious);
+ final double corrLineCurrent = line0 + atmosphericRefraction.getBifLine().value(corrPixelPrevious, corrLinePrevious);
+
+ // Compute the delta in pixel and line to check the convergence
+ deltaCorrPixel = FastMath.abs(corrPixelCurrent - corrPixelPrevious);
+ deltaCorrLine = FastMath.abs(corrLineCurrent - corrLinePrevious);
+
+ // Store the (pixel, line) for next loop
+ corrPixelPrevious = corrPixelCurrent;
+ corrLinePrevious = corrLineCurrent;
+ }
+ // The sensor pixel is found !
+ final SensorPixel sensorPixelWithAtmosphere = new SensorPixel(corrLinePrevious, corrPixelPrevious);
+
+ // Dump the found sensorPixel
+ DumpManager.dumpInverseLocationResult(sensorPixelWithAtmosphere);
+
+ return sensorPixelWithAtmosphere;
+ }
+
+ /** Compute the inverse location WITHOUT atmospheric refraction for the geodetic points
+ * associated to the sensor grid nodes.
+ * @param groundGridWithAtmosphere ground grid found for sensor grid nodes with atmosphere
+ * @param nbPixelGrid size of the pixel grid
+ * @param nbLineGrid size of the line grid
+ * @param sensor the line sensor
+ * @param minLine minimum line number where the search will be performed
+ * @param maxLine maximum line number where the search will be performed
+ * @return the sensor pixel grid computed without atmosphere
+ * @since 2.1
+ */
+ private SensorPixel[][] computeInverseLocOnGridWithoutAtmosphere(final GeodeticPoint[][] groundGridWithAtmosphere,
+ final int nbPixelGrid, final int nbLineGrid,
+ final LineSensor sensor, final int minLine, final int maxLine) {
+
+ // Deactivate the dump because no need to keep intermediate computations of inverse loc (can be regenerate)
+ final Boolean wasSuspended = DumpManager.suspend();
+
+ final SensorPixel[][] sensorPixelGrid = new SensorPixel[nbPixelGrid][nbLineGrid];
+ final String sensorName = sensor.getName();
+
+ for (int uIndex = 0; uIndex < nbPixelGrid; uIndex++) {
+ for (int vIndex = 0; vIndex < nbLineGrid; vIndex++) {
+
+ // Check if the geodetic point exists
+ if (groundGridWithAtmosphere[uIndex][vIndex] != null) {
+ final GeodeticPoint groundPoint = groundGridWithAtmosphere[uIndex][vIndex];
+ final double currentLat = groundPoint.getLatitude();
+ final double currentLon = groundPoint.getLongitude();
+
+ try {
+ // Compute the inverse location for the current node
+ sensorPixelGrid[uIndex][vIndex] = inverseLocation(sensorName, currentLat, currentLon, minLine, maxLine);
+
+ } catch (RuggedException re) { // This should never happen
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+ throw new RuggedInternalError(re);
+ }
+
+ // Check if the pixel is inside the sensor (with a margin) OR if the inverse location was impossible (null result)
+ if ((sensorPixelGrid[uIndex][vIndex] != null &&
+ (sensorPixelGrid[uIndex][vIndex].getPixelNumber() < (-INVLOC_MARGIN) ||
+ sensorPixelGrid[uIndex][vIndex].getPixelNumber() > (INVLOC_MARGIN + sensor.getNbPixels() - 1))) ||
+ (sensorPixelGrid[uIndex][vIndex] == null) ) {
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+ // Impossible to find the point in the given min line
+ throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, "");
+ }
+
+ } else { // groundGrid[uIndex][vIndex] == null: impossible to compute inverse loc because ground point not defined
+
+ sensorPixelGrid[uIndex][vIndex] = null;
+
+ } // groundGrid[uIndex][vIndex] != null
+ } // end loop vIndex
+ } // end loop uIndex
+
+ // Reactivate the dump
+ DumpManager.resume(wasSuspended);
+
+ // The sensor grid computed WITHOUT atmospheric refraction correction
+ return sensorPixelGrid;
+ }
+
+ /** Computation, for the sensor pixels grid, of the direct location WITH atmospheric refraction.
+ * (full computation)
+ * @param pixelGrid the pixel grid
+ * @param lineGrid the line grid
+ * @param sensor the line sensor
+ * @return the ground grid computed with atmosphere
+ * @since 2.1
+ */
+ private GeodeticPoint[][] computeDirectLocOnGridWithAtmosphere(final double[] pixelGrid, final double[] lineGrid,
+ final LineSensor sensor) {
+
+ // Deactivate the dump because no need to keep intermediate computations of direct loc (can be regenerate)
+ final Boolean wasSuspended = DumpManager.suspend();
+
+ final int nbPixelGrid = pixelGrid.length;
+ final int nbLineGrid = lineGrid.length;
+ final GeodeticPoint[][] groundGridWithAtmosphere = new GeodeticPoint[nbPixelGrid][nbLineGrid];
+ final Vector3D sensorPosition = sensor.getPosition();
+
+ for (int uIndex = 0; uIndex < nbPixelGrid; uIndex++) {
+ final double pixelNumber = pixelGrid[uIndex];
+ for (int vIndex = 0; vIndex < nbLineGrid; vIndex++) {
+ final double lineNumber = lineGrid[vIndex];
+ final AbsoluteDate date = sensor.getDate(lineNumber);
+ final Vector3D los = sensor.getLOS(date, pixelNumber);
+ try {
+ // Compute the direct location for the current node
+ groundGridWithAtmosphere[uIndex][vIndex] = directLocation(date, sensorPosition, los);
+
+ } catch (RuggedException re) { // This should never happen
+ // In order for the dump to end nicely
+ DumpManager.endNicely();
+ throw new RuggedInternalError(re);
+ }
+ } // end loop vIndex
+ } // end loop uIndex
+
+ // Reactivate the dump
+ DumpManager.resume(wasSuspended);
+
+ // The ground grid computed WITH atmospheric refraction correction
+ return groundGridWithAtmosphere;
}
/** Compute distances between two line sensors.
@@ -622,13 +882,11 @@ public class Rugged {
* @param dateB current date for sensor B
* @param pixelB pixel index for sensor B
* @return distances computed between LOS and to the ground
- * @exception RuggedException if frames cannot be computed at date or if date cannot be handled
* @since 2.0
*/
public double[] distanceBetweenLOS(final LineSensor sensorA, final AbsoluteDate dateA, final double pixelA,
final SpacecraftToObservedBody scToBodyA,
- final LineSensor sensorB, final AbsoluteDate dateB, final double pixelB)
- throws RuggedException {
+ final LineSensor sensorB, final AbsoluteDate dateB, final double pixelB) {
// Compute the approximate transform between spacecraft and observed body
// from Rugged instance A
@@ -695,15 +953,13 @@ public class Rugged {
* @param pixelB pixel index for sensor B
* @param generator generator to use for building {@link DerivativeStructure} instances
* @return distances computed, with derivatives, between LOS and to the ground
- * @exception RuggedException if frames cannot be computed at date
* @see #distanceBetweenLOS(LineSensor, AbsoluteDate, double, SpacecraftToObservedBody, LineSensor, AbsoluteDate, double)
*/
public DerivativeStructure[] distanceBetweenLOSderivatives(
final LineSensor sensorA, final AbsoluteDate dateA, final double pixelA,
final SpacecraftToObservedBody scToBodyA,
final LineSensor sensorB, final AbsoluteDate dateB, final double pixelB,
- final DSGenerator generator)
- throws RuggedException {
+ final DSGenerator generator) {
// Compute the approximate transforms between spacecraft and observed body
// from Rugged instance A
@@ -778,11 +1034,9 @@ public class Rugged {
* @param minLine minimum line number
* @param maxLine maximum line number
* @return mean plane crossing finder
- * @exception RuggedException if sensor is unknown
*/
private SensorMeanPlaneCrossing getPlaneCrossing(final String sensorName,
- final int minLine, final int maxLine)
- throws RuggedException {
+ final int minLine, final int maxLine) {
final LineSensor sensor = getLineSensor(sensorName);
SensorMeanPlaneCrossing planeCrossing = finders.get(sensorName);
@@ -802,15 +1056,12 @@ public class Rugged {
}
return planeCrossing;
-
}
/** Set the mean plane crossing finder for a sensor.
* @param planeCrossing plane crossing finder
- * @exception RuggedException if sensor is unknown
*/
- private void setPlaneCrossing(final SensorMeanPlaneCrossing planeCrossing)
- throws RuggedException {
+ private void setPlaneCrossing(final SensorMeanPlaneCrossing planeCrossing) {
finders.put(planeCrossing.getSensor().getName(), planeCrossing);
}
@@ -822,7 +1073,6 @@ public class Rugged {
* @param generator generator to use for building {@link DerivativeStructure} instances
* @return sensor pixel seeing point with derivatives, or null if point cannot be seen between the
* prescribed line numbers
- * @exception RuggedException if line cannot be localized, or sensor is unknown
* @see #inverseLocation(String, GeodeticPoint, int, int)
* @since 2.0
*/
@@ -831,8 +1081,7 @@ public class Rugged {
final GeodeticPoint point,
final int minLine,
final int maxLine,
- final DSGenerator generator)
- throws RuggedException {
+ final DSGenerator generator) {
final LineSensor sensor = getLineSensor(sensorName);
@@ -891,45 +1140,38 @@ public class Rugged {
return new DerivativeStructure[] {
fixedLine, fixedPixel
};
-
}
/** Get transform from spacecraft to inertial frame.
* @param date date of the transform
* @return transform from spacecraft to inertial frame
- * @exception RuggedException if spacecraft position or attitude cannot be computed at date
*/
- public Transform getScToInertial(final AbsoluteDate date)
- throws RuggedException {
+ public Transform getScToInertial(final AbsoluteDate date) {
return scToBody.getScToInertial(date);
}
/** Get transform from inertial frame to observed body frame.
* @param date date of the transform
* @return transform from inertial frame to observed body frame
- * @exception RuggedException if frames cannot be computed at date
*/
- public Transform getInertialToBody(final AbsoluteDate date)
- throws RuggedException {
+ public Transform getInertialToBody(final AbsoluteDate date) {
return scToBody.getInertialToBody(date);
}
/** Get transform from observed body frame to inertial frame.
* @param date date of the transform
* @return transform from observed body frame to inertial frame
- * @exception RuggedException if frames cannot be computed at date
*/
- public Transform getBodyToInertial(final AbsoluteDate date)
- throws RuggedException {
+ public Transform getBodyToInertial(final AbsoluteDate date) {
return scToBody.getBodyToInertial(date);
}
/** Get a sensor.
* @param sensorName sensor name
* @return selected sensor
- * @exception RuggedException if sensor is not known
*/
- public LineSensor getLineSensor(final String sensorName) throws RuggedException {
+ public LineSensor getLineSensor(final String sensorName) {
+
final LineSensor sensor = sensors.get(sensorName);
if (sensor == null) {
throw new RuggedException(RuggedMessages.UNKNOWN_SENSOR, sensorName);
@@ -944,5 +1186,4 @@ public class Rugged {
public SpacecraftToObservedBody getScToBody() {
return scToBody;
}
-
}
diff --git a/src/main/java/org/orekit/rugged/api/RuggedBuilder.java b/src/main/java/org/orekit/rugged/api/RuggedBuilder.java
index 448cff3c0e58582c734db0959f7ae649a652c2c4..58be9580082ae9bf6860c085655834a0b7b2de15 100644
--- a/src/main/java/org/orekit/rugged/api/RuggedBuilder.java
+++ b/src/main/java/org/orekit/rugged/api/RuggedBuilder.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -29,13 +29,13 @@ import org.hipparchus.exception.LocalizedCoreFormats;
import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
import org.orekit.propagation.Propagator;
import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.BasicScanAlgorithm;
import org.orekit.rugged.intersection.ConstantElevationAlgorithm;
@@ -141,10 +141,10 @@ public class RuggedBuilder {
/** Propagator for position/velocity/attitude. */
private Propagator pvaPropagator;
- /** Step to use for inertial/Earth/spacraft transforms interpolations (s). */
+ /** Step to use for inertial/Earth/spacecraft transforms interpolations (s). */
private double iStep;
- /** Number of points to use for inertial/Earth/spacraft transforms interpolations. */
+ /** Number of points to use for inertial/Earth/spacecraft transforms interpolations. */
private int iN;
/** Converter between spacecraft and body. */
@@ -183,28 +183,22 @@ public class RuggedBuilder {
/** Set the reference ellipsoid.
* @param ellipsoidID reference ellipsoid
* @param bodyRotatingFrameID body rotating frame identifier
- * @exception RuggedException if data needed for some frame cannot be loaded
- * or if trajectory has been {@link #setTrajectoryAndTimeSpan(InputStream) recovered}
* from an earlier run and frames mismatch
* @return the builder instance
* @see #setEllipsoid(OneAxisEllipsoid)
* @see #getEllipsoid()
*/
- public RuggedBuilder setEllipsoid(final EllipsoidId ellipsoidID, final BodyRotatingFrameId bodyRotatingFrameID)
- throws RuggedException {
+ public RuggedBuilder setEllipsoid(final EllipsoidId ellipsoidID, final BodyRotatingFrameId bodyRotatingFrameID) {
return setEllipsoid(selectEllipsoid(ellipsoidID, selectBodyRotatingFrame(bodyRotatingFrameID)));
}
/** Set the reference ellipsoid.
* @param newEllipsoid reference ellipsoid
* @return the builder instance
- * @exception RuggedException if trajectory has been
- * {@link #setTrajectoryAndTimeSpan(InputStream) recovered} from an earlier run and frames mismatch
* @see #setEllipsoid(EllipsoidId, BodyRotatingFrameId)
* @see #getEllipsoid()
*/
- public RuggedBuilder setEllipsoid(final OneAxisEllipsoid newEllipsoid)
- throws RuggedException {
+ public RuggedBuilder setEllipsoid(final OneAxisEllipsoid newEllipsoid) {
this.ellipsoid = new ExtendedEllipsoid(newEllipsoid.getEquatorialRadius(),
newEllipsoid.getFlattening(),
newEllipsoid.getBodyFrame());
@@ -407,7 +401,7 @@ public class RuggedBuilder {
* <em>must</em> be used together with the {@link #setTimeSpan(AbsoluteDate, AbsoluteDate, double, double)}
* but should <em>not</em> be mixed with {@link #setTrajectoryAndTimeSpan(InputStream)}.
* </p>
- * @param inertialFrame inertial frame used for spacecraft positions/velocities/quaternions
+ * @param inertialFrameId inertial frame Id used for spacecraft positions/velocities/quaternions
* @param positionsVelocities satellite position and velocity (m and m/s in inertial frame)
* @param pvInterpolationNumber number of points to use for position/velocity interpolation
* @param pvFilter filter for derivatives from the sample to use in position/velocity interpolation
@@ -415,7 +409,6 @@ public class RuggedBuilder {
* @param aInterpolationNumber number of points to use for attitude interpolation
* @param aFilter filter for derivatives from the sample to use in attitude interpolation
* @return the builder instance
- * @exception RuggedException if data needed for inertial frame cannot be loaded
* @see #setTrajectory(Frame, List, int, CartesianDerivativesFilter, List, int, AngularDerivativesFilter)
* @see #setTrajectory(double, int, CartesianDerivativesFilter, AngularDerivativesFilter, Propagator)
* @see #setTrajectoryAndTimeSpan(InputStream)
@@ -427,13 +420,13 @@ public class RuggedBuilder {
* @see #getAInterpolationNumber()
* @see #getAFilter()
*/
- public RuggedBuilder setTrajectory(final InertialFrameId inertialFrame,
+ public RuggedBuilder setTrajectory(final InertialFrameId inertialFrameId,
final List<TimeStampedPVCoordinates> positionsVelocities, final int pvInterpolationNumber,
final CartesianDerivativesFilter pvFilter,
final List<TimeStampedAngularCoordinates> quaternions, final int aInterpolationNumber,
- final AngularDerivativesFilter aFilter)
- throws RuggedException {
- return setTrajectory(selectInertialFrame(inertialFrame),
+ final AngularDerivativesFilter aFilter) {
+
+ return setTrajectory(selectInertialFrame(inertialFrameId),
positionsVelocities, pvInterpolationNumber, pvFilter,
quaternions, aInterpolationNumber, aFilter);
}
@@ -467,6 +460,7 @@ public class RuggedBuilder {
final CartesianDerivativesFilter pvFilter,
final List<TimeStampedAngularCoordinates> quaternions, final int aInterpolationNumber,
final AngularDerivativesFilter aFilter) {
+
this.inertial = inertialFrame;
this.pvSample = positionsVelocities;
this.pvNeighborsSize = pvInterpolationNumber;
@@ -487,8 +481,8 @@ public class RuggedBuilder {
* <em>must</em> be used together with the {@link #setTimeSpan(AbsoluteDate, AbsoluteDate, double, double)}
* but should <em>not</em> be mixed with {@link #setTrajectoryAndTimeSpan(InputStream)}.
* </p>
- * @param interpolationStep step to use for inertial/Earth/spacraft transforms interpolations (s)
- * @param interpolationNumber number of points to use for inertial/Earth/spacraft transforms interpolations
+ * @param interpolationStep step to use for inertial/Earth/spacecraft transforms interpolations (s)
+ * @param interpolationNumber number of points to use for inertial/Earth/spacecraft transforms interpolations
* @param pvFilter filter for derivatives from the sample to use in position/velocity interpolation
* @param aFilter filter for derivatives from the sample to use in attitude interpolation
* @param propagator global propagator
@@ -581,15 +575,13 @@ public class RuggedBuilder {
* @param storageStream stream from where to read previous instance {@link #storeInterpolator(OutputStream)
* stored interpolator} (caller opened it and remains responsible for closing it)
* @return the builder instance
- * @exception RuggedException if storage stream cannot be parsed
- * or if frames do not match the ones referenced in the storage stream
* @see #setTrajectory(InertialFrameId, List, int, CartesianDerivativesFilter, List, int, AngularDerivativesFilter)
* @see #setTrajectory(Frame, List, int, CartesianDerivativesFilter, List, int, AngularDerivativesFilter)
* @see #setTrajectory(double, int, CartesianDerivativesFilter, AngularDerivativesFilter, Propagator)
* @see #storeInterpolator(OutputStream)
*/
- public RuggedBuilder setTrajectoryAndTimeSpan(final InputStream storageStream)
- throws RuggedException {
+ public RuggedBuilder setTrajectoryAndTimeSpan(final InputStream storageStream) {
+
try {
this.inertial = null;
this.pvSample = null;
@@ -608,6 +600,7 @@ public class RuggedBuilder {
this.overshootTolerance = scToBody.getOvershootTolerance();
checkFramesConsistency();
return this;
+
} catch (ClassNotFoundException cnfe) {
throw new RuggedException(cnfe, RuggedMessages.NOT_INTERPOLATOR_DUMP_DATA);
} catch (ClassCastException cce) {
@@ -630,7 +623,6 @@ public class RuggedBuilder {
* </p>
* @param storageStream stream where to store the interpolator
* (caller opened it and remains responsible for closing it)
- * @exception RuggedException if interpolator cannot be written to stream
* @see #setEllipsoid(EllipsoidId, BodyRotatingFrameId)
* @see #setEllipsoid(OneAxisEllipsoid)
* @see #setTrajectory(InertialFrameId, List, int, CartesianDerivativesFilter, List, int, AngularDerivativesFilter)
@@ -638,7 +630,7 @@ public class RuggedBuilder {
* @see #setTrajectory(double, int, CartesianDerivativesFilter, AngularDerivativesFilter, Propagator)
* @see #setTrajectoryAndTimeSpan(InputStream)
*/
- public void storeInterpolator(final OutputStream storageStream) throws RuggedException {
+ public void storeInterpolator(final OutputStream storageStream) {
try {
createInterpolatorIfNeeded();
new ObjectOutputStream(storageStream).writeObject(scToBody);
@@ -648,23 +640,19 @@ public class RuggedBuilder {
}
/** Check frames consistency.
- * @exception RuggedException if frames have been set both by direct calls and by
- * deserializing an interpolator dump and a mismatch occurs
*/
- private void checkFramesConsistency() throws RuggedException {
+ private void checkFramesConsistency() {
if (ellipsoid != null && scToBody != null &&
!ellipsoid.getBodyFrame().getName().equals(scToBody.getBodyFrame().getName())) {
+ // if frames have been set both by direct calls and by deserializing an interpolator dump and a mismatch occurs
throw new RuggedException(RuggedMessages.FRAMES_MISMATCH_WITH_INTERPOLATOR_DUMP,
ellipsoid.getBodyFrame().getName(), scToBody.getBodyFrame().getName());
}
}
/** Create a transform interpolator if needed.
- * @exception RuggedException if data needed for some frame cannot be loaded or if position
- * or attitude samples do not fully cover the [{@code minDate}, {@code maxDate}] search time span,
- * or propagator fails.
*/
- private void createInterpolatorIfNeeded() throws RuggedException {
+ private void createInterpolatorIfNeeded() {
if (ellipsoid == null) {
throw new RuggedException(RuggedMessages.UNINITIALIZED_CONTEXT, "RuggedBuilder.setEllipsoid()");
@@ -684,7 +672,6 @@ public class RuggedBuilder {
throw new RuggedException(RuggedMessages.UNINITIALIZED_CONTEXT, "RuggedBuilder.setTrajectory()");
}
}
-
}
/** Create a transform interpolator from positions and quaternions lists.
@@ -701,8 +688,6 @@ public class RuggedBuilder {
* @param aInterpolationNumber number of points to use for attitude interpolation
* @param aFilter filter for derivatives from the sample to use in attitude interpolation
* @return transforms interpolator
- * @exception RuggedException if data needed for some frame cannot be loaded or if position
- * or attitude samples do not fully cover the [{@code minDate}, {@code maxDate}] search time span
*/
private static SpacecraftToObservedBody createInterpolator(final Frame inertialFrame, final Frame bodyFrame,
final AbsoluteDate minDate, final AbsoluteDate maxDate,
@@ -712,8 +697,8 @@ public class RuggedBuilder {
final CartesianDerivativesFilter pvFilter,
final List<TimeStampedAngularCoordinates> quaternions,
final int aInterpolationNumber,
- final AngularDerivativesFilter aFilter)
- throws RuggedException {
+ final AngularDerivativesFilter aFilter) {
+
return new SpacecraftToObservedBody(inertialFrame, bodyFrame,
minDate, maxDate, tStep, overshootTolerance,
positionsVelocities, pvInterpolationNumber,
@@ -728,13 +713,12 @@ public class RuggedBuilder {
* @param maxDate end of search time span
* @param tStep step to use for inertial frame to body frame transforms cache computations
* @param overshootTolerance tolerance in seconds allowed for {@code minDate} and {@code maxDate} overshooting
- * @param interpolationStep step to use for inertial/Earth/spacraft transforms interpolations
- * @param interpolationNumber number of points of to use for inertial/Earth/spacraft transforms interpolations
+ * @param interpolationStep step to use for inertial/Earth/spacecraft transforms interpolations
+ * @param interpolationNumber number of points of to use for inertial/Earth/spacecraft transforms interpolations
* @param pvFilter filter for derivatives from the sample to use in position/velocity interpolation
* @param aFilter filter for derivatives from the sample to use in attitude interpolation
* @param propagator global propagator
* @return transforms interpolator
- * @exception RuggedException if data needed for some frame cannot be loaded
*/
private static SpacecraftToObservedBody createInterpolator(final Frame inertialFrame, final Frame bodyFrame,
final AbsoluteDate minDate, final AbsoluteDate maxDate,
@@ -742,41 +726,34 @@ public class RuggedBuilder {
final double interpolationStep, final int interpolationNumber,
final CartesianDerivativesFilter pvFilter,
final AngularDerivativesFilter aFilter,
- final Propagator propagator)
- throws RuggedException {
- try {
+ final Propagator propagator) {
+
+ // extract position/attitude samples from propagator
+ final List<TimeStampedPVCoordinates> positionsVelocities =
+ new ArrayList<TimeStampedPVCoordinates>();
+ final List<TimeStampedAngularCoordinates> quaternions =
+ new ArrayList<TimeStampedAngularCoordinates>();
+ propagator.setMasterMode(interpolationStep, new OrekitFixedStepHandler() {
+
+ /** {@inheritDoc} */
+ @Override
+ public void handleStep(final SpacecraftState currentState, final boolean isLast) {
+ final AbsoluteDate date = currentState.getDate();
+ final PVCoordinates pv = currentState.getPVCoordinates(inertialFrame);
+ final Rotation q = currentState.getAttitude().getRotation();
+ positionsVelocities.add(new TimeStampedPVCoordinates(date, pv.getPosition(), pv.getVelocity(), Vector3D.ZERO));
+ quaternions.add(new TimeStampedAngularCoordinates(date, q, Vector3D.ZERO, Vector3D.ZERO));
+ }
- // extract position/attitude samples from propagator
- final List<TimeStampedPVCoordinates> positionsVelocities =
- new ArrayList<TimeStampedPVCoordinates>();
- final List<TimeStampedAngularCoordinates> quaternions =
- new ArrayList<TimeStampedAngularCoordinates>();
- propagator.setMasterMode(interpolationStep, new OrekitFixedStepHandler() {
-
- /** {@inheritDoc} */
- @Override
- public void handleStep(final SpacecraftState currentState, final boolean isLast)
- throws OrekitException {
- final AbsoluteDate date = currentState.getDate();
- final PVCoordinates pv = currentState.getPVCoordinates(inertialFrame);
- final Rotation q = currentState.getAttitude().getRotation();
- positionsVelocities.add(new TimeStampedPVCoordinates(date, pv.getPosition(), pv.getVelocity(), Vector3D.ZERO));
- quaternions.add(new TimeStampedAngularCoordinates(date, q, Vector3D.ZERO, Vector3D.ZERO));
- }
-
- });
- propagator.propagate(minDate.shiftedBy(-interpolationStep), maxDate.shiftedBy(interpolationStep));
-
- // orbit/attitude to body converter
- return createInterpolator(inertialFrame, bodyFrame,
- minDate, maxDate, tStep, overshootTolerance,
- positionsVelocities, interpolationNumber,
- pvFilter, quaternions, interpolationNumber,
- aFilter);
-
- } catch (OrekitException pe) {
- throw new RuggedException(pe, pe.getSpecifier(), pe.getParts());
- }
+ });
+ propagator.propagate(minDate.shiftedBy(-interpolationStep), maxDate.shiftedBy(interpolationStep));
+
+ // orbit/attitude to body converter
+ return createInterpolator(inertialFrame, bodyFrame,
+ minDate, maxDate, tStep, overshootTolerance,
+ positionsVelocities, interpolationNumber,
+ pvFilter, quaternions, interpolationNumber,
+ aFilter);
}
/** Set flag for light time correction.
@@ -890,59 +867,45 @@ public class RuggedBuilder {
/** Select inertial frame.
* @param inertialFrameId inertial frame identifier
* @return inertial frame
- * @exception RuggedException if data needed for some frame cannot be loaded
*/
- private static Frame selectInertialFrame(final InertialFrameId inertialFrameId)
- throws RuggedException {
-
- try {
- // set up the inertial frame
- switch (inertialFrameId) {
- case GCRF :
- return FramesFactory.getGCRF();
- case EME2000 :
- return FramesFactory.getEME2000();
- case MOD :
- return FramesFactory.getMOD(IERSConventions.IERS_1996);
- case TOD :
- return FramesFactory.getTOD(IERSConventions.IERS_1996, true);
- case VEIS1950 :
- return FramesFactory.getVeis1950();
- default :
- // this should never happen
- throw RuggedException.createInternalError(null);
- }
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts().clone());
+ private static Frame selectInertialFrame(final InertialFrameId inertialFrameId) {
+
+ // set up the inertial frame
+ switch (inertialFrameId) {
+ case GCRF :
+ return FramesFactory.getGCRF();
+ case EME2000 :
+ return FramesFactory.getEME2000();
+ case MOD :
+ return FramesFactory.getMOD(IERSConventions.IERS_1996);
+ case TOD :
+ return FramesFactory.getTOD(IERSConventions.IERS_1996, true);
+ case VEIS1950 :
+ return FramesFactory.getVeis1950();
+ default :
+ // this should never happen
+ throw new RuggedInternalError(null);
}
-
}
/** Select body rotating frame.
* @param bodyRotatingFrame body rotating frame identifier
* @return body rotating frame
- * @exception RuggedException if data needed for some frame cannot be loaded
*/
- private static Frame selectBodyRotatingFrame(final BodyRotatingFrameId bodyRotatingFrame)
- throws RuggedException {
+ private static Frame selectBodyRotatingFrame(final BodyRotatingFrameId bodyRotatingFrame) {
- try {
- // set up the rotating frame
- switch (bodyRotatingFrame) {
- case ITRF :
- return FramesFactory.getITRF(IERSConventions.IERS_2010, true);
- case ITRF_EQUINOX :
- return FramesFactory.getITRFEquinox(IERSConventions.IERS_1996, true);
- case GTOD :
- return FramesFactory.getGTOD(IERSConventions.IERS_1996, true);
- default :
- // this should never happen
- throw RuggedException.createInternalError(null);
- }
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts().clone());
+ // set up the rotating frame
+ switch (bodyRotatingFrame) {
+ case ITRF :
+ return FramesFactory.getITRF(IERSConventions.IERS_2010, true);
+ case ITRF_EQUINOX :
+ return FramesFactory.getITRFEquinox(IERSConventions.IERS_1996, true);
+ case GTOD :
+ return FramesFactory.getGTOD(IERSConventions.IERS_1996, true);
+ default :
+ // this should never happen
+ throw new RuggedInternalError(null);
}
-
}
/** Select ellipsoid.
@@ -966,7 +929,7 @@ public class RuggedBuilder {
return new OneAxisEllipsoid(6378136.6, 1.0 / 298.25642, bodyFrame);
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
@@ -996,17 +959,15 @@ public class RuggedBuilder {
return new IgnoreDEMAlgorithm();
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
-
}
/** Build a {@link Rugged} instance.
* @return built instance
- * @exception RuggedException if the builder is not properly configured
- * or if some internal elements cannot be built (frames, ephemerides, ...)
*/
- public Rugged build() throws RuggedException {
+ public Rugged build() {
+
if (algorithmID == null) {
throw new RuggedException(RuggedMessages.UNINITIALIZED_CONTEXT, "RuggedBuilder.setAlgorithmID()");
}
@@ -1022,7 +983,5 @@ public class RuggedBuilder {
createInterpolatorIfNeeded();
return new Rugged(createAlgorithm(algorithmID, tileUpdater, maxCachedTiles, constantElevation), ellipsoid,
lightTimeCorrection, aberrationOfLightCorrection, atmosphericRefraction, scToBody, sensors, name);
-
}
-
}
diff --git a/src/main/java/org/orekit/rugged/errors/Dump.java b/src/main/java/org/orekit/rugged/errors/Dump.java
index 13a7b36827913854a7d24045224c9838650cd329..109ee3568b4aece6620e5d7261753b3a40aca0cd 100644
--- a/src/main/java/org/orekit/rugged/errors/Dump.java
+++ b/src/main/java/org/orekit/rugged/errors/Dump.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -31,7 +31,6 @@ import org.hipparchus.util.FastMath;
import org.hipparchus.util.OpenIntToDoubleHashMap;
import org.hipparchus.util.Pair;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.FactoryManagedFrame;
import org.orekit.frames.Frame;
import org.orekit.frames.Transform;
@@ -49,6 +48,7 @@ import org.orekit.time.TimeScalesFactory;
/**
* Dump data class.
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
class Dump {
@@ -145,35 +145,33 @@ class Dump {
/** Dump a direct location computation.
* @param date date of the location
- * @param position pixel position in spacecraft frame
+ * @param sensorPosition sensor position in spacecraft frame
* @param los normalized line-of-sight in spacecraft frame
* @param lightTimeCorrection flag for light time correction
* @param aberrationOfLightCorrection flag for aberration of light correction
* @param refractionCorrection flag for refraction correction
- * @exception RuggedException if date cannot be converted to UTC
*/
- public void dumpDirectLocation(final AbsoluteDate date, final Vector3D position, final Vector3D los,
+ public void dumpDirectLocation(final AbsoluteDate date, final Vector3D sensorPosition, final Vector3D los,
final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection,
- final boolean refractionCorrection)
- throws RuggedException {
+ final boolean refractionCorrection) {
writer.format(Locale.US,
"direct location: date %s position %22.15e %22.15e %22.15e los %22.15e %22.15e %22.15e lightTime %b aberration %b refraction %b %n",
convertDate(date),
- position.getX(), position.getY(), position.getZ(),
+ sensorPosition.getX(), sensorPosition.getY(), sensorPosition.getZ(),
los.getX(), los.getY(), los.getZ(),
lightTimeCorrection, aberrationOfLightCorrection, refractionCorrection);
}
/** Dump a direct location result.
* @param gp resulting geodetic point
- * @exception RuggedException if date cannot be converted to UTC
*/
- public void dumpDirectLocationResult(final GeodeticPoint gp)
- throws RuggedException {
+ public void dumpDirectLocationResult(final GeodeticPoint gp) {
if (gp != null) {
writer.format(Locale.US,
"direct location result: latitude %22.15e longitude %22.15e elevation %22.15e%n",
gp.getLatitude(), gp.getLongitude(), gp.getAltitude());
+ } else {
+ writer.format(Locale.US, "direct location result: NULL");
}
}
@@ -184,17 +182,19 @@ class Dump {
* @param maxLine maximum line number
* @param lightTimeCorrection flag for light time correction
* @param aberrationOfLightCorrection flag for aberration of light correction
+ * @param refractionCorrection flag for refraction correction
*/
public void dumpInverseLocation(final LineSensor sensor, final GeodeticPoint point,
final int minLine, final int maxLine,
- final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection) {
+ final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection,
+ final boolean refractionCorrection) {
final DumpedSensorData ds = getSensorData(sensor);
writer.format(Locale.US,
- "inverse location: sensorName %s latitude %22.15e longitude %22.15e elevation %22.15e minLine %d maxLine %d lightTime %b aberration %b%n",
+ "inverse location: sensorName %s latitude %22.15e longitude %22.15e elevation %22.15e minLine %d maxLine %d lightTime %b aberration %b refraction %b %n",
ds.getDumpName(),
point.getLatitude(), point.getLongitude(), point.getAltitude(),
minLine, maxLine,
- lightTimeCorrection, aberrationOfLightCorrection);
+ lightTimeCorrection, aberrationOfLightCorrection, refractionCorrection);
}
/** Dump an inverse location result.
@@ -205,6 +205,8 @@ class Dump {
writer.format(Locale.US,
"inverse location result: lineNumber %22.15e pixelNumber %22.15e%n",
pixel.getLineNumber(), pixel.getPixelNumber());
+ } else {
+ writer.format(Locale.US, "inverse location result: NULL");
}
}
@@ -213,11 +215,9 @@ class Dump {
* @param index index of the transform
* @param bodyToInertial transform from body frame to inertial frame
* @param scToInertial transfrom from spacecraft frame to inertial frame
- * @exception RuggedException if reference date cannot be converted to UTC
*/
public void dumpTransform(final SpacecraftToObservedBody scToBody, final int index,
- final Transform bodyToInertial, final Transform scToInertial)
- throws RuggedException {
+ final Transform bodyToInertial, final Transform scToInertial) {
if (tranformsDumped == null) {
final AbsoluteDate minDate = scToBody.getMinDate();
final AbsoluteDate maxDate = scToBody.getMaxDate();
@@ -243,10 +243,8 @@ class Dump {
/** Dump a sensor mean plane.
* @param meanPlane mean plane associated with sensor
- * @exception RuggedException if some frames cannot be computed at mid date
*/
- public void dumpSensorMeanPlane(final SensorMeanPlaneCrossing meanPlane)
- throws RuggedException {
+ public void dumpSensorMeanPlane(final SensorMeanPlaneCrossing meanPlane) {
getSensorData(meanPlane.getSensor()).setMeanPlane(meanPlane);
}
@@ -255,10 +253,8 @@ class Dump {
* @param date date
* @param i pixel index
* @param los pixel normalized line-of-sight
- * @exception RuggedException if date cannot be converted to UTC
*/
- public void dumpSensorLOS(final LineSensor sensor, final AbsoluteDate date, final int i, final Vector3D los)
- throws RuggedException {
+ public void dumpSensorLOS(final LineSensor sensor, final AbsoluteDate date, final int i, final Vector3D los) {
getSensorData(sensor).setLOS(date, i, los);
}
@@ -266,10 +262,8 @@ class Dump {
* @param sensor sensor
* @param lineNumber line number
* @param date date
- * @exception RuggedException if date cannot be converted to UTC
*/
- public void dumpSensorDatation(final LineSensor sensor, final double lineNumber, final AbsoluteDate date)
- throws RuggedException {
+ public void dumpSensorDatation(final LineSensor sensor, final double lineNumber, final AbsoluteDate date) {
getSensorData(sensor).setDatation(lineNumber, date);
}
@@ -345,18 +339,12 @@ class Dump {
/** Convert a date to string with high accuracy.
* @param date computation date
* @return converted date
- * @exception RuggedException if date cannot be converted to UTC
*/
- private String convertDate(final AbsoluteDate date)
- throws RuggedException {
- try {
- final DateTimeComponents dt = date.getComponents(TimeScalesFactory.getUTC());
- return String.format(Locale.US, "%04d-%02d-%02dT%02d:%02d:%017.14fZ",
- dt.getDate().getYear(), dt.getDate().getMonth(), dt.getDate().getDay(),
- dt.getTime().getHour(), dt.getTime().getMinute(), dt.getTime().getSecond());
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
+ private String convertDate(final AbsoluteDate date) {
+ final DateTimeComponents dt = date.getComponents(TimeScalesFactory.getUTC());
+ return String.format(Locale.US, "%04d-%02d-%02dT%02d:%02d:%017.14fZ",
+ dt.getDate().getYear(), dt.getDate().getMonth(), dt.getDate().getDay(),
+ dt.getTime().getHour(), dt.getTime().getMinute(), dt.getTime().getSecond());
}
/** Convert a translation to string.
@@ -498,46 +486,41 @@ class Dump {
/** Set the mean plane finder.
* @param meanPlane mean plane finder
- * @exception RuggedException if frames cannot be computed at mid date
*/
- public void setMeanPlane(final SensorMeanPlaneCrossing meanPlane) throws RuggedException {
- try {
- if (this.meanPlane == null) {
- this.meanPlane = meanPlane;
- final long nbResults = meanPlane.getCachedResults().count();
- writer.format(Locale.US,
- "sensor mean plane: sensorName %s minLine %d maxLine %d maxEval %d accuracy %22.15e normal %22.15e %22.15e %22.15e cachedResults %d",
- dumpName,
- meanPlane.getMinLine(), meanPlane.getMaxLine(),
- meanPlane.getMaxEval(), meanPlane.getAccuracy(),
- meanPlane.getMeanPlaneNormal().getX(), meanPlane.getMeanPlaneNormal().getY(), meanPlane.getMeanPlaneNormal().getZ(),
- nbResults);
- meanPlane.getCachedResults().forEach(result -> {
- try {
- writer.format(Locale.US,
- " lineNumber %22.15e date %s target %22.15e %22.15e %22.15e targetDirection %22.15e %22.15e %22.15e %22.15e %22.15e %22.15e",
- result.getLine(), convertDate(result.getDate()),
- result.getTarget().getX(), result.getTarget().getY(), result.getTarget().getZ(),
- result.getTargetDirection().getX(),
- result.getTargetDirection().getY(),
- result.getTargetDirection().getZ(),
- result.getTargetDirectionDerivative().getZ(),
- result.getTargetDirectionDerivative().getY(),
- result.getTargetDirectionDerivative().getZ());
- } catch (RuggedException re) {
- throw new RuggedExceptionWrapper(re);
- }
- });
- writer.format(Locale.US, "%n");
-
- // ensure the transforms for mid date are dumped
- final AbsoluteDate midDate = meanPlane.getSensor().getDate(0.5 * (meanPlane.getMinLine() + meanPlane.getMaxLine()));
- meanPlane.getScToBody().getBodyToInertial(midDate);
- meanPlane.getScToBody().getScToInertial(midDate);
+ public void setMeanPlane(final SensorMeanPlaneCrossing meanPlane) {
- }
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
+ if (this.meanPlane == null) {
+ this.meanPlane = meanPlane;
+ final long nbResults = meanPlane.getCachedResults().count();
+ writer.format(Locale.US,
+ "sensor mean plane: sensorName %s minLine %d maxLine %d maxEval %d accuracy %22.15e normal %22.15e %22.15e %22.15e cachedResults %d",
+ dumpName,
+ meanPlane.getMinLine(), meanPlane.getMaxLine(),
+ meanPlane.getMaxEval(), meanPlane.getAccuracy(),
+ meanPlane.getMeanPlaneNormal().getX(), meanPlane.getMeanPlaneNormal().getY(), meanPlane.getMeanPlaneNormal().getZ(),
+ nbResults);
+ meanPlane.getCachedResults().forEach(result -> {
+ try {
+ writer.format(Locale.US,
+ " lineNumber %22.15e date %s target %22.15e %22.15e %22.15e targetDirection %22.15e %22.15e %22.15e %22.15e %22.15e %22.15e",
+ result.getLine(), convertDate(result.getDate()),
+ result.getTarget().getX(), result.getTarget().getY(), result.getTarget().getZ(),
+ result.getTargetDirection().getX(),
+ result.getTargetDirection().getY(),
+ result.getTargetDirection().getZ(),
+ result.getTargetDirectionDerivative().getZ(),
+ result.getTargetDirectionDerivative().getY(),
+ result.getTargetDirectionDerivative().getZ());
+ } catch (RuggedException re) {
+ throw new RuggedInternalError(re);
+ }
+ });
+ writer.format(Locale.US, "%n");
+
+ // ensure the transforms for mid date are dumped
+ final AbsoluteDate midDate = meanPlane.getSensor().getDate(0.5 * (meanPlane.getMinLine() + meanPlane.getMaxLine()));
+ meanPlane.getScToBody().getBodyToInertial(midDate);
+ meanPlane.getScToBody().getScToInertial(midDate);
}
}
@@ -545,10 +528,8 @@ class Dump {
* @param date date
* @param pixelNumber number of the pixel
* @param los los direction
- * @exception RuggedException if date cannot be converted to UTC
*/
- public void setLOS(final AbsoluteDate date, final int pixelNumber, final Vector3D los)
- throws RuggedException {
+ public void setLOS(final AbsoluteDate date, final int pixelNumber, final Vector3D los) {
List<Pair<AbsoluteDate, Vector3D>> list = losMap.get(pixelNumber);
if (list == null) {
list = new ArrayList<Pair<AbsoluteDate, Vector3D>>();
@@ -569,10 +550,8 @@ class Dump {
/** Set a datation pair.
* @param lineNumber line number
* @param date date
- * @exception RuggedException if date cannot be converted to UTC
*/
- public void setDatation(final double lineNumber, final AbsoluteDate date)
- throws RuggedException {
+ public void setDatation(final double lineNumber, final AbsoluteDate date) {
for (final Pair<Double, AbsoluteDate> alreadyDumped : datation) {
if (FastMath.abs(date.durationFrom(alreadyDumped.getSecond())) < 1.0e-12 &&
FastMath.abs(lineNumber - alreadyDumped.getFirst()) < 1.0e-12) {
diff --git a/src/main/java/org/orekit/rugged/errors/DumpManager.java b/src/main/java/org/orekit/rugged/errors/DumpManager.java
index 8c466f590afcde7cc5406a2896a53b7539e1f293..7fc33bf5bd552e4597739f08aa56f52209fbd767 100644
--- a/src/main/java/org/orekit/rugged/errors/DumpManager.java
+++ b/src/main/java/org/orekit/rugged/errors/DumpManager.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -42,12 +42,16 @@ import org.orekit.time.AbsoluteDate;
* time, so user code should not rely on it.
* </p>
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public class DumpManager {
/** Dump file (default initial value is null, i.e. nothing is dumped). */
private static final ThreadLocal<Dump> DUMP = new ThreadLocal<Dump>();
+ /** Boolean to check if the dump is suspended. */
+ private static boolean isSuspended = false;
+
/** Private constructor for utility class.
*/
private DumpManager() {
@@ -56,10 +60,8 @@ public class DumpManager {
/** Activate debug dump.
* @param file dump file
- * @exception RuggedException if debug dump is already active for this thread
- * or if debug file cannot be opened
*/
- public static void activate(final File file) throws RuggedException {
+ public static void activate(final File file) {
if (isActive()) {
throw new RuggedException(RuggedMessages.DEBUG_DUMP_ALREADY_ACTIVE);
} else {
@@ -73,9 +75,8 @@ public class DumpManager {
}
/** Deactivate debug dump.
- * @exception RuggedException if debug dump is already active for this thread
*/
- public static void deactivate() throws RuggedException {
+ public static void deactivate() {
if (isActive()) {
DUMP.get().deactivate();
DUMP.set(null);
@@ -84,11 +85,44 @@ public class DumpManager {
}
}
+ /** Suspend the dump.
+ * In case the dump is already suspended, keep the previous status in order to
+ * correctly deal the resume stage.
+ * @return a flag to tell if the dump is already suspended (true; false otherwise)
+ */
+ public static Boolean suspend() {
+ // Check if the dump is already suspended
+ if (isSuspended) {
+ return isSuspended;
+ } else {
+ isSuspended = true;
+ return false;
+ }
+ }
+
+ /** Resume the dump, only if it was not already suspended.
+ * @param wasSuspended flag to tell if the dump was already suspended (true; false otherwise)
+ */
+ public static void resume(final Boolean wasSuspended) {
+ if (!wasSuspended) {
+ isSuspended = false;
+ }
+ }
+
+ /** In case dump is suspended and an exception is thrown,
+ * allows the dump to end nicely.
+ */
+ public static void endNicely() {
+ isSuspended = false;
+ if (isActive()) deactivate();
+
+ }
+
/** Check if dump is active for this thread.
* @return true if dump is active for this thread
*/
public static boolean isActive() {
- return DUMP.get() != null;
+ return DUMP.get() != null && !isSuspended;
}
/** Dump DEM cell data.
@@ -135,29 +169,25 @@ public class DumpManager {
/** Dump a direct location computation.
* @param date date of the location
- * @param position pixel position in spacecraft frame
+ * @param sensorPosition sensor position in spacecraft frame
* @param los normalized line-of-sight in spacecraft frame
* @param lightTimeCorrection flag for light time correction
* @param aberrationOfLightCorrection flag for aberration of light correction
* @param refractionCorrection flag for refraction correction
- * @exception RuggedException if date cannot be converted to UTC
*/
- public static void dumpDirectLocation(final AbsoluteDate date, final Vector3D position, final Vector3D los,
+ public static void dumpDirectLocation(final AbsoluteDate date, final Vector3D sensorPosition, final Vector3D los,
final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection,
- final boolean refractionCorrection)
- throws RuggedException {
+ final boolean refractionCorrection) {
if (isActive()) {
- DUMP.get().dumpDirectLocation(date, position, los, lightTimeCorrection, aberrationOfLightCorrection,
- refractionCorrection);
+ DUMP.get().dumpDirectLocation(date, sensorPosition, los, lightTimeCorrection, aberrationOfLightCorrection,
+ refractionCorrection);
}
}
/** Dump a direct location result.
* @param gp resulting geodetic point
- * @exception RuggedException if date cannot be converted to UTC
*/
- public static void dumpDirectLocationResult(final GeodeticPoint gp)
- throws RuggedException {
+ public static void dumpDirectLocationResult(final GeodeticPoint gp) {
if (isActive()) {
DUMP.get().dumpDirectLocationResult(gp);
}
@@ -166,17 +196,22 @@ public class DumpManager {
/** Dump an inverse location computation.
* @param sensor sensor
* @param point point to localize
+ * @param ellipsoid the used ellipsoid
* @param minLine minimum line number
* @param maxLine maximum line number
* @param lightTimeCorrection flag for light time correction
* @param aberrationOfLightCorrection flag for aberration of light correction
+ * @param refractionCorrection flag for refraction correction
*/
public static void dumpInverseLocation(final LineSensor sensor, final GeodeticPoint point,
+ final ExtendedEllipsoid ellipsoid,
final int minLine, final int maxLine,
- final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection) {
+ final boolean lightTimeCorrection, final boolean aberrationOfLightCorrection,
+ final boolean refractionCorrection) {
if (isActive()) {
DUMP.get().dumpInverseLocation(sensor, point, minLine, maxLine,
- lightTimeCorrection, aberrationOfLightCorrection);
+ lightTimeCorrection, aberrationOfLightCorrection, refractionCorrection);
+ DUMP.get().dumpEllipsoid(ellipsoid);
}
}
@@ -194,11 +229,9 @@ public class DumpManager {
* @param index index of the transform
* @param bodyToInertial transform from body frame to inertial frame
* @param scToInertial transfrom from spacecraft frame to inertial frame
- * @exception RuggedException if reference date cannot be converted to UTC
*/
public static void dumpTransform(final SpacecraftToObservedBody scToBody, final int index,
- final Transform bodyToInertial, final Transform scToInertial)
- throws RuggedException {
+ final Transform bodyToInertial, final Transform scToInertial) {
if (isActive()) {
DUMP.get().dumpTransform(scToBody, index, bodyToInertial, scToInertial);
}
@@ -206,10 +239,8 @@ public class DumpManager {
/** Dump a sensor mean plane.
* @param meanPlane mean plane associated with sensor
- * @exception RuggedException if some frames cannot be computed at mid date
*/
- public static void dumpSensorMeanPlane(final SensorMeanPlaneCrossing meanPlane)
- throws RuggedException {
+ public static void dumpSensorMeanPlane(final SensorMeanPlaneCrossing meanPlane) {
if (isActive()) {
DUMP.get().dumpSensorMeanPlane(meanPlane);
}
@@ -220,10 +251,8 @@ public class DumpManager {
* @param date date
* @param i pixel index
* @param los pixel normalized line-of-sight
- * @exception RuggedException if date cannot be converted to UTC
*/
- public static void dumpSensorLOS(final LineSensor sensor, final AbsoluteDate date, final int i, final Vector3D los)
- throws RuggedException {
+ public static void dumpSensorLOS(final LineSensor sensor, final AbsoluteDate date, final int i, final Vector3D los) {
if (isActive()) {
DUMP.get().dumpSensorLOS(sensor, date, i, los);
}
@@ -233,10 +262,8 @@ public class DumpManager {
* @param sensor sensor
* @param lineNumber line number
* @param date date
- * @exception RuggedException if date cannot be converted to UTC
*/
- public static void dumpSensorDatation(final LineSensor sensor, final double lineNumber, final AbsoluteDate date)
- throws RuggedException {
+ public static void dumpSensorDatation(final LineSensor sensor, final double lineNumber, final AbsoluteDate date) {
if (isActive()) {
DUMP.get().dumpSensorDatation(sensor, lineNumber, date);
}
diff --git a/src/main/java/org/orekit/rugged/errors/DumpReplayer.java b/src/main/java/org/orekit/rugged/errors/DumpReplayer.java
index cb7f67188269c2790134c3403c8d4d8916656ad2..4d24e5467090362030a057ac2bf13a68a918bd0d 100644
--- a/src/main/java/org/orekit/rugged/errors/DumpReplayer.java
+++ b/src/main/java/org/orekit/rugged/errors/DumpReplayer.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -45,7 +45,6 @@ import org.hipparchus.util.OpenIntToDoubleHashMap;
import org.hipparchus.util.Pair;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
import org.orekit.frames.Predefined;
@@ -61,7 +60,10 @@ import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.UpdatableTile;
+import org.orekit.rugged.refraction.AtmosphericRefraction;
+import org.orekit.rugged.refraction.MultiLayerModel;
import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScalesFactory;
@@ -111,6 +113,9 @@ public class DumpReplayer {
/** Keyword for aberration of light correction fields. */
private static final String ABERRATION = "aberration";
+ /** Keyword for atmospheric refraction correction fields. */
+ private static final String REFRACTION = "refraction";
+
/** Keyword for min date fields. */
private static final String MIN_DATE = "minDate";
@@ -216,6 +221,9 @@ public class DumpReplayer {
/** Keyword for target direction. */
private static final String TARGET_DIRECTION = "targetDirection";
+ /** Keyword for null result. */
+ private static final String NULL_RESULT = "NULL";
+
/** Constant elevation for constant elevation algorithm. */
private double constantElevation;
@@ -258,6 +266,9 @@ public class DumpReplayer {
/** Flag for aberration of light correction. */
private boolean aberrationOfLightCorrection;
+ /** Flag for atmospheric refraction. */
+ private boolean atmosphericRefraction;
+
/** Dumped calls. */
private final List<DumpedCall> calls;
@@ -271,9 +282,8 @@ public class DumpReplayer {
/** Parse a dump file.
* @param file dump file to parse
- * @exception RuggedException if file cannot be parsed
*/
- public void parse(final File file) throws RuggedException {
+ public void parse(final File file) {
try {
final BufferedReader reader =
new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
@@ -289,9 +299,8 @@ public class DumpReplayer {
/** Create a Rugged instance from parsed data.
* @return rugged instance
- * @exception RuggedException if some data are inconsistent or incomplete
*/
- public Rugged createRugged() throws RuggedException {
+ public Rugged createRugged() {
try {
final RuggedBuilder builder = new RuggedBuilder();
@@ -306,8 +315,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void updateTile(final double latitude, final double longitude, final UpdatableTile tile)
- throws RuggedException {
+ public void updateTile(final double latitude, final double longitude, final UpdatableTile tile) {
for (final ParsedTile parsedTile : tiles) {
if (parsedTile.isInterpolable(latitude, longitude)) {
parsedTile.updateTile(tile);
@@ -317,14 +325,20 @@ public class DumpReplayer {
throw new RuggedException(RuggedMessages.NO_DEM_DATA,
FastMath.toDegrees(latitude), FastMath.toDegrees(longitude));
}
-
}, 8);
}
+ builder.setEllipsoid(ellipsoid);
+
builder.setLightTimeCorrection(lightTimeCorrection);
builder.setAberrationOfLightCorrection(aberrationOfLightCorrection);
+ if (atmosphericRefraction) { // Use the default model with the default configuration values
+ final ExtendedEllipsoid extendedEllipsoid = builder.getEllipsoid();
+ final AtmosphericRefraction atmosphericModel = new MultiLayerModel(extendedEllipsoid);
+ // Build Rugged with atmospheric refraction model
+ builder.setRefractionCorrection(atmosphericModel);
+ }
- builder.setEllipsoid(ellipsoid);
// build missing transforms by extrapolating the parsed ones
final int n = (int) FastMath.ceil(maxDate.durationFrom(minDate) / tStep);
@@ -397,21 +411,20 @@ public class DumpReplayer {
throw new RuggedException(ioe, LocalizedCoreFormats.SIMPLE_MESSAGE, ioe.getLocalizedMessage());
} catch (SecurityException e) {
// this should never happen
- throw RuggedException.createInternalError(e);
+ throw new RuggedInternalError(e);
} catch (NoSuchMethodException e) {
// this should never happen
- throw RuggedException.createInternalError(e);
+ throw new RuggedInternalError(e);
} catch (IllegalArgumentException e) {
// this should never happen
- throw RuggedException.createInternalError(e);
+ throw new RuggedInternalError(e);
} catch (IllegalAccessException e) {
// this should never happen
- throw RuggedException.createInternalError(e);
+ throw new RuggedInternalError(e);
} catch (InvocationTargetException e) {
// this should never happen
- throw RuggedException.createInternalError(e);
+ throw new RuggedInternalError(e);
}
-
}
/** Get a sensor by name.
@@ -436,9 +449,8 @@ public class DumpReplayer {
* </p>
* @param rugged Rugged instance on which calls will be performed
* @return results of all dumped calls
- * @exception RuggedException if a call fails
*/
- public Result[] execute(final Rugged rugged) throws RuggedException {
+ public Result[] execute(final Rugged rugged) {
final Result[] results = new Result[calls.size()];
for (int i = 0; i < calls.size(); ++i) {
results[i] = new Result(calls.get(i).expected,
@@ -489,8 +501,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
try {
if (fields.length < 1) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
@@ -514,8 +525,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
if (fields.length < 6 || !fields[0].equals(AE) || !fields[2].equals(F) || !fields[4].equals(FRAME)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
}
@@ -524,8 +534,6 @@ public class DumpReplayer {
final Frame bodyFrame;
try {
bodyFrame = FramesFactory.getFrame(Predefined.valueOf(fields[5]));
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
} catch (IllegalArgumentException iae) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
}
@@ -539,49 +547,49 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- try {
- if (fields.length < 14 ||
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length < 16 ||
!fields[0].equals(DATE) ||
!fields[2].equals(POSITION) || !fields[6].equals(LOS) ||
- !fields[10].equals(LIGHT_TIME) || !fields[12].equals(ABERRATION)) {
- throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ !fields[10].equals(LIGHT_TIME) || !fields[12].equals(ABERRATION) ||
+ !fields[14].equals(REFRACTION)) {
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ }
+ final AbsoluteDate date = new AbsoluteDate(fields[1], TimeScalesFactory.getUTC());
+ final Vector3D position = new Vector3D(Double.parseDouble(fields[3]),
+ Double.parseDouble(fields[4]),
+ Double.parseDouble(fields[5]));
+ final Vector3D los = new Vector3D(Double.parseDouble(fields[7]),
+ Double.parseDouble(fields[8]),
+ Double.parseDouble(fields[9]));
+ if (global.calls.isEmpty()) {
+ global.lightTimeCorrection = Boolean.parseBoolean(fields[11]);
+ global.aberrationOfLightCorrection = Boolean.parseBoolean(fields[13]);
+ global.atmosphericRefraction = Boolean.parseBoolean(fields[15]);
+ } else {
+ if (global.lightTimeCorrection != Boolean.parseBoolean(fields[11])) {
+ throw new RuggedException(RuggedMessages.LIGHT_TIME_CORRECTION_REDEFINED,
+ l, file.getAbsolutePath(), line);
}
- final AbsoluteDate date = new AbsoluteDate(fields[1], TimeScalesFactory.getUTC());
- final Vector3D position = new Vector3D(Double.parseDouble(fields[3]),
- Double.parseDouble(fields[4]),
- Double.parseDouble(fields[5]));
- final Vector3D los = new Vector3D(Double.parseDouble(fields[7]),
- Double.parseDouble(fields[8]),
- Double.parseDouble(fields[9]));
- if (global.calls.isEmpty()) {
- global.lightTimeCorrection = Boolean.parseBoolean(fields[11]);
- global.aberrationOfLightCorrection = Boolean.parseBoolean(fields[13]);
- } else {
- if (global.lightTimeCorrection != Boolean.parseBoolean(fields[11])) {
- throw new RuggedException(RuggedMessages.LIGHT_TIME_CORRECTION_REDEFINED,
- l, file.getAbsolutePath(), line);
- }
- if (global.aberrationOfLightCorrection != Boolean.parseBoolean(fields[13])) {
- throw new RuggedException(RuggedMessages.ABERRATION_OF_LIGHT_CORRECTION_REDEFINED,
- l, file.getAbsolutePath(), line);
- }
+ if (global.aberrationOfLightCorrection != Boolean.parseBoolean(fields[13])) {
+ throw new RuggedException(RuggedMessages.ABERRATION_OF_LIGHT_CORRECTION_REDEFINED,
+ l, file.getAbsolutePath(), line);
+ }
+ if (global.atmosphericRefraction != Boolean.parseBoolean(fields[15])) {
+ throw new RuggedException(RuggedMessages.ATMOSPHERIC_REFRACTION_REDEFINED,
+ l, file.getAbsolutePath(), line);
}
- global.calls.add(new DumpedCall() {
+ }
+ global.calls.add(new DumpedCall() {
- /** {@inheritDoc} */
- @Override
- public Object execute(final Rugged rugged) throws RuggedException {
- return rugged.directLocation(date, position, los);
- }
+ /** {@inheritDoc} */
+ @Override
+ public Object execute(final Rugged rugged) {
+ return rugged.directLocation(date, position, los);
+ }
- });
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
+ });
}
-
},
/** Parser for direct location result dump lines. */
@@ -589,17 +597,25 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- if (fields.length < 6 || !fields[0].equals(LATITUDE) ||
- !fields[2].equals(LONGITUDE) || !fields[4].equals(ELEVATION)) {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length == 1) {
+ if (fields[0].equals(NULL_RESULT)) {
+ final GeodeticPoint gp = null;
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = gp;
+ } else {
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ }
+ } else if (fields.length < 6 || !fields[0].equals(LATITUDE) ||
+ !fields[2].equals(LONGITUDE) || !fields[4].equals(ELEVATION)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ } else {
+ final GeodeticPoint gp = new GeodeticPoint(Double.parseDouble(fields[1]),
+ Double.parseDouble(fields[3]),
+ Double.parseDouble(fields[5]));
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = gp;
}
- final GeodeticPoint gp = new GeodeticPoint(Double.parseDouble(fields[1]),
- Double.parseDouble(fields[3]),
- Double.parseDouble(fields[5]));
- final DumpedCall last = global.calls.get(global.calls.size() - 1);
- last.expected = gp;
}
},
@@ -609,30 +625,24 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- try {
- if (fields.length < 10 ||
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length < 10 ||
!fields[0].equals(MIN_DATE) || !fields[2].equals(MAX_DATE) || !fields[4].equals(T_STEP) ||
!fields[6].equals(TOLERANCE) || !fields[8].equals(INERTIAL_FRAME)) {
- throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
- }
- global.minDate = new AbsoluteDate(fields[1], TimeScalesFactory.getUTC());
- global.maxDate = new AbsoluteDate(fields[3], TimeScalesFactory.getUTC());
- global.tStep = Double.parseDouble(fields[5]);
- global.tolerance = Double.parseDouble(fields[7]);
- global.bodyToInertial = new TreeMap<Integer, Transform>();
- global.scToInertial = new TreeMap<Integer, Transform>();
- try {
- global.inertialFrame = FramesFactory.getFrame(Predefined.valueOf(fields[9]));
- } catch (IllegalArgumentException iae) {
- throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
- }
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ }
+ global.minDate = new AbsoluteDate(fields[1], TimeScalesFactory.getUTC());
+ global.maxDate = new AbsoluteDate(fields[3], TimeScalesFactory.getUTC());
+ global.tStep = Double.parseDouble(fields[5]);
+ global.tolerance = Double.parseDouble(fields[7]);
+ global.bodyToInertial = new TreeMap<Integer, Transform>();
+ global.scToInertial = new TreeMap<Integer, Transform>();
+ try {
+ global.inertialFrame = FramesFactory.getFrame(Predefined.valueOf(fields[9]));
+ } catch (IllegalArgumentException iae) {
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
}
}
-
},
/** Parser for observation transforms dump lines. */
@@ -640,8 +650,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
if (fields.length < 42 ||
!fields[0].equals(INDEX) ||
!fields[2].equals(BODY) ||
@@ -699,8 +708,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
if (fields.length < 13 ||
!fields[1].equals(LAT_MIN) || !fields[3].equals(LAT_STEP) || !fields[5].equals(LAT_ROWS) ||
!fields[7].equals(LON_MIN) || !fields[9].equals(LON_STEP) || !fields[11].equals(LON_COLS)) {
@@ -731,8 +739,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
if (fields.length < 7 ||
!fields[1].equals(LAT_INDEX) || !fields[3].equals(LON_INDEX) || !fields[5].equals(ELEVATION)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
@@ -759,13 +766,13 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- if (fields.length < 16 ||
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length < 18 ||
!fields[0].equals(SENSOR_NAME) ||
!fields[2].equals(LATITUDE) || !fields[4].equals(LONGITUDE) || !fields[6].equals(ELEVATION) ||
!fields[8].equals(MIN_LINE) || !fields[10].equals(MAX_LINE) ||
- !fields[12].equals(LIGHT_TIME) || !fields[14].equals(ABERRATION)) {
+ !fields[12].equals(LIGHT_TIME) || !fields[14].equals(ABERRATION) ||
+ !fields[16].equals(REFRACTION)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
}
final String sensorName = fields[1];
@@ -777,6 +784,7 @@ public class DumpReplayer {
if (global.calls.isEmpty()) {
global.lightTimeCorrection = Boolean.parseBoolean(fields[13]);
global.aberrationOfLightCorrection = Boolean.parseBoolean(fields[15]);
+ global.atmosphericRefraction = Boolean.parseBoolean(fields[17]);
} else {
if (global.lightTimeCorrection != Boolean.parseBoolean(fields[13])) {
throw new RuggedException(RuggedMessages.LIGHT_TIME_CORRECTION_REDEFINED,
@@ -786,12 +794,16 @@ public class DumpReplayer {
throw new RuggedException(RuggedMessages.ABERRATION_OF_LIGHT_CORRECTION_REDEFINED,
l, file.getAbsolutePath(), line);
}
+ if (global.atmosphericRefraction != Boolean.parseBoolean(fields[17])) {
+ throw new RuggedException(RuggedMessages.ATMOSPHERIC_REFRACTION_REDEFINED,
+ l, file.getAbsolutePath(), line);
+ }
}
global.calls.add(new DumpedCall() {
/** {@inheritDoc} */
@Override
- public Object execute(final Rugged rugged) throws RuggedException {
+ public Object execute(final Rugged rugged) {
return rugged.inverseLocation(sensorName, point, minLine, maxLine);
}
@@ -805,15 +817,23 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- if (fields.length < 4 || !fields[0].equals(LINE_NUMBER) || !fields[2].equals(PIXEL_NUMBER)) {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length == 1) {
+ if (fields[0].equals(NULL_RESULT)) {
+ final SensorPixel sp = null;
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = sp;
+ } else {
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ }
+ } else if (fields.length < 4 || !fields[0].equals(LINE_NUMBER) || !fields[2].equals(PIXEL_NUMBER)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ } else {
+ final SensorPixel sp = new SensorPixel(Double.parseDouble(fields[1]),
+ Double.parseDouble(fields[3]));
+ final DumpedCall last = global.calls.get(global.calls.size() - 1);
+ last.expected = sp;
}
- final SensorPixel sp = new SensorPixel(Double.parseDouble(fields[1]),
- Double.parseDouble(fields[3]));
- final DumpedCall last = global.calls.get(global.calls.size() - 1);
- last.expected = sp;
}
},
@@ -823,8 +843,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
if (fields.length < 8 || !fields[0].equals(SENSOR_NAME) ||
!fields[2].equals(NB_PIXELS) || !fields[4].equals(POSITION)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
@@ -843,53 +862,46 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- try {
- if (fields.length < 16 || !fields[0].equals(SENSOR_NAME) ||
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length < 16 || !fields[0].equals(SENSOR_NAME) ||
!fields[2].equals(MIN_LINE) || !fields[4].equals(MAX_LINE) ||
!fields[6].equals(MAX_EVAL) || !fields[8].equals(ACCURACY) ||
!fields[10].equals(NORMAL) || !fields[14].equals(CACHED_RESULTS)) {
- throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
- }
- final String sensorName = fields[1];
- final int minLine = Integer.parseInt(fields[3]);
- final int maxLine = Integer.parseInt(fields[5]);
- final int maxEval = Integer.parseInt(fields[7]);
- final double accuracy = Double.parseDouble(fields[9]);
- final Vector3D normal = new Vector3D(Double.parseDouble(fields[11]),
- Double.parseDouble(fields[12]),
- Double.parseDouble(fields[13]));
- final int n = Integer.parseInt(fields[15]);
- final CrossingResult[] cachedResults = new CrossingResult[n];
- int base = 16;
- for (int i = 0; i < n; ++i) {
- if (fields.length < base + 15 || !fields[base].equals(LINE_NUMBER) ||
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
+ }
+ final String sensorName = fields[1];
+ final int minLine = Integer.parseInt(fields[3]);
+ final int maxLine = Integer.parseInt(fields[5]);
+ final int maxEval = Integer.parseInt(fields[7]);
+ final double accuracy = Double.parseDouble(fields[9]);
+ final Vector3D normal = new Vector3D(Double.parseDouble(fields[11]),
+ Double.parseDouble(fields[12]),
+ Double.parseDouble(fields[13]));
+ final int n = Integer.parseInt(fields[15]);
+ final CrossingResult[] cachedResults = new CrossingResult[n];
+ int base = 16;
+ for (int i = 0; i < n; ++i) {
+ if (fields.length < base + 15 || !fields[base].equals(LINE_NUMBER) ||
!fields[base + 2].equals(DATE) || !fields[base + 4].equals(TARGET) ||
!fields[base + 8].equals(TARGET_DIRECTION)) {
- throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
- }
- final double ln = Double.parseDouble(fields[base + 1]);
- final AbsoluteDate date = new AbsoluteDate(fields[base + 3], TimeScalesFactory.getUTC());
- final Vector3D target = new Vector3D(Double.parseDouble(fields[base + 5]),
- Double.parseDouble(fields[base + 6]),
- Double.parseDouble(fields[base + 7]));
- final Vector3D targetDirection = new Vector3D(Double.parseDouble(fields[base + 9]),
- Double.parseDouble(fields[base + 10]),
- Double.parseDouble(fields[base + 11]));
- final Vector3D targetDirectionDerivative = new Vector3D(Double.parseDouble(fields[base + 12]),
- Double.parseDouble(fields[base + 13]),
- Double.parseDouble(fields[base + 14]));
- cachedResults[i] = new CrossingResult(date, ln, target, targetDirection, targetDirectionDerivative);
- base += 15;
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
}
- global.getSensor(sensorName).setMeanPlane(new ParsedMeanPlane(minLine, maxLine, maxEval, accuracy, normal, cachedResults));
-
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
+ final double ln = Double.parseDouble(fields[base + 1]);
+ final AbsoluteDate date = new AbsoluteDate(fields[base + 3], TimeScalesFactory.getUTC());
+ final Vector3D target = new Vector3D(Double.parseDouble(fields[base + 5]),
+ Double.parseDouble(fields[base + 6]),
+ Double.parseDouble(fields[base + 7]));
+ final Vector3D targetDirection = new Vector3D(Double.parseDouble(fields[base + 9]),
+ Double.parseDouble(fields[base + 10]),
+ Double.parseDouble(fields[base + 11]));
+ final Vector3D targetDirectionDerivative = new Vector3D(Double.parseDouble(fields[base + 12]),
+ Double.parseDouble(fields[base + 13]),
+ Double.parseDouble(fields[base + 14]));
+ cachedResults[i] = new CrossingResult(date, ln, target, targetDirection, targetDirectionDerivative);
+ base += 15;
}
+ global.getSensor(sensorName).setMeanPlane(new ParsedMeanPlane(minLine, maxLine, maxEval, accuracy, normal, cachedResults));
}
-
},
/** Parser for sensor LOS dump lines. */
@@ -897,27 +909,20 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- try {
- if (fields.length < 10 || !fields[0].equals(SENSOR_NAME) ||
- !fields[2].equals(DATE) || !fields[4].equals(PIXEL_NUMBER) ||
- !fields[6].equals(LOS)) {
- throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
- }
- final String sensorName = fields[1];
- final AbsoluteDate date = new AbsoluteDate(fields[3], TimeScalesFactory.getUTC());
- final int pixelNumber = Integer.parseInt(fields[5]);
- final Vector3D los = new Vector3D(Double.parseDouble(fields[7]),
- Double.parseDouble(fields[8]),
- Double.parseDouble(fields[9]));
- global.getSensor(sensorName).setLOS(date, pixelNumber, los);
-
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length < 10 || !fields[0].equals(SENSOR_NAME) ||
+ !fields[2].equals(DATE) || !fields[4].equals(PIXEL_NUMBER) ||
+ !fields[6].equals(LOS)) {
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
}
+ final String sensorName = fields[1];
+ final AbsoluteDate date = new AbsoluteDate(fields[3], TimeScalesFactory.getUTC());
+ final int pixelNumber = Integer.parseInt(fields[5]);
+ final Vector3D los = new Vector3D(Double.parseDouble(fields[7]),
+ Double.parseDouble(fields[8]),
+ Double.parseDouble(fields[9]));
+ global.getSensor(sensorName).setLOS(date, pixelNumber, los);
}
-
},
/** Parser for sensor datation dump lines. */
@@ -925,24 +930,16 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
- try {
- if (fields.length < 6 || !fields[0].equals(SENSOR_NAME) ||
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
+ if (fields.length < 6 || !fields[0].equals(SENSOR_NAME) ||
!fields[2].equals(LINE_NUMBER) || !fields[4].equals(DATE)) {
- throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
- }
- final String sensorName = fields[1];
- final double lineNumber = Double.parseDouble(fields[3]);
- final AbsoluteDate date = new AbsoluteDate(fields[5], TimeScalesFactory.getUTC());
- global.getSensor(sensorName).setDatation(lineNumber, date);
-
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
+ throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
}
-
+ final String sensorName = fields[1];
+ final double lineNumber = Double.parseDouble(fields[3]);
+ final AbsoluteDate date = new AbsoluteDate(fields[5], TimeScalesFactory.getUTC());
+ global.getSensor(sensorName).setDatation(lineNumber, date);
}
-
},
/** Parser for sensor rate dump lines. */
@@ -950,8 +947,7 @@ public class DumpReplayer {
/** {@inheritDoc} */
@Override
- public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global)
- throws RuggedException {
+ public void parse(final int l, final File file, final String line, final String[] fields, final DumpReplayer global) {
if (fields.length < 6 || !fields[0].equals(SENSOR_NAME) ||
!fields[2].equals(LINE_NUMBER) || !fields[4].equals(RATE)) {
throw new RuggedException(RuggedMessages.CANNOT_PARSE_LINE, l, file, line);
@@ -970,10 +966,8 @@ public class DumpReplayer {
* @param file dump file
* @param line line to parse
* @param global global parser to store parsed data
- * @exception RuggedException if line is not supported
*/
- public static void parse(final int l, final File file, final String line, final DumpReplayer global)
- throws RuggedException {
+ public static void parse(final int l, final File file, final String line, final DumpReplayer global) {
final String trimmed = line.trim();
if (trimmed.length() == 0 || trimmed.startsWith(COMMENT_START)) {
@@ -1008,10 +1002,8 @@ public class DumpReplayer {
* @param line complete line
* @param fields data fields from the line
* @param global global parser to store parsed data
- * @exception RuggedException if line cannot be parsed
*/
- public abstract void parse(int l, File file, String line, String[] fields, DumpReplayer global)
- throws RuggedException;
+ public abstract void parse(int l, File file, String line, String[] fields, DumpReplayer global);
}
@@ -1078,10 +1070,8 @@ public class DumpReplayer {
/** Update the tile according to the Digital Elevation Model.
* @param tile to update
- * @exception RuggedException if tile cannot be updated
*/
- public void updateTile(final UpdatableTile tile)
- throws RuggedException {
+ public void updateTile(final UpdatableTile tile) {
tile.setGeometry(minLatitude, minLongitude,
latitudeStep, longitudeStep,
@@ -1189,7 +1179,7 @@ public class DumpReplayer {
public Vector3D getLOS(final int index, final AbsoluteDate date) {
final List<Pair<AbsoluteDate, Vector3D>> list = losMap.get(index);
if (list == null) {
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
if (list.size() < 2) {
@@ -1397,9 +1387,8 @@ public class DumpReplayer {
/** Execute a call.
* @param rugged Rugged instance on which called should be performed
* @return result of the call
- * @exception RuggedException if the call fails
*/
- public abstract Object execute(Rugged rugged) throws RuggedException;
+ public abstract Object execute(Rugged rugged);
}
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedException.java b/src/main/java/org/orekit/rugged/errors/RuggedException.java
index 47064b07d13589ee569036fc0afd895b5fc958cf..ed04a37dd52eb4a15d5ae059262b64ce9e22a5ac 100644
--- a/src/main/java/org/orekit/rugged/errors/RuggedException.java
+++ b/src/main/java/org/orekit/rugged/errors/RuggedException.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -27,15 +27,15 @@ import org.hipparchus.exception.LocalizedException;
* the rugged library classes.
* <p>
- * This class is heavily based on Orekit {@link org.orekit.errors.OrekitException},
+ * This class is heavily based on {@code OrekitException},
* which is distributed under the terms of the Apache License V2.
* </p>
*
* @author Luc Maisonobe
-
+ * @author Guylaine Prat
*/
-public class RuggedException extends Exception implements LocalizedException {
+public class RuggedException extends RuntimeException implements LocalizedException {
/** Serializable UID. */
private static final long serialVersionUID = 20140309L;
@@ -113,37 +113,4 @@ public class RuggedException extends Exception implements LocalizedException {
return (specifier == null) ? "" : new MessageFormat(specifier.getLocalizedString(locale), locale).format(parts);
}
- /** Create an {@link java.lang.RuntimeException} for an internal error.
- * @param cause underlying cause
- * @return an {@link java.lang.RuntimeException} for an internal error
- */
- public static RuntimeException createInternalError(final Throwable cause) {
-
- /** Format specifier (to be translated). */
- final Localizable specifier = RuggedMessages.INTERNAL_ERROR;
-
- /** Parts to insert in the format (no translation). */
- final String parts = "rugged-developers@orekit.org";
-
- return new RuntimeException() {
-
- /** Serializable UID. */
- private static final long serialVersionUID = 20140309L;
-
- /** {@inheritDoc} */
- @Override
- public String getMessage() {
- return buildMessage(Locale.US, specifier, parts);
- }
-
- /** {@inheritDoc} */
- @Override
- public String getLocalizedMessage() {
- return buildMessage(Locale.getDefault(), specifier, parts);
- }
-
- };
-
- }
-
}
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java b/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java
index c6c0449e6ba3a6e92a8807e802b8445bd910fbf4..3c25c83107b8fb99279af407f150278fcbb838cb 100644
--- a/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java
+++ b/src/main/java/org/orekit/rugged/errors/RuggedExceptionWrapper.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,11 +22,15 @@ package org.orekit.rugged.errors;
* this exception. Typical examples are propagation methods that are used inside Hipparchus
* optimizers, integrators or solvers.</p>
* <p>
- * This class is heavily based on Orekit {@link org.orekit.errors.OrekitException},
+ * This class is heavily based on {@code OrekitException},
* which is distributed under the terms of the Apache License V2.
* </p>
* @author Luc Maisonobe
+ * @author Guylaine Prat
+ * @deprecated as of 2.1, this class is not used anymore, as {@link RuggedException}
+ * is now an unchecked exception
*/
+@Deprecated
public class RuggedExceptionWrapper extends RuntimeException {
/** serializable UID. */
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedInternalError.java b/src/main/java/org/orekit/rugged/errors/RuggedInternalError.java
new file mode 100644
index 0000000000000000000000000000000000000000..29362e1a645438cd41aa54992174a63659b9b0d9
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/errors/RuggedInternalError.java
@@ -0,0 +1,88 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.errors;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+
+import org.hipparchus.exception.Localizable;
+import org.hipparchus.exception.LocalizedException;
+
+
+/** Extension of {@link java.lang.Runtime} with localized message for internal errors only.
+ * @since 2.1
+ */
+public class RuggedInternalError extends RuntimeException implements LocalizedException {
+
+ /** Serializable UID. */
+ private static final long serialVersionUID = 20190305L;
+
+ /** Format specifier (to be translated). */
+ private final Localizable specifier = RuggedMessages.INTERNAL_ERROR;
+
+ /** Parts to insert in the format (no translation). */
+ private final String[] parts = new String[] {
+ "https://gitlab.orekit.org/orekit/rugged/issues"
+ };
+
+ /** Create an exception with localized message.
+ * @param cause underlying cause
+ */
+ public RuggedInternalError(final Throwable cause) {
+ super(cause);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getMessage(final Locale locale) {
+ return buildMessage(locale);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getMessage() {
+ return buildMessage(Locale.US);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getLocalizedMessage() {
+ return buildMessage(Locale.getDefault());
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Localizable getSpecifier() {
+ return specifier;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Object[] getParts() {
+ return parts.clone();
+ }
+
+ /**
+ * Builds a message string by from a pattern and its arguments.
+ * @param locale Locale in which the message should be translated
+ * @return a message string
+ */
+ private String buildMessage(final Locale locale) {
+ return new MessageFormat(specifier.getLocalizedString(locale), locale).format(parts);
+ }
+
+}
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedMessages.java b/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
index 31b763e9a5c09c7c37d510e46a69b70c80866f2b..2d1445e85628caccbf524239966987939dc97933 100644
--- a/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
+++ b/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -43,7 +43,7 @@ import org.hipparchus.exception.Localizable;
* translation is missing.
* </p>
* <p>
- * This class is heavily based on Orekit {@link org.orekit.errors.OrekitMessages},
+ * This class is heavily based on {@code OrekitMessages},
* which is distributed under the terms of the Apache License V2.
* </p>
*/
@@ -51,7 +51,7 @@ public enum RuggedMessages implements Localizable {
// CHECKSTYLE: stop JavadocVariable check
- INTERNAL_ERROR("internal error, contact maintenance at {0}"),
+ INTERNAL_ERROR("internal error, please notify development team by creating an issue at {0}"),
OUT_OF_TILE_INDICES("no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)"),
OUT_OF_TILE_ANGLES("no data at latitude {0} and longitude {1}, tile covers only latitudes {2} to {3} and longitudes {4} to {5}"),
NO_DEM_DATA("no Digital Elevation Model data at latitude {0} and longitude {1}"),
@@ -73,6 +73,7 @@ public enum RuggedMessages implements Localizable {
CANNOT_PARSE_LINE("cannot parse line {0}, file {1}: {2}"),
LIGHT_TIME_CORRECTION_REDEFINED("light time correction redefined, line {0}, file {1}: {2}"),
ABERRATION_OF_LIGHT_CORRECTION_REDEFINED("aberration of light correction redefined, line {0}, file {1}: {2}"),
+ ATMOSPHERIC_REFRACTION_REDEFINED("atmospheric refraction correction redefined, line {0}, file {1}: {2}"),
TILE_ALREADY_DEFINED("tile {0} already defined, line {1}, file {2}: {3}"),
UNKNOWN_TILE("unknown tile {0}, line {1}, file {2}: {3}"),
NO_PARAMETERS_SELECTED("no parameters have been selected for estimation"),
@@ -80,7 +81,9 @@ public enum RuggedMessages implements Localizable {
DUPLICATED_PARAMETER_NAME("a different parameter with name {0} already exists"),
INVALID_RUGGED_NAME("invalid rugged name"),
UNSUPPORTED_REFINING_CONTEXT("refining using {0} rugged instance is not handled"),
- NO_LAYER_DATA("no atmospheric layer data at altitude {0} (lowest altitude: {1})");
+ NO_LAYER_DATA("no atmospheric layer data at altitude {0} (lowest altitude: {1})"),
+ INVALID_STEP("step {0} is not valid : {1}"),
+ INVALID_RANGE_FOR_LINES("range between min line {0} and max line {1} is invalid {2}");
// CHECKSTYLE: resume JavadocVariable check
@@ -114,7 +117,7 @@ public enum RuggedMessages implements Localizable {
final String translated = bundle.getString(name());
if ((translated != null) &&
(translated.length() > 0) &&
- (!translated.toLowerCase().contains("missing translation"))) {
+ (!translated.toLowerCase(locale).contains("missing translation"))) {
// the value of the resource is the translated format
return translated;
}
@@ -142,8 +145,7 @@ public enum RuggedMessages implements Localizable {
/** {@inheritDoc} */
@Override
public ResourceBundle newBundle(final String baseName, final Locale locale, final String format,
- final ClassLoader loader, final boolean reload)
- throws IllegalAccessException, InstantiationException, IOException {
+ final ClassLoader loader, final boolean reload) throws IOException {
// The below is a copy of the default implementation.
final String bundleName = toBundleName(baseName, locale);
final String resourceName = toResourceName(bundleName, "utf8");
diff --git a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
index 4960edb92fd32fdcd99fbdf0cedb406bdb025d14..a02eccf5f4aa41550e52b5a04c35873b773507b4 100644
--- a/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,16 +16,14 @@
*/
package org.orekit.rugged.intersection;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.util.FastMath;
import java.util.ArrayList;
import java.util.List;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.errors.DumpManager;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.raster.SimpleTile;
import org.orekit.rugged.raster.SimpleTileFactory;
import org.orekit.rugged.raster.Tile;
@@ -66,137 +64,124 @@ public class BasicScanAlgorithm implements IntersectionAlgorithm {
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
- final Vector3D position, final Vector3D los)
- throws RuggedException {
- try {
-
- DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY);
-
- // find the tiles between the entry and exit point in the Digital Elevation Model
- NormalizedGeodeticPoint entryPoint = null;
- NormalizedGeodeticPoint exitPoint = null;
- double minLatitude = Double.NaN;
- double maxLatitude = Double.NaN;
- double minLongitude = Double.NaN;
- double maxLongitude = Double.NaN;
- final List<SimpleTile> scannedTiles = new ArrayList<SimpleTile>();
- double centralLongitude = Double.NaN;
- for (boolean changedMinMax = true; changedMinMax; changedMinMax = checkMinMax(scannedTiles)) {
-
- scannedTiles.clear();
- // compute entry and exit points
- entryPoint = ellipsoid.transform(ellipsoid.pointAtAltitude(position, los, Double.isInfinite(hMax) ? 0.0 : hMax),
- ellipsoid.getBodyFrame(), null,
- Double.isNaN(centralLongitude) ? 0.0 : centralLongitude);
- final SimpleTile entryTile = cache.getTile(entryPoint.getLatitude(), entryPoint.getLongitude());
- if (Double.isNaN(centralLongitude)) {
- centralLongitude = entryTile.getMinimumLongitude();
- entryPoint = new NormalizedGeodeticPoint(entryPoint.getLatitude(), entryPoint.getLongitude(),
- entryPoint.getAltitude(), centralLongitude);
- }
- addIfNotPresent(scannedTiles, entryTile);
-
- exitPoint = ellipsoid.transform(ellipsoid.pointAtAltitude(position, los, Double.isInfinite(hMin) ? 0.0 : hMin),
- ellipsoid.getBodyFrame(), null, centralLongitude);
- final SimpleTile exitTile = cache.getTile(exitPoint.getLatitude(), exitPoint.getLongitude());
- addIfNotPresent(scannedTiles, exitTile);
-
- minLatitude = FastMath.min(entryPoint.getLatitude(), exitPoint.getLatitude());
- maxLatitude = FastMath.max(entryPoint.getLatitude(), exitPoint.getLatitude());
- minLongitude = FastMath.min(entryPoint.getLongitude(), exitPoint.getLongitude());
- maxLongitude = FastMath.max(entryPoint.getLongitude(), exitPoint.getLongitude());
-
- if (scannedTiles.size() > 1) {
- // the entry and exit tiles are different, maybe other tiles should be added on the way
- // in the spirit of simple and exhaustive, we add all tiles in a rectangular area
- final double latStep = 0.5 * FastMath.min(entryTile.getLatitudeStep() * entryTile.getLatitudeRows(),
- exitTile.getLatitudeStep() * exitTile.getLatitudeRows());
- final double lonStep = 0.5 * FastMath.min(entryTile.getLongitudeStep() * entryTile.getLongitudeColumns(),
- exitTile.getLongitudeStep() * exitTile.getLongitudeColumns());
- for (double latitude = minLatitude; latitude <= maxLatitude; latitude += latStep) {
- for (double longitude = minLongitude; longitude < maxLongitude; longitude += lonStep) {
- addIfNotPresent(scannedTiles, cache.getTile(latitude, longitude));
- }
+ final Vector3D position, final Vector3D los) {
+
+ DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY);
+
+ // find the tiles between the entry and exit point in the Digital Elevation Model
+ NormalizedGeodeticPoint entryPoint = null;
+ NormalizedGeodeticPoint exitPoint = null;
+ double minLatitude = Double.NaN;
+ double maxLatitude = Double.NaN;
+ double minLongitude = Double.NaN;
+ double maxLongitude = Double.NaN;
+ final List<SimpleTile> scannedTiles = new ArrayList<SimpleTile>();
+ double centralLongitude = Double.NaN;
+ for (boolean changedMinMax = true; changedMinMax; changedMinMax = checkMinMax(scannedTiles)) {
+
+ scannedTiles.clear();
+ // compute entry and exit points
+ entryPoint = ellipsoid.transform(ellipsoid.pointAtAltitude(position, los, Double.isInfinite(hMax) ? 0.0 : hMax),
+ ellipsoid.getBodyFrame(), null,
+ Double.isNaN(centralLongitude) ? 0.0 : centralLongitude);
+ final SimpleTile entryTile = cache.getTile(entryPoint.getLatitude(), entryPoint.getLongitude());
+ if (Double.isNaN(centralLongitude)) {
+ centralLongitude = entryTile.getMinimumLongitude();
+ entryPoint = new NormalizedGeodeticPoint(entryPoint.getLatitude(), entryPoint.getLongitude(),
+ entryPoint.getAltitude(), centralLongitude);
+ }
+ addIfNotPresent(scannedTiles, entryTile);
+
+ exitPoint = ellipsoid.transform(ellipsoid.pointAtAltitude(position, los, Double.isInfinite(hMin) ? 0.0 : hMin),
+ ellipsoid.getBodyFrame(), null, centralLongitude);
+ final SimpleTile exitTile = cache.getTile(exitPoint.getLatitude(), exitPoint.getLongitude());
+ addIfNotPresent(scannedTiles, exitTile);
+
+ minLatitude = FastMath.min(entryPoint.getLatitude(), exitPoint.getLatitude());
+ maxLatitude = FastMath.max(entryPoint.getLatitude(), exitPoint.getLatitude());
+ minLongitude = FastMath.min(entryPoint.getLongitude(), exitPoint.getLongitude());
+ maxLongitude = FastMath.max(entryPoint.getLongitude(), exitPoint.getLongitude());
+
+ if (scannedTiles.size() > 1) {
+ // the entry and exit tiles are different, maybe other tiles should be added on the way
+ // in the spirit of simple and exhaustive, we add all tiles in a rectangular area
+ final double latStep = 0.5 * FastMath.min(entryTile.getLatitudeStep() * entryTile.getLatitudeRows(),
+ exitTile.getLatitudeStep() * exitTile.getLatitudeRows());
+ final double lonStep = 0.5 * FastMath.min(entryTile.getLongitudeStep() * entryTile.getLongitudeColumns(),
+ exitTile.getLongitudeStep() * exitTile.getLongitudeColumns());
+ for (double latitude = minLatitude; latitude <= maxLatitude; latitude += latStep) {
+ for (double longitude = minLongitude; longitude < maxLongitude; longitude += lonStep) {
+ addIfNotPresent(scannedTiles, cache.getTile(latitude, longitude));
}
}
-
}
- // scan the tiles
- NormalizedGeodeticPoint intersectionGP = null;
- double intersectionDot = Double.POSITIVE_INFINITY;
- for (final SimpleTile tile : scannedTiles) {
- for (int i = latitudeIndex(tile, minLatitude); i <= latitudeIndex(tile, maxLatitude); ++i) {
- for (int j = longitudeIndex(tile, minLongitude); j <= longitudeIndex(tile, maxLongitude); ++j) {
- final NormalizedGeodeticPoint gp = tile.cellIntersection(entryPoint, ellipsoid.convertLos(entryPoint, los), i, j);
- if (gp != null) {
-
- // improve the point, by projecting it back on the 3D line, fixing the small body curvature at cell level
- final Vector3D delta = ellipsoid.transform(gp).subtract(position);
- final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
- final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
- ellipsoid.getBodyFrame(), null);
- final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
- projected.getLongitude(),
- projected.getAltitude(),
- gp.getLongitude());
- final NormalizedGeodeticPoint gpImproved = tile.cellIntersection(normalizedProjected,
- ellipsoid.convertLos(normalizedProjected, los),
- i, j);
-
- if (gpImproved != null) {
- final Vector3D point = ellipsoid.transform(gpImproved);
- final double dot = Vector3D.dotProduct(point.subtract(position), los);
- if (dot < intersectionDot) {
- intersectionGP = gpImproved;
- intersectionDot = dot;
- }
- }
+ }
+ // scan the tiles
+ NormalizedGeodeticPoint intersectionGP = null;
+ double intersectionDot = Double.POSITIVE_INFINITY;
+ for (final SimpleTile tile : scannedTiles) {
+ for (int i = latitudeIndex(tile, minLatitude); i <= latitudeIndex(tile, maxLatitude); ++i) {
+ for (int j = longitudeIndex(tile, minLongitude); j <= longitudeIndex(tile, maxLongitude); ++j) {
+ final NormalizedGeodeticPoint gp = tile.cellIntersection(entryPoint, ellipsoid.convertLos(entryPoint, los), i, j);
+ if (gp != null) {
+
+ // improve the point, by projecting it back on the 3D line, fixing the small body curvature at cell level
+ final Vector3D delta = ellipsoid.transform(gp).subtract(position);
+ final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
+ final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
+ ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
+ projected.getLongitude(),
+ projected.getAltitude(),
+ gp.getLongitude());
+ final NormalizedGeodeticPoint gpImproved = tile.cellIntersection(normalizedProjected,
+ ellipsoid.convertLos(normalizedProjected, los),
+ i, j);
+
+ if (gpImproved != null) {
+ final Vector3D point = ellipsoid.transform(gpImproved);
+ final double dot = Vector3D.dotProduct(point.subtract(position), los);
+ if (dot < intersectionDot) {
+ intersectionGP = gpImproved;
+ intersectionDot = dot;
+ }
}
+
}
}
}
-
- return intersectionGP;
-
- } catch (OrekitException oe) {
- // this should never happen
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
}
+
+ return intersectionGP;
}
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
- final NormalizedGeodeticPoint closeGuess)
- throws RuggedException {
- try {
- DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY);
- final Vector3D delta = ellipsoid.transform(closeGuess).subtract(position);
- final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
- final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
- ellipsoid.getBodyFrame(), null);
- final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
- projected.getLongitude(),
- projected.getAltitude(),
- closeGuess.getLongitude());
- final Tile tile = cache.getTile(normalizedProjected.getLatitude(),
- normalizedProjected.getLongitude());
- return tile.cellIntersection(normalizedProjected,
- ellipsoid.convertLos(normalizedProjected, los),
- tile.getFloorLatitudeIndex(normalizedProjected.getLatitude()),
- tile.getFloorLongitudeIndex(normalizedProjected.getLongitude()));
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
+ final NormalizedGeodeticPoint closeGuess) {
+ DumpManager.dumpAlgorithm(AlgorithmId.BASIC_SLOW_EXHAUSTIVE_SCAN_FOR_TESTS_ONLY);
+ final Vector3D delta = ellipsoid.transform(closeGuess).subtract(position);
+ final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
+ final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
+ ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
+ projected.getLongitude(),
+ projected.getAltitude(),
+ closeGuess.getLongitude());
+ final Tile tile = cache.getTile(normalizedProjected.getLatitude(),
+ normalizedProjected.getLongitude());
+ return tile.cellIntersection(normalizedProjected,
+ ellipsoid.convertLos(normalizedProjected, los),
+ tile.getFloorLatitudeIndex(normalizedProjected.getLatitude()),
+ tile.getFloorLongitudeIndex(normalizedProjected.getLongitude()));
}
/** {@inheritDoc} */
@Override
- public double getElevation(final double latitude, final double longitude)
- throws RuggedException {
+ public double getElevation(final double latitude, final double longitude) {
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 70be321b59e982ad67e71264923eaf5df66a8084..185ab1f8053d3ce056b1b616a2e000b345db8152 100644
--- a/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/ConstantElevationAlgorithm.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -18,10 +18,8 @@ package org.orekit.rugged.intersection;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.errors.DumpManager;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
@@ -46,33 +44,23 @@ public class ConstantElevationAlgorithm implements IntersectionAlgorithm {
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
- final Vector3D position, final Vector3D los)
- throws RuggedException {
- try {
- DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation);
- final Vector3D p = ellipsoid.pointAtAltitude(position, los, constantElevation);
- final GeodeticPoint gp = ellipsoid.transform(p, ellipsoid.getFrame(), null);
- return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), 0.0);
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
+ final Vector3D position, final Vector3D los) {
+ DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation);
+ final Vector3D p = ellipsoid.pointAtAltitude(position, los, constantElevation);
+ final GeodeticPoint gp = ellipsoid.transform(p, ellipsoid.getFrame(), null);
+ return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), 0.0);
}
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
- final NormalizedGeodeticPoint closeGuess)
- throws RuggedException {
- try {
- DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation);
- final Vector3D p = ellipsoid.pointAtAltitude(position, los, constantElevation);
- final GeodeticPoint gp = ellipsoid.transform(p, ellipsoid.getFrame(), null);
- return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(),
- closeGuess.getLongitude());
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
+ final NormalizedGeodeticPoint closeGuess) {
+ DumpManager.dumpAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID, constantElevation);
+ final Vector3D p = ellipsoid.pointAtAltitude(position, los, constantElevation);
+ final GeodeticPoint gp = ellipsoid.transform(p, ellipsoid.getFrame(), null);
+ return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(),
+ closeGuess.getLongitude());
}
/** {@inheritDoc}
diff --git a/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
index 395b5f4c5dc6d8c7cdc3a524a92bb5fc3a4e1a2d..29f0421d8dd429a4e57ad82c9ca385a282285599 100644
--- a/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -19,7 +19,6 @@ package org.orekit.rugged.intersection;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.errors.DumpManager;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
@@ -39,8 +38,7 @@ public class IgnoreDEMAlgorithm implements IntersectionAlgorithm {
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
- final Vector3D position, final Vector3D los)
- throws RuggedException {
+ final Vector3D position, final Vector3D los) {
DumpManager.dumpAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
return ellipsoid.pointOnGround(position, los, 0.0);
}
@@ -49,8 +47,7 @@ public class IgnoreDEMAlgorithm implements IntersectionAlgorithm {
@Override
public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
- final NormalizedGeodeticPoint closeGuess)
- throws RuggedException {
+ final NormalizedGeodeticPoint closeGuess) {
DumpManager.dumpAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
return intersection(ellipsoid, position, los);
}
diff --git a/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
index 17579c2f8375302fbbbe737a25327c9c219b4aff..a003c9fc5eaf8425312cb9ba8f15bc02ed647364 100644
--- a/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,7 +17,7 @@
package org.orekit.rugged.intersection;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.rugged.errors.RuggedException;
+import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
@@ -31,10 +31,8 @@ public interface IntersectionAlgorithm {
* @param position pixel position in ellipsoid frame
* @param los pixel line-of-sight in ellipsoid frame
* @return point at which the line first enters ground
- * @exception RuggedException if intersection cannot be found
*/
- NormalizedGeodeticPoint intersection(ExtendedEllipsoid ellipsoid, Vector3D position, Vector3D los)
- throws RuggedException;
+ NormalizedGeodeticPoint intersection(ExtendedEllipsoid ellipsoid, Vector3D position, Vector3D los);
/** Refine intersection of line with Digital Elevation Model.
* <p>
@@ -49,19 +47,15 @@ public interface IntersectionAlgorithm {
* @param los pixel line-of-sight in ellipsoid frame
* @param closeGuess guess close to the real intersection
* @return point at which the line first enters ground
- * @exception RuggedException if intersection cannot be found
*/
NormalizedGeodeticPoint refineIntersection(ExtendedEllipsoid ellipsoid, Vector3D position, Vector3D los,
- NormalizedGeodeticPoint closeGuess)
- throws RuggedException;
+ NormalizedGeodeticPoint closeGuess);
/** Get elevation at a given ground point.
* @param latitude ground point latitude
* @param longitude ground point longitude
* @return elevation at specified point
- * @exception RuggedException if Digital Elevation Model does not cover point
*/
- double getElevation(double latitude, double longitude)
- throws RuggedException;
+ double getElevation(double latitude, double longitude);
}
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 24098550a3037ddb9d9215ec8ab73401b50e319e..a3abd8b3050b2500887b4d7f33d8a522f857116a 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -19,10 +19,10 @@ package org.orekit.rugged.intersection.duvenhage;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.raster.Tile;
@@ -38,12 +38,20 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
* An Implicit Min/Max KD-Tree for Doing Efficient Terrain Line of Sight Calculations</a>.
* </p>
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public class DuvenhageAlgorithm implements IntersectionAlgorithm {
/** Step size when skipping from one tile to a neighbor one, in meters. */
private static final double STEP = 0.01;
+ /** Maximum number of attempts to refine intersection.
+ * <p>
+ * This parameter is intended to prevent infinite loops.
+ * </p>
+ * @since 2.1 */
+ private static final int MAX_REFINING_ATTEMPTS = 100;
+
/** Cache for DEM tiles. */
private final TilesCache<MinMaxTreeTile> cache;
@@ -69,153 +77,213 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint intersection(final ExtendedEllipsoid ellipsoid,
- final Vector3D position, final Vector3D los)
- throws RuggedException {
- try {
-
- DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
-
- // compute intersection with ellipsoid
- final NormalizedGeodeticPoint gp0 = ellipsoid.pointOnGround(position, los, 0.0);
+ final Vector3D position, final Vector3D los) {
- // compute atmosphere deviation
-
- // locate the entry tile along the line-of-sight
- MinMaxTreeTile tile = cache.getTile(gp0.getLatitude(), gp0.getLongitude());
+ DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
- NormalizedGeodeticPoint current = null;
- double hMax = tile.getMaxElevation();
- while (current == null) {
+ // compute intersection with ellipsoid
+ final NormalizedGeodeticPoint gp0 = ellipsoid.pointOnGround(position, los, 0.0);
+
+ // locate the entry tile along the line-of-sight
+ MinMaxTreeTile tile = cache.getTile(gp0.getLatitude(), gp0.getLongitude());
+
+ NormalizedGeodeticPoint current = null;
+ double hMax = tile.getMaxElevation();
+ while (current == null) {
+
+ // find where line-of-sight crosses tile max altitude
+ final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, hMax + STEP);
+ if (Vector3D.dotProduct(entryP.subtract(position), los) < 0) {
+ // the entry point is behind spacecraft!
+
+ // let's see if at least we are above DEM
+ try {
+ final NormalizedGeodeticPoint positionGP =
+ ellipsoid.transform(position, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
+ final double elevationAtPosition = tile.interpolateElevation(positionGP.getLatitude(), positionGP.getLongitude());
+ if (positionGP.getAltitude() >= elevationAtPosition) {
+ // we can use the current position as the entry point
+ current = positionGP;
+ } else {
+ current = null;
+ }
+ } catch (RuggedException re) {
+ if (re.getSpecifier() == RuggedMessages.OUT_OF_TILE_ANGLES) {
+ current = null;
+ }
+ }
- // find where line-of-sight crosses tile max altitude
- final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, hMax + STEP);
- if (Vector3D.dotProduct(entryP.subtract(position), los) < 0) {
- // the entry point is behind spacecraft!
+ if (current == null) {
throw new RuggedException(RuggedMessages.DEM_ENTRY_POINT_IS_BEHIND_SPACECRAFT);
}
- current = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
- if (tile.getLocation(current.getLatitude(), current.getLongitude()) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
- // the entry point is in another tile
- tile = cache.getTile(current.getLatitude(), current.getLongitude());
- hMax = FastMath.max(hMax, tile.getMaxElevation());
- current = null;
- }
+ } else {
+ current = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
+ }
+ if (tile.getLocation(current.getLatitude(), current.getLongitude()) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
+ // the entry point is in another tile
+ tile = cache.getTile(current.getLatitude(), current.getLongitude());
+ hMax = FastMath.max(hMax, tile.getMaxElevation());
+ current = null;
}
- // loop along the path
- while (true) {
-
- // find where line-of-sight exit tile
- final LimitPoint exit = findExit(tile, ellipsoid, position, los);
-
- // compute intersection with Digital Elevation Model
- final int entryLat = FastMath.max(0,
- FastMath.min(tile.getLatitudeRows() - 1,
- tile.getFloorLatitudeIndex(current.getLatitude())));
- final int entryLon = FastMath.max(0,
- FastMath.min(tile.getLongitudeColumns() - 1,
- tile.getFloorLongitudeIndex(current.getLongitude())));
- final int exitLat = FastMath.max(0,
- FastMath.min(tile.getLatitudeRows() - 1,
- tile.getFloorLatitudeIndex(exit.getPoint().getLatitude())));
- final int exitLon = FastMath.max(0,
- FastMath.min(tile.getLongitudeColumns() - 1,
- tile.getFloorLongitudeIndex(exit.getPoint().getLongitude())));
- NormalizedGeodeticPoint intersection = recurseIntersection(0, ellipsoid, position, los, tile,
- current, entryLat, entryLon,
- exit.getPoint(), exitLat, exitLon);
+ }
+
+ // loop along the path
+ while (true) {
+
+ // find where line-of-sight exit tile
+ final LimitPoint exit = findExit(tile, ellipsoid, position, los);
+
+ // compute intersection with Digital Elevation Model
+ final int entryLat = FastMath.max(0,
+ FastMath.min(tile.getLatitudeRows() - 1,
+ tile.getFloorLatitudeIndex(current.getLatitude())));
+ final int entryLon = FastMath.max(0,
+ FastMath.min(tile.getLongitudeColumns() - 1,
+ tile.getFloorLongitudeIndex(current.getLongitude())));
+ final int exitLat = FastMath.max(0,
+ FastMath.min(tile.getLatitudeRows() - 1,
+ tile.getFloorLatitudeIndex(exit.getPoint().getLatitude())));
+ final int exitLon = FastMath.max(0,
+ FastMath.min(tile.getLongitudeColumns() - 1,
+ tile.getFloorLongitudeIndex(exit.getPoint().getLongitude())));
+ NormalizedGeodeticPoint intersection = recurseIntersection(0, ellipsoid, position, los, tile,
+ current, entryLat, entryLon,
+ exit.getPoint(), exitLat, exitLon);
+
+ if (intersection != null) {
+ // we have found the intersection
+ return intersection;
+ } else if (exit.atSide()) {
+ // no intersection on this tile, we can proceed to next part of the line-of-sight
+
+ // select next tile after current point
+ final Vector3D forward = new Vector3D(1.0, ellipsoid.transform(exit.getPoint()), STEP, los);
+ current = ellipsoid.transform(forward, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
+ tile = cache.getTile(current.getLatitude(), current.getLongitude());
+
+ if (tile.interpolateElevation(current.getLatitude(), current.getLongitude()) >= current.getAltitude()) {
+ // extremely rare case! The line-of-sight traversed the Digital Elevation Model
+ // during the very short forward step we used to move to next tile
+ // we consider this point to be OK
+ return current;
+ }
+ } else {
+
+ // this should never happen
+ // we should have left the loop with an intersection point
+ // try a fallback non-recursive search
+ intersection = noRecurseIntersection(ellipsoid, position, los, tile,
+ current, entryLat, entryLon,
+ exitLat, exitLon);
if (intersection != null) {
- // we have found the intersection
return intersection;
- } else if (exit.atSide()) {
- // no intersection on this tile, we can proceed to next part of the line-of-sight
+ } else {
+ throw new RuggedInternalError(null);
+ }
+ }
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
+ final Vector3D position, final Vector3D los,
+ final NormalizedGeodeticPoint closeGuess) {
- // select next tile after current point
- final Vector3D forward = new Vector3D(1.0, ellipsoid.transform(exit.getPoint()), STEP, los);
- current = ellipsoid.transform(forward, ellipsoid.getBodyFrame(), null, tile.getMinimumLongitude());
- tile = cache.getTile(current.getLatitude(), current.getLongitude());
+ DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
+
+ if (flatBody) {
+ // under the (bad) flat-body assumption, the reference point must remain
+ // at DEM entry and exit, even if we already have a much better close guess :-(
+ // this is in order to remain consistent with other systems
+ final Tile tile = cache.getTile(closeGuess.getLatitude(), closeGuess.getLongitude());
+ final Vector3D exitP = ellipsoid.pointAtAltitude(position, los, tile.getMinElevation());
+ final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, tile.getMaxElevation());
+ final NormalizedGeodeticPoint entry = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null,
+ tile.getMinimumLongitude());
+ return tile.cellIntersection(entry, ellipsoid.convertLos(entryP, exitP),
+ tile.getFloorLatitudeIndex(closeGuess.getLatitude()),
+ tile.getFloorLongitudeIndex(closeGuess.getLongitude()));
- if (tile.interpolateElevation(current.getLatitude(), current.getLongitude()) >= current.getAltitude()) {
+ } else {
+ // regular curved ellipsoid model
+
+ NormalizedGeodeticPoint currentGuess = closeGuess;
+
+ // normally, we should succeed at first attempt but in very rare cases
+ // we may loose the intersection (typically because some corrections introduced
+ // between the first intersection and the refining have slightly changed the
+ // relative geometry between Digital Elevation Model and Line Of Sight).
+ // In these rare cases, we have to recover a new intersection
+ for (int i = 0; i < MAX_REFINING_ATTEMPTS; ++i) {
+
+ final Vector3D delta = ellipsoid.transform(currentGuess).subtract(position);
+ final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
+ final Vector3D projectedP = new Vector3D(1, position, s, los);
+ final GeodeticPoint projected = ellipsoid.transform(projectedP, ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint normalizedProjected =
+ new NormalizedGeodeticPoint(projected.getLatitude(),
+ projected.getLongitude(),
+ projected.getAltitude(),
+ currentGuess.getLongitude());
+ final Tile tile = cache.getTile(normalizedProjected.getLatitude(), normalizedProjected.getLongitude());
+
+ final Vector3D topoLOS = ellipsoid.convertLos(normalizedProjected, los);
+ final int iLat = tile.getFloorLatitudeIndex(normalizedProjected.getLatitude());
+ final int iLon = tile.getFloorLongitudeIndex(normalizedProjected.getLongitude());
+ final NormalizedGeodeticPoint foundIntersection = tile.cellIntersection(normalizedProjected, topoLOS, iLat, iLon);
+
+ if (foundIntersection != null) {
+ // nominal case, we were able to refine the intersection
+ return foundIntersection;
+ } else {
+ // extremely rare case: we have lost the intersection
+
+ // find a start point for new search, leaving the current cell behind
+ final double cellBoundaryLatitude = tile.getLatitudeAtIndex(topoLOS.getY() <= 0 ? iLat : iLat + 1);
+ final double cellBoundaryLongitude = tile.getLongitudeAtIndex(topoLOS.getX() <= 0 ? iLon : iLon + 1);
+ final Vector3D cellExit = new Vector3D(1, selectClosest(latitudeCrossing(ellipsoid, projectedP, los, cellBoundaryLatitude, projectedP),
+ longitudeCrossing(ellipsoid, projectedP, los, cellBoundaryLongitude, projectedP),
+ projectedP),
+ STEP, los);
+ final GeodeticPoint egp = ellipsoid.transform(cellExit, ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint cellExitGP = new NormalizedGeodeticPoint(egp.getLatitude(),
+ egp.getLongitude(),
+ egp.getAltitude(),
+ currentGuess.getLongitude());
+ if (tile.interpolateElevation(cellExitGP.getLatitude(), cellExitGP.getLongitude()) >= cellExitGP.getAltitude()) {
// extremely rare case! The line-of-sight traversed the Digital Elevation Model
- // during the very short forward step we used to move to next tile
+ // during the very short forward step we used to move to next cell
// we consider this point to be OK
- return current;
+ return cellExitGP;
}
- } else {
-
- // this should never happen
- // we should have left the loop with an intersection point
- // try a fallback non-recursive search
- intersection = noRecurseIntersection(ellipsoid, position, los, tile,
- current, entryLat, entryLon,
- exitLat, exitLon);
- if (intersection != null) {
- return intersection;
- } else {
- throw RuggedException.createInternalError(null);
- }
+ // We recompute fully a new guess, starting from the point after current cell
+ final GeodeticPoint currentGuessGP = intersection(ellipsoid, cellExit, los);
+ currentGuess = new NormalizedGeodeticPoint(currentGuessGP.getLatitude(),
+ currentGuessGP.getLongitude(),
+ currentGuessGP.getAltitude(),
+ projected.getLongitude());
}
-
}
+ // no intersection found
+ return null;
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public NormalizedGeodeticPoint refineIntersection(final ExtendedEllipsoid ellipsoid,
- final Vector3D position, final Vector3D los,
- final NormalizedGeodeticPoint closeGuess)
- throws RuggedException {
- try {
+ } // end test on flatbody
- DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
-
- if (flatBody) {
- // under the (bad) flat-body assumption, the reference point must remain
- // at DEM entry and exit, even if we already have a much better close guess :-(
- // this is in order to remain consistent with other systems
- final Tile tile = cache.getTile(closeGuess.getLatitude(), closeGuess.getLongitude());
- final Vector3D exitP = ellipsoid.pointAtAltitude(position, los, tile.getMinElevation());
- final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, tile.getMaxElevation());
- final NormalizedGeodeticPoint entry = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null,
- tile.getMinimumLongitude());
- return tile.cellIntersection(entry, ellipsoid.convertLos(entryP, exitP),
- tile.getFloorLatitudeIndex(closeGuess.getLatitude()),
- tile.getFloorLongitudeIndex(closeGuess.getLongitude()));
- } else {
- final Vector3D delta = ellipsoid.transform(closeGuess).subtract(position);
- final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
- final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
- ellipsoid.getBodyFrame(), null);
- final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
- projected.getLongitude(),
- projected.getAltitude(),
- closeGuess.getLongitude());
- final Tile tile = cache.getTile(normalizedProjected.getLatitude(),
- normalizedProjected.getLongitude());
- return tile.cellIntersection(normalizedProjected, ellipsoid.convertLos(normalizedProjected, los),
- tile.getFloorLatitudeIndex(normalizedProjected.getLatitude()),
- tile.getFloorLongitudeIndex(normalizedProjected.getLongitude()));
- }
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
}
/** {@inheritDoc} */
@Override
- public double getElevation(final double latitude, final double longitude)
- throws RuggedException {
+ public double getElevation(final double latitude, final double longitude) {
+
DumpManager.dumpAlgorithm(flatBody ? AlgorithmId.DUVENHAGE_FLAT_BODY : AlgorithmId.DUVENHAGE);
final Tile tile = cache.getTile(latitude, longitude);
return tile.interpolateElevation(latitude, longitude);
@@ -235,19 +303,16 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param exitLon index to use for interpolating exit point elevation
* @return point at which the line first enters ground, or null if does not enter
* ground in the search sub-tile
- * @exception RuggedException if intersection cannot be found
- * @exception OrekitException if points cannot be converted to geodetic coordinates
*/
private NormalizedGeodeticPoint recurseIntersection(final int depth, final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
final MinMaxTreeTile tile,
final NormalizedGeodeticPoint entry, final int entryLat, final int entryLon,
- final NormalizedGeodeticPoint exit, final int exitLat, final int exitLon)
- throws RuggedException, OrekitException {
+ final NormalizedGeodeticPoint exit, final int exitLat, final int exitLon) {
if (depth > 30) {
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
if (searchDomainSize(entryLat, entryLon, exitLat, exitLon) < 4) {
@@ -289,7 +354,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
final Vector3D crossingP = ellipsoid.pointAtLongitude(position, los, longitude);
crossingGP = ellipsoid.transform(crossingP, ellipsoid.getBodyFrame(), null,
tile.getMinimumLongitude());
- } catch (RuggedException re) {
+ } catch (RuggedException re) {
// in some very rare cases of numerical noise, we miss the crossing point
crossingGP = null;
}
@@ -359,7 +424,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
ellipsoid.transform(entry));
crossingGP = ellipsoid.transform(crossingP, ellipsoid.getBodyFrame(), null,
tile.getMinimumLongitude());
- } catch (RuggedException re) {
+ } catch (RuggedException re) {
// in some very rare cases of numerical noise, we miss the crossing point
crossingGP = null;
}
@@ -441,16 +506,13 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param exitLon index to use for interpolating exit point elevation
* @return point at which the line first enters ground, or null if does not enter
* ground in the search sub-tile
- * @exception RuggedException if intersection cannot be found
- * @exception OrekitException if points cannot be converted to geodetic coordinates
*/
private NormalizedGeodeticPoint noRecurseIntersection(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
final MinMaxTreeTile tile,
final NormalizedGeodeticPoint entry,
final int entryLat, final int entryLon,
- final int exitLat, final int exitLon)
- throws OrekitException, RuggedException {
+ final int exitLat, final int exitLon) {
NormalizedGeodeticPoint intersectionGP = null;
double intersectionDot = Double.POSITIVE_INFINITY;
@@ -460,24 +522,26 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
if (gp != null) {
// improve the point, by projecting it back on the 3D line, fixing the small body curvature at cell level
- final Vector3D delta = ellipsoid.transform(gp).subtract(position);
- final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
- final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
- ellipsoid.getBodyFrame(), null);
- final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
- projected.getLongitude(),
- projected.getAltitude(),
- gp.getLongitude());
- final NormalizedGeodeticPoint gpImproved = tile.cellIntersection(normalizedProjected,
- ellipsoid.convertLos(normalizedProjected, los),
- i, j);
-
- if (gpImproved != null) {
- final Vector3D point = ellipsoid.transform(gpImproved);
- final double dot = Vector3D.dotProduct(point.subtract(position), los);
- if (dot < intersectionDot) {
- intersectionGP = gpImproved;
- intersectionDot = dot;
+ final Vector3D delta = ellipsoid.transform(gp).subtract(position);
+ final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
+ if (s > 0) {
+ final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
+ ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint normalizedProjected = new NormalizedGeodeticPoint(projected.getLatitude(),
+ projected.getLongitude(),
+ projected.getAltitude(),
+ gp.getLongitude());
+ final NormalizedGeodeticPoint gpImproved = tile.cellIntersection(normalizedProjected,
+ ellipsoid.convertLos(normalizedProjected, los),
+ i, j);
+
+ if (gpImproved != null) {
+ final Vector3D point = ellipsoid.transform(gpImproved);
+ final double dot = Vector3D.dotProduct(point.subtract(position), los);
+ if (dot < intersectionDot) {
+ intersectionGP = gpImproved;
+ intersectionDot = dot;
+ }
}
}
@@ -517,12 +581,9 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param position pixel position in ellipsoid frame
* @param los pixel line-of-sight in ellipsoid frame
* @return exit point
- * @exception RuggedException if exit point cannot be found
- * @exception OrekitException if geodetic coordinates cannot be computed
*/
private LimitPoint findExit(final Tile tile, final ExtendedEllipsoid ellipsoid,
- final Vector3D position, final Vector3D los)
- throws RuggedException, OrekitException {
+ final Vector3D position, final Vector3D los) {
// look for an exit at bottom
final double reference = tile.getMinimumLongitude();
@@ -575,7 +636,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
default :
// this should never happen
- throw RuggedException.createInternalError(null);
+ throw new RuggedInternalError(null);
}
}
@@ -597,7 +658,7 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param latitude latitude with respect to ellipsoid
* @param closeReference reference point used to select the closest solution
* when there are two points at the desired latitude along the line
- * @return point at altitude, or closeReference if no such point can be found
+ * @return point at latitude, or closeReference if no such point can be found
*/
private Vector3D latitudeCrossing(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
@@ -615,8 +676,8 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param los pixel line-of-sight, not necessarily normalized (in body frame)
* @param longitude longitude with respect to ellipsoid
* @param closeReference reference point used to select the closest solution
- * when there are two points at the desired latitude along the line
- * @return point at altitude, or closeReference if no such point can be found
+ * when there are two points at the desired longitude along the line
+ * @return point at longitude, or closeReference if no such point can be found
*/
private Vector3D longitudeCrossing(final ExtendedEllipsoid ellipsoid,
final Vector3D position, final Vector3D los,
@@ -644,11 +705,9 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
* @param cartesian Cartesian point
* @param side if true, the point is on a side limit, otherwise
* it is on a top/bottom limit
- * @exception OrekitException if geodetic coordinates cannot be computed
*/
LimitPoint(final ExtendedEllipsoid ellipsoid, final double referenceLongitude,
- final Vector3D cartesian, final boolean side)
- throws OrekitException {
+ final Vector3D cartesian, final boolean side) {
this(ellipsoid.transform(cartesian, ellipsoid.getBodyFrame(), null, referenceLongitude), side);
}
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
index 51f7a94b5a45fd6e4a3f0f22c3f8ad6263f2b006..c56754a04103e49922494583b51f3822b8586711 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
index ba43270536aa96345ae749ddeae98b13a3bbcff8..ddf6677bbf0ce9407bbbbde6b924e97f4377a447 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/linesensor/LineDatation.java b/src/main/java/org/orekit/rugged/linesensor/LineDatation.java
index 4147815c0cbaa5d2880db33b9f7d6ad7c005f859..903474a729efa44e4fad3c0b5bcf2070e1a7675c 100644
--- a/src/main/java/org/orekit/rugged/linesensor/LineDatation.java
+++ b/src/main/java/org/orekit/rugged/linesensor/LineDatation.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/linesensor/LineSensor.java b/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
index cdb946d8ffb6de438b3f2c51e559b5a50f647c19..9f4569b4833c4c9945633a3a137620977699a253 100644
--- a/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
+++ b/src/main/java/org/orekit/rugged/linesensor/LineSensor.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -23,7 +23,6 @@ import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.rugged.errors.DumpManager;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.rugged.utils.DSGenerator;
import org.orekit.time.AbsoluteDate;
@@ -90,10 +89,8 @@ public class LineSensor {
* @param date current date
* @param i pixel index (must be between 0 and {@link #getNbPixels()} - 1
* @return pixel normalized line-of-sight
- * @exception RuggedException if date cannot be handled
*/
- public Vector3D getLOS(final AbsoluteDate date, final int i)
- throws RuggedException {
+ public Vector3D getLOS(final AbsoluteDate date, final int i) {
final Vector3D l = los.getLOS(i, date);
DumpManager.dumpSensorLOS(this, date, i, l);
return l;
@@ -103,11 +100,9 @@ public class LineSensor {
* @param date current date
* @param i pixel index (must be between 0 and {@link #getNbPixels()} - 1
* @return pixel normalized line-of-sight
- * @exception RuggedException if date cannot be handled
* @since 2.0
*/
- public Vector3D getLOS(final AbsoluteDate date, final double i)
- throws RuggedException {
+ public Vector3D getLOS(final AbsoluteDate date, final double i) {
final int iInf = FastMath.max(0, FastMath.min(getNbPixels() - 2, (int) FastMath.floor(i)));
final int iSup = iInf + 1;
@@ -155,10 +150,8 @@ public class LineSensor {
/** Get the date.
* @param lineNumber line number
* @return date corresponding to line number
- * @exception RuggedException if date cannot be handled
*/
- public AbsoluteDate getDate(final double lineNumber)
- throws RuggedException {
+ public AbsoluteDate getDate(final double lineNumber) {
final AbsoluteDate date = datationModel.getDate(lineNumber);
DumpManager.dumpSensorDatation(this, lineNumber, date);
return date;
@@ -167,10 +160,8 @@ public class LineSensor {
/** Get the line number.
* @param date date
* @return line number corresponding to date
- * @exception RuggedException if date cannot be handled
*/
- public double getLine(final AbsoluteDate date)
- throws RuggedException {
+ public double getLine(final AbsoluteDate date) {
final double lineNumber = datationModel.getLine(date);
DumpManager.dumpSensorDatation(this, lineNumber, date);
return lineNumber;
@@ -193,4 +184,11 @@ public class LineSensor {
return position;
}
+ /** Dump the rate for the current line number.
+ * @param lineNumber line number
+ */
+ public void dumpRate(final double lineNumber) {
+ final double rate = datationModel.getRate(lineNumber);
+ DumpManager.dumpSensorRate(this, lineNumber, rate);
+ }
}
diff --git a/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java b/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java
index 0f890c2d1f58203ee75be1192f7e2948d83b2860..a073a17c3938f749c81d48f1b67f730c7a83451e 100644
--- a/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java
+++ b/src/main/java/org/orekit/rugged/linesensor/LinearLineDatation.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java b/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java
index 28aa64063f7243ca8958e2109d4fdfbf9c9715c4..d737a401edbd609eada887c943925a1cc50d344d 100644
--- a/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java
+++ b/src/main/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossing.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -38,7 +38,7 @@ import org.hipparchus.util.FastMath;
import org.hipparchus.util.Precision;
import org.orekit.frames.Transform;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.Constants;
@@ -103,15 +103,13 @@ public class SensorMeanPlaneCrossing {
* @param aberrationOfLightCorrection flag for aberration of light correction.
* @param maxEval maximum number of evaluations
* @param accuracy accuracy to use for finding crossing line number
- * @exception RuggedException if some frame conversion fails
*/
public SensorMeanPlaneCrossing(final LineSensor sensor,
final SpacecraftToObservedBody scToBody,
final int minLine, final int maxLine,
final boolean lightTimeCorrection,
final boolean aberrationOfLightCorrection,
- final int maxEval, final double accuracy)
- throws RuggedException {
+ final int maxEval, final double accuracy) {
this(sensor, scToBody, minLine, maxLine, lightTimeCorrection, aberrationOfLightCorrection,
maxEval, accuracy, computeMeanPlaneNormal(sensor, minLine, maxLine),
Stream.<CrossingResult>empty());
@@ -128,7 +126,6 @@ public class SensorMeanPlaneCrossing {
* @param accuracy accuracy to use for finding crossing line number
* @param meanPlaneNormal mean plane normal
* @param cachedResults cached results
- * @exception RuggedException if some frame conversion fails
*/
public SensorMeanPlaneCrossing(final LineSensor sensor,
final SpacecraftToObservedBody scToBody,
@@ -137,8 +134,7 @@ public class SensorMeanPlaneCrossing {
final boolean aberrationOfLightCorrection,
final int maxEval, final double accuracy,
final Vector3D meanPlaneNormal,
- final Stream<CrossingResult> cachedResults)
- throws RuggedException {
+ final Stream<CrossingResult> cachedResults) {
this.sensor = sensor;
this.minLine = minLine;
@@ -174,10 +170,8 @@ public class SensorMeanPlaneCrossing {
* order corresponds to trigonometric order (i.e. counterclockwise).
* </p>
* @return normal of the mean plane
- * @exception RuggedException if mid date cannot be handled
*/
- private static Vector3D computeMeanPlaneNormal(final LineSensor sensor, final int minLine, final int maxLine)
- throws RuggedException {
+ private static Vector3D computeMeanPlaneNormal(final LineSensor sensor, final int minLine, final int maxLine) {
final AbsoluteDate midDate = sensor.getDate(0.5 * (minLine + maxLine));
@@ -355,11 +349,8 @@ public class SensorMeanPlaneCrossing {
* @param target target ground point
* @return line number and target direction at mean plane crossing,
* or null if search interval does not bracket a solution
- * @exception RuggedException if geometry cannot be computed for some line or
- * if the maximum number of evaluations is exceeded
*/
- public CrossingResult find(final Vector3D target)
- throws RuggedException {
+ public CrossingResult find(final Vector3D target) {
double crossingLine = midLine;
Transform bodyToInert = midBodyToInert;
@@ -524,13 +515,10 @@ public class SensorMeanPlaneCrossing {
* @param initialGuess initial guess for the crossing line
* @return line number and target direction at mean plane crossing,
* or null if search interval does not bracket a solution
- * @exception RuggedException if geometry cannot be computed for some line or
- * if the maximum number of evaluations is exceeded
*/
- private CrossingResult slowFind(final PVCoordinates targetPV, final double initialGuess)
- throws RuggedException {
- try {
+ private CrossingResult slowFind(final PVCoordinates targetPV, final double initialGuess) {
+ try {
// safety check
final double startValue;
if (initialGuess < minLine || initialGuess > maxLine) {
@@ -540,17 +528,17 @@ public class SensorMeanPlaneCrossing {
}
final UnivariateSolver solver = new BracketingNthOrderBrentSolver(accuracy, 5);
- double crossingLine = solver.solve(maxEval, new UnivariateFunction() {
+ final double crossingLine = solver.solve(maxEval, new UnivariateFunction() {
/** {@inheritDoc} */
@Override
- public double value(final double x) throws RuggedExceptionWrapper {
+ public double value(final double x) {
try {
final AbsoluteDate date = sensor.getDate(x);
final Vector3D[] targetDirection =
evaluateLine(x, targetPV, scToBody.getBodyToInertial(date), scToBody.getScToInertial(date));
return 0.5 * FastMath.PI - FastMath.acos(Vector3D.dotProduct(targetDirection[0], meanPlaneNormal));
} catch (RuggedException re) {
- throw new RuggedExceptionWrapper(re);
+ throw new RuggedInternalError(re);
}
}
}, minLine, maxLine, startValue);
@@ -563,8 +551,6 @@ public class SensorMeanPlaneCrossing {
} catch (MathIllegalArgumentException nbe) {
return null;
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
}
}
diff --git a/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java b/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java
index d614931dde790af9ecfb8cb4961c6244b146fc9f..a0f65e239573330d40221e3778e5310368d77ede 100644
--- a/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java
+++ b/src/main/java/org/orekit/rugged/linesensor/SensorPixel.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java b/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java
index 2d0e3c13b7fe1fdd71a893f23d988081edae84dc..0ae635599a68475f86fffacefd21628b3baab9d1 100644
--- a/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java
+++ b/src/main/java/org/orekit/rugged/linesensor/SensorPixelCrossing.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -23,7 +23,7 @@ import org.hipparchus.exception.MathIllegalArgumentException;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
+import org.orekit.rugged.errors.RuggedInternalError;
import org.orekit.time.AbsoluteDate;
/** Class devoted to locate where ground point crosses a sensor line.
@@ -69,20 +69,19 @@ public class SensorPixelCrossing {
* @param date current date
* @return pixel location ({@code Double.NaN} if the first and last
* pixels of the line do not bracket a location)
- * @exception RuggedException if the maximum number of evaluations is exceeded
*/
- public double locatePixel(final AbsoluteDate date) throws RuggedException {
+ public double locatePixel(final AbsoluteDate date) {
try {
// set up function evaluating to 0.0 where target matches pixel
final UnivariateFunction f = new UnivariateFunction() {
/** {@inheritDoc} */
@Override
- public double value(final double x) throws RuggedExceptionWrapper {
+ public double value(final double x) {
try {
return Vector3D.angle(cross, getLOS(date, x)) - 0.5 * FastMath.PI;
} catch (RuggedException re) {
- throw new RuggedExceptionWrapper(re);
+ throw new RuggedInternalError(re);
}
}
};
@@ -95,8 +94,6 @@ public class SensorPixelCrossing {
} catch (MathIllegalArgumentException nbe) {
// there are no solutions in the search interval
return Double.NaN;
- } catch (RuggedExceptionWrapper rew) {
- throw rew.getException();
}
}
@@ -104,10 +101,8 @@ public class SensorPixelCrossing {
* @param date current date
* @param x pixel index
* @return interpolated direction for specified index
- * @exception RuggedException if date cannot be handled
*/
- private Vector3D getLOS(final AbsoluteDate date, final double x)
- throws RuggedException {
+ private Vector3D getLOS(final AbsoluteDate date, final double x) {
// find surrounding pixels
final int iInf = FastMath.max(0, FastMath.min(sensor.getNbPixels() - 2, (int) FastMath.floor(x)));
diff --git a/src/main/java/org/orekit/rugged/los/FixedRotation.java b/src/main/java/org/orekit/rugged/los/FixedRotation.java
index 0739913012b7f151443dd4f2c27a3d5ec0a823d8..83ab388c215b6e928446a7ec3fb7453fabd4b4ed 100644
--- a/src/main/java/org/orekit/rugged/los/FixedRotation.java
+++ b/src/main/java/org/orekit/rugged/los/FixedRotation.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -25,8 +25,6 @@ import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
-import org.orekit.errors.OrekitException;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.utils.DSGenerator;
import org.orekit.utils.ParameterDriver;
import org.orekit.utils.ParameterObserver;
@@ -66,23 +64,19 @@ public class FixedRotation implements TimeIndependentLOSTransform {
* @param angle rotation angle
*/
public FixedRotation(final String name, final Vector3D axis, final double angle) {
+
this.axis = axis;
this.rotation = null;
this.rDS = null;
- try {
- this.angleDriver = new ParameterDriver(name, angle, SCALE, -2 * FastMath.PI, 2 * FastMath.PI);
- angleDriver.addObserver(new ParameterObserver() {
- @Override
- public void valueChanged(final double previousValue, final ParameterDriver driver) {
- // reset rotations to null, they will be evaluated lazily if needed
- rotation = null;
- rDS = null;
- }
- });
- } catch (OrekitException oe) {
- // this should never happen
- throw RuggedException.createInternalError(oe);
- }
+ this.angleDriver = new ParameterDriver(name, angle, SCALE, -2 * FastMath.PI, 2 * FastMath.PI);
+ angleDriver.addObserver(new ParameterObserver() {
+ @Override
+ public void valueChanged(final double previousValue, final ParameterDriver driver) {
+ // reset rotations to null, they will be evaluated lazily if needed
+ rotation = null;
+ rDS = null;
+ }
+ });
}
/** {@inheritDoc} */
diff --git a/src/main/java/org/orekit/rugged/los/FixedZHomothety.java b/src/main/java/org/orekit/rugged/los/FixedZHomothety.java
index 8b05b494811b879d7c200349d6d5524c6aab8c0a..d27e544d8a248a8fab533a548bb52387bf36c755 100644
--- a/src/main/java/org/orekit/rugged/los/FixedZHomothety.java
+++ b/src/main/java/org/orekit/rugged/los/FixedZHomothety.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,14 +22,11 @@ import org.hipparchus.analysis.differentiation.DerivativeStructure;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
-import org.orekit.errors.OrekitException;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.utils.DSGenerator;
import org.orekit.utils.ParameterDriver;
import org.orekit.utils.ParameterObserver;
/** {@link TimeIndependentLOSTransform LOS transform} based on a homothety along the Z axis.
- * inspired from FixedZHomothety / s2geolib
* @author Lucie Labatallee
* @author Guylaine Prat
* @see LOSBuilder
@@ -62,22 +59,18 @@ public class FixedZHomothety implements TimeIndependentLOSTransform {
* @param factorvalue homothety factor
*/
public FixedZHomothety(final String name, final double factorvalue) {
+
this.factor = factorvalue;
this.factorDS = null;
- try {
- this.factorDriver = new ParameterDriver(name, factorvalue, SCALE, 0, Double.POSITIVE_INFINITY);
- factorDriver.addObserver(new ParameterObserver() {
- @Override
- public void valueChanged(final double previousValue, final ParameterDriver driver) {
- // reset factor to zero, they will be evaluated lazily if needed
- factor = 0.0;
- factorDS = null;
- }
- });
- } catch (OrekitException oe) {
- // this should never happen
- throw RuggedException.createInternalError(oe);
- }
+ this.factorDriver = new ParameterDriver(name, factorvalue, SCALE, 0, Double.POSITIVE_INFINITY);
+ factorDriver.addObserver(new ParameterObserver() {
+ @Override
+ public void valueChanged(final double previousValue, final ParameterDriver driver) {
+ // reset factor to zero, they will be evaluated lazily if needed
+ factor = 0.0;
+ factorDS = null;
+ }
+ });
}
/** {@inheritDoc} */
diff --git a/src/main/java/org/orekit/rugged/los/LOSBuilder.java b/src/main/java/org/orekit/rugged/los/LOSBuilder.java
index 7e70b0a3020b3425be79f1a917a4fa77d60eb838..9ff9c2406bba2ce48391692eda580f20b6e00bc4 100644
--- a/src/main/java/org/orekit/rugged/los/LOSBuilder.java
+++ b/src/main/java/org/orekit/rugged/los/LOSBuilder.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -24,8 +24,6 @@ import java.util.stream.Stream;
import org.hipparchus.analysis.differentiation.DerivativeStructure;
import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.orekit.errors.OrekitException;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.utils.DSGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -51,7 +49,7 @@ import org.orekit.utils.ParameterObserver;
*/
public class LOSBuilder {
- /** Raw fixed ine-of-sights. */
+ /** Raw fixed line-of-sights. */
private final List<Vector3D> rawLOS;
/** Transforms to be applied. */
@@ -234,14 +232,8 @@ public class LOSBuilder {
}
};
getParametersDrivers().forEach(driver -> {
- try {
- driver.addObserver(resettingObserver);
- } catch (OrekitException oe) {
- // this should never happen
- throw RuggedException.createInternalError(oe);
- }
+ driver.addObserver(resettingObserver);
});
-
}
/** {@inheritDoc} */
diff --git a/src/main/java/org/orekit/rugged/los/LOSTransform.java b/src/main/java/org/orekit/rugged/los/LOSTransform.java
index 86aebb4349fd3f82d5caf1aed8a81bf9489076d4..62e6bd1fe15913aa07b02b2128640d57a3e1e7b9 100644
--- a/src/main/java/org/orekit/rugged/los/LOSTransform.java
+++ b/src/main/java/org/orekit/rugged/los/LOSTransform.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/los/PolynomialRotation.java b/src/main/java/org/orekit/rugged/los/PolynomialRotation.java
index 3a978793042940e57c7407e8a6f4b7955aa25c3d..9bdcbdb1c80dcce8dc10bc321e78b65fad18c932 100644
--- a/src/main/java/org/orekit/rugged/los/PolynomialRotation.java
+++ b/src/main/java/org/orekit/rugged/los/PolynomialRotation.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -26,8 +26,6 @@ import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
-import org.orekit.errors.OrekitException;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.utils.DSGenerator;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.ParameterDriver;
@@ -94,15 +92,10 @@ public class PolynomialRotation implements LOSTransform {
angleDS = null;
}
};
- try {
- for (int i = 0; i < angleCoeffs.length; ++i) {
- coefficientsDrivers[i] = new ParameterDriver(name + "[" + i + "]", angleCoeffs[i], SCALE,
- Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY);
- coefficientsDrivers[i].addObserver(resettingObserver);
- }
- } catch (OrekitException oe) {
- // this should never happen
- throw RuggedException.createInternalError(oe);
+ for (int i = 0; i < angleCoeffs.length; ++i) {
+ coefficientsDrivers[i] = new ParameterDriver(name + "[" + i + "]", angleCoeffs[i], SCALE,
+ Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY);
+ coefficientsDrivers[i].addObserver(resettingObserver);
}
}
diff --git a/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java b/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java
index e069995e0ae672c45628ef1b2e7bb9792a8580b4..08aca9937f58478d280dbdec46c6a4c5f671c6e6 100644
--- a/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java
+++ b/src/main/java/org/orekit/rugged/los/TimeDependentLOS.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java b/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java
index 424c146cab7f124f6471964290f8f826d9c99ab0..f1abc03f3e1278c075620bd083fa454a3e453943 100644
--- a/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java
+++ b/src/main/java/org/orekit/rugged/los/TimeIndependentLOSTransform.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/raster/SimpleTile.java b/src/main/java/org/orekit/rugged/raster/SimpleTile.java
index a93018822f44a3d30a64e090fce1caedbee88c5e..5db49b4e9a39f3976aeb54029f43eb4fef3421f0 100644
--- a/src/main/java/org/orekit/rugged/raster/SimpleTile.java
+++ b/src/main/java/org/orekit/rugged/raster/SimpleTile.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -33,6 +33,7 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/** Simple implementation of a {@link Tile}.
* @see SimpleTileFactory
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public class SimpleTile implements Tile {
@@ -90,8 +91,7 @@ public class SimpleTile implements Tile {
@Override
public void setGeometry(final double newMinLatitude, final double newMinLongitude,
final double newLatitudeStep, final double newLongitudeStep,
- final int newLatitudeRows, final int newLongitudeColumns)
- throws RuggedException {
+ final int newLatitudeRows, final int newLongitudeColumns) {
this.minLatitude = newMinLatitude;
this.minLongitude = newMinLongitude;
this.latitudeStep = newLatitudeStep;
@@ -115,7 +115,7 @@ public class SimpleTile implements Tile {
/** {@inheritDoc} */
@Override
- public void tileUpdateCompleted() throws RuggedException {
+ public void tileUpdateCompleted() {
processUpdatedElevation(elevations);
}
@@ -229,8 +229,8 @@ public class SimpleTile implements Tile {
/** {@inheritDoc} */
@Override
- public void setElevation(final int latitudeIndex, final int longitudeIndex, final double elevation)
- throws RuggedException {
+ public void setElevation(final int latitudeIndex, final int longitudeIndex, final double elevation) {
+
if (latitudeIndex < 0 || latitudeIndex > (latitudeRows - 1) ||
longitudeIndex < 0 || longitudeIndex > (longitudeColumns - 1)) {
throw new RuggedException(RuggedMessages.OUT_OF_TILE_INDICES,
@@ -265,8 +265,7 @@ public class SimpleTile implements Tile {
* </p>
*/
@Override
- public double interpolateElevation(final double latitude, final double longitude)
- throws RuggedException {
+ public double interpolateElevation(final double latitude, final double longitude) {
final double doubleLatitudeIndex = getDoubleLatitudeIndex(latitude);
final double doubleLongitudeIndex = getDoubleLontitudeIndex(longitude);
@@ -304,8 +303,7 @@ public class SimpleTile implements Tile {
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint cellIntersection(final GeodeticPoint p, final Vector3D los,
- final int latitudeIndex, final int longitudeIndex)
- throws RuggedException {
+ final int latitudeIndex, final int longitudeIndex) {
// ensure neighboring cells to not fall out of tile
final int iLat = FastMath.max(0, FastMath.min(latitudeRows - 2, latitudeIndex));
@@ -428,15 +426,15 @@ public class SimpleTile implements Tile {
}
/** Get the latitude index of a point.
- * @param latitude geodetic latitude
- * @return latitute index (it may lie outside of the tile!)
+ * @param latitude geodetic latitude (rad)
+ * @return latitude index (it may lie outside of the tile!)
*/
private double getDoubleLatitudeIndex(final double latitude) {
return (latitude - minLatitude) / latitudeStep;
}
/** Get the longitude index of a point.
- * @param longitude geodetic latitude
+ * @param longitude geodetic longitude (rad)
* @return longitude index (it may lie outside of the tile!)
*/
private double getDoubleLontitudeIndex(final double longitude) {
diff --git a/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java b/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
index b079428b3dd2f75aecf56f438a1e197e216ec111..b05b7cd361bb4adab2921da78bafc607ac139b1e 100644
--- a/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
+++ b/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/raster/Tile.java b/src/main/java/org/orekit/rugged/raster/Tile.java
index d1369d2edf888d3e46a4f437692c44652364de1d..634da34d6b56a4247aeca5a2958dcff375df63be 100644
--- a/src/main/java/org/orekit/rugged/raster/Tile.java
+++ b/src/main/java/org/orekit/rugged/raster/Tile.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -18,7 +18,6 @@ package org.orekit.rugged.raster;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/** Interface representing a raster tile.
@@ -29,6 +28,7 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
* correspond to the <em>center</em> of the most North-East cell.
* </p>
* @author Luc Maisonobe
+ * @author Guylaine Prat
*/
public interface Tile extends UpdatableTile {
@@ -113,20 +113,18 @@ public interface Tile extends UpdatableTile {
}
/** Hook called at the end of tile update completion.
- * @exception RuggedException if something wrong occurs
- * (missing data ...)
*/
- void tileUpdateCompleted() throws RuggedException;
+ void tileUpdateCompleted();
/** Get minimum latitude of grid interpolation points.
- * @return minimum latitude of grid interpolation points
+ * @return minimum latitude of grid interpolation points (rad)
* (latitude of the center of the cells of South row)
*/
double getMinimumLatitude();
/** Get the latitude at some index.
* @param latitudeIndex latitude index
- * @return latitude at the specified index
+ * @return latitude at the specified index (rad)
* (latitude of the center of the cells of specified row)
*/
double getLatitudeAtIndex(int latitudeIndex);
@@ -140,20 +138,20 @@ public interface Tile extends UpdatableTile {
* {@link Location#NORTH} or {@link Location#NORTH_EAST}, but can
* <em>never</em> return {@link Location#HAS_INTERPOLATION_NEIGHBORS}!
* </p>
- * @return maximum latitude
+ * @return maximum latitude (rad)
* (latitude of the center of the cells of North row)
*/
double getMaximumLatitude();
/** Get minimum longitude.
- * @return minimum longitude
+ * @return minimum longitude (rad)
* (longitude of the center of the cells of West column)
*/
double getMinimumLongitude();
/** Get the longitude at some index.
* @param longitudeIndex longitude index
- * @return longitude at the specified index
+ * @return longitude at the specified index (rad)
* (longitude of the center of the cells of specified column)
*/
double getLongitudeAtIndex(int longitudeIndex);
@@ -167,18 +165,18 @@ public interface Tile extends UpdatableTile {
* {@link Location#EAST} or {@link Location#NORTH_EAST}, but can
* <em>never</em> return {@link Location#HAS_INTERPOLATION_NEIGHBORS}!
* </p>
- * @return maximum longitude
+ * @return maximum longitude (rad)
* (longitude of the center of the cells of East column)
*/
double getMaximumLongitude();
/** Get step in latitude (size of one raster element).
- * @return step in latitude
+ * @return step in latitude (rad)
*/
double getLatitudeStep();
/** Get step in longitude (size of one raster element).
- * @return step in longitude
+ * @return step in longitude (rad)
*/
double getLongitudeStep();
@@ -211,7 +209,7 @@ public interface Tile extends UpdatableTile {
int getFloorLongitudeIndex(double longitude);
/** Get the minimum elevation in the tile.
- * @return minimum elevation in the tile
+ * @return minimum elevation in the tile (m)
*/
double getMinElevation();
@@ -224,7 +222,7 @@ public interface Tile extends UpdatableTile {
int getMinElevationLongitudeIndex();
/** Get the maximum elevation in the tile.
- * @return maximum elevation in the tile
+ * @return maximum elevation in the tile (m)
*/
double getMaxElevation();
@@ -239,11 +237,9 @@ public interface Tile extends UpdatableTile {
/** Get the elevation of an exact grid point.
* @param latitudeIndex grid point index along latitude
* @param longitudeIndex grid point index along longitude
- * @return elevation at grid point
- * @exception RuggedException if indices are out of bound
+ * @return elevation at grid point (m)
*/
- double getElevationAtIndices(int latitudeIndex, int longitudeIndex)
- throws RuggedException;
+ double getElevationAtIndices(int latitudeIndex, int longitudeIndex);
/** Interpolate elevation.
* <p>
@@ -256,11 +252,9 @@ public interface Tile extends UpdatableTile {
* </p>
* @param latitude ground point latitude
* @param longitude ground point longitude
- * @return interpolated elevation
- * @exception RuggedException if point is farthest from the tile than the tolerance
+ * @return interpolated elevation (m)
*/
- double interpolateElevation(double latitude, double longitude)
- throws RuggedException;
+ double interpolateElevation(double latitude, double longitude);
/** Find the intersection of a line-of-sight and a Digital Elevation Model cell.
* @param p point on the line
@@ -270,11 +264,9 @@ public interface Tile extends UpdatableTile {
* @param longitudeIndex longitude index of the Digital Elevation Model cell
* @return point corresponding to line-of-sight crossing the Digital Elevation Model surface
* if it lies within the cell, null otherwise
- * @exception RuggedException if intersection point cannot be computed
*/
NormalizedGeodeticPoint cellIntersection(GeodeticPoint p, Vector3D los,
- int latitudeIndex, int longitudeIndex)
- throws RuggedException;
+ int latitudeIndex, int longitudeIndex);
/** Check if a tile covers a ground point.
* @param latitude ground point latitude
diff --git a/src/main/java/org/orekit/rugged/raster/TileFactory.java b/src/main/java/org/orekit/rugged/raster/TileFactory.java
index ed62cd34d9aeeac86c803e6d5a06ff0814788157..19cef8ebfd50f3f09f5a2661b51eee128f27a950 100644
--- a/src/main/java/org/orekit/rugged/raster/TileFactory.java
+++ b/src/main/java/org/orekit/rugged/raster/TileFactory.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/raster/TileUpdater.java b/src/main/java/org/orekit/rugged/raster/TileUpdater.java
index c76c96a8e138fa53bc4a3efb996a087201f8202c..659942f1357ec736ad3249b096508891805e2444 100644
--- a/src/main/java/org/orekit/rugged/raster/TileUpdater.java
+++ b/src/main/java/org/orekit/rugged/raster/TileUpdater.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,8 +16,6 @@
*/
package org.orekit.rugged.raster;
-import org.orekit.rugged.errors.RuggedException;
-
/** Interface used to update Digital Elevation Model tiles.
* <p>
* Implementations of this interface are must be provided by
@@ -80,9 +78,7 @@ public interface TileUpdater {
* @param latitude latitude that must be covered by the tile (rad)
* @param longitude longitude that must be covered by the tile (rad)
* @param tile to update
- * @exception RuggedException if tile cannot be updated
*/
- void updateTile(double latitude, double longitude, UpdatableTile tile)
- throws RuggedException;
+ void updateTile(double latitude, double longitude, UpdatableTile tile);
}
diff --git a/src/main/java/org/orekit/rugged/raster/TilesCache.java b/src/main/java/org/orekit/rugged/raster/TilesCache.java
index 11712412ffd77cb867ad05b306b74fa750f0fbde..528048e17c4297f8fb9609498e1429e14de3d2fd 100644
--- a/src/main/java/org/orekit/rugged/raster/TilesCache.java
+++ b/src/main/java/org/orekit/rugged/raster/TilesCache.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -19,6 +19,7 @@ package org.orekit.rugged.raster;
import org.hipparchus.util.FastMath;
import java.lang.reflect.Array;
+import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
@@ -57,10 +58,8 @@ public class TilesCache<T extends Tile> {
* @param latitude ground point latitude
* @param longitude ground point longitude
* @return tile covering the ground point
- * @exception RuggedException if newly created tile cannot be updated
*/
- public T getTile(final double latitude, final double longitude)
- throws RuggedException {
+ public T getTile(final double latitude, final double longitude) {
for (int i = 0; i < tiles.length; ++i) {
final T tile = tiles[i];
@@ -88,7 +87,16 @@ public class TilesCache<T extends Tile> {
// create the tile and retrieve its data
final T tile = factory.createTile();
+
+ // In case dump is asked for, suspend the dump manager as we don't need to dump anything here
+ // For instance for SRTM DEM, the user needs to read Geoid data that are not useful in the dump
+ final Boolean wasSuspended = DumpManager.suspend();
+
updater.updateTile(latitude, longitude, tile);
+
+ // Resume the dump manager if necessary
+ DumpManager.resume(wasSuspended);
+
tile.tileUpdateCompleted();
if (tile.getLocation(latitude, longitude) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
diff --git a/src/main/java/org/orekit/rugged/raster/UpdatableTile.java b/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
index 606aec1b744a98580d878e8db8d3698223f1afa5..c34af1ae4ce07f62f142187d554cbb793c9267f6 100644
--- a/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
+++ b/src/main/java/org/orekit/rugged/raster/UpdatableTile.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,8 +16,6 @@
*/
package org.orekit.rugged.raster;
-import org.orekit.rugged.errors.RuggedException;
-
/** Interface representing one tile of a raster Digital Elevation Model.
* @author Luc Maisonobe
* @author Guylaine Prat
@@ -31,12 +29,10 @@ public interface UpdatableTile {
* @param longitudeStep step in longitude (size of one raster element) (rad)
* @param latitudeRows number of latitude rows
* @param longitudeColumns number of longitude columns
- * @exception RuggedException if tile is empty (zero rows or columns)
*/
void setGeometry(double minLatitude, double minLongitude,
double latitudeStep, double longitudeStep,
- int latitudeRows, int longitudeColumns)
- throws RuggedException;
+ int latitudeRows, int longitudeColumns);
/** Set the elevation for one raster element.
* <p>
@@ -52,9 +48,7 @@ public interface UpdatableTile {
* @param latitudeIndex index of latitude (row index)
* @param longitudeIndex index of longitude (column index)
* @param elevation elevation (m)
- * @exception RuggedException if indices are out of bound
*/
- void setElevation(int latitudeIndex, int longitudeIndex, double elevation)
- throws RuggedException;
+ void setElevation(int latitudeIndex, int longitudeIndex, double elevation);
}
diff --git a/src/main/java/org/orekit/rugged/refraction/AtmosphericComputationParameters.java b/src/main/java/org/orekit/rugged/refraction/AtmosphericComputationParameters.java
new file mode 100644
index 0000000000000000000000000000000000000000..8baf276011c5a9defa27d20b606e2f5d14ced966
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/refraction/AtmosphericComputationParameters.java
@@ -0,0 +1,175 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.refraction;
+
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.utils.GridCreation;
+
+/**
+ * Atmospheric refraction computation parameters.
+ * Defines for inverse location a set of parameters in order to be able to perform the computation.
+ * @author Guylaine Prat
+ * @since 2.1
+ */
+public class AtmosphericComputationParameters {
+
+ /** Margin for definition of the interpolation grid.
+ * To be inside the min line and max line range to avoid problem with inverse location grid computation. */
+ private static final int MARGIN_LINE = 10;
+
+ /** Default value for pixel step. */
+ private static final int DEFAULT_STEP_PIXEL = 100;
+ /** Default value for line step. */
+ private static final int DEFAULT_STEP_LINE = 100;
+
+ /** Actual values for pixel step in case default are overwritten. */
+ private int pixelStep;
+ /** Actual values for line step in case default are overwritten. */
+ private int lineStep;
+
+ // Definition of grids for sensor (u = along pixel; v = along line)
+ /** Linear grid in pixel. */
+ private double[] uGrid;
+ /** Linear grid in line. */
+ private double[] vGrid;
+ /** Size of uGrid = nbPixelGrid. */
+ private int nbPixelGrid;
+ /** Size of vGrid = nbLineGrid. */
+ private int nbLineGrid;
+
+ // Definition of the associated sensor
+ /** Current min line. */
+ private double minLineSensor = Double.NaN;
+ /** Current max line. */
+ private double maxLineSensor = Double.NaN;
+ /** Current sensor name. */
+ private String sensorName = null;
+
+ /**
+ * Default constructor.
+ */
+ public AtmosphericComputationParameters() {
+ this.pixelStep = DEFAULT_STEP_PIXEL;
+ this.lineStep = DEFAULT_STEP_LINE;
+ }
+
+ /** Configuration of the interpolation grid. This grid is associated to the given sensor,
+ * with the given min and max lines.
+ * @param sensor line sensor
+ * @param minLine min line defined for the inverse location
+ * @param maxLine max line defined for the inverse location
+ */
+ public void configureCorrectionGrid(final LineSensor sensor, final int minLine, final int maxLine) {
+
+ // Keep information about the sensor and the required search lines.
+ // Needed to test if the grid is initialized with this context.
+ this.minLineSensor = minLine;
+ this.maxLineSensor = maxLine;
+ this.sensorName = sensor.getName();
+
+ // Compute the number of pixels and lines for the grid (round value is sufficient)
+ final int sensorNbPxs = sensor.getNbPixels();
+ this.nbPixelGrid = sensorNbPxs / this.pixelStep;
+
+ // check the validity of the min and max lines
+ if ((maxLine - minLine + 1 - 2 * MARGIN_LINE) < 2 * this.lineStep) {
+ final String info = ": (maxLine - minLine + 1 - 2*" + MARGIN_LINE + ") < 2*" + this.lineStep;
+ throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, info);
+ }
+ this.nbLineGrid = (maxLine - minLine + 1 - 2 * MARGIN_LINE) / this.lineStep;
+
+ // CHECKSTYLE: stop UnnecessaryParentheses check
+
+ // Compute the linear grids in pixel (u index) and line (v index)
+ this.uGrid = GridCreation.createLinearGrid(0, (sensorNbPxs - 1), this.nbPixelGrid);
+ this.vGrid = GridCreation.createLinearGrid((minLine + MARGIN_LINE), (maxLine - MARGIN_LINE), this.nbLineGrid);
+
+ // CHECKSTYLE: resume UnnecessaryParentheses check
+
+ }
+
+ /**
+ * Set the grid steps in pixel and line (used to compute inverse location).
+ * Overwrite the default values, for time optimization if necessary.
+ * @param gridPixelStep grid pixel step for the inverse location computation
+ * @param gridLineStep grid line step for the inverse location computation
+ */
+ public void setGridSteps(final int gridPixelStep, final int gridLineStep) {
+
+ if (gridPixelStep <= 0) {
+ final String reason = " pixelStep <= 0";
+ throw new RuggedException(RuggedMessages.INVALID_STEP, gridPixelStep, reason);
+ }
+ if (gridLineStep <= 0) {
+ final String reason = " lineStep <= 0";
+ throw new RuggedException(RuggedMessages.INVALID_STEP, gridLineStep, reason);
+ }
+ this.pixelStep = gridPixelStep;
+ this.lineStep = gridLineStep;
+ }
+
+ /**
+ * @return the size of pixel grid
+ */
+ public int getNbPixelGrid() {
+ return nbPixelGrid;
+ }
+
+ /**
+ * @return the size of line grid
+ */
+ public int getNbLineGrid() {
+ return nbLineGrid;
+ }
+
+ /**
+ * @return the pixel grid
+ */
+ public double[] getUgrid() {
+ return uGrid.clone();
+ }
+
+ /**
+ * @return the line grid
+ */
+ public double[] getVgrid() {
+ return vGrid.clone();
+ }
+
+ /**
+ * @return the min line used to compute the current grids
+ */
+ public double getMinLineSensor() {
+ return minLineSensor;
+ }
+
+ /**
+ * @return the max line used to compute the current grids
+ */
+ public double getMaxLineSensor() {
+ return maxLineSensor;
+ }
+
+ /**
+ * @return the sensor name used to compute the current grids
+ */
+ public String getSensorName() {
+ return sensorName;
+ }
+}
diff --git a/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java b/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
index 8ff9e3e291b4eeb624fdf98802179b6d10b33fcc..16c3c9c42b4f9a903b00e9b02ce833d48dec9a6c 100644
--- a/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
+++ b/src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,18 +16,54 @@
*/
package org.orekit.rugged.refraction;
-
+import org.hipparchus.analysis.interpolation.BilinearInterpolatingFunction;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/**
- * Interface for atmospheric refraction model.
+ * Base class for atmospheric refraction model.
* @author Sergio Esteves
+ * @author Guylaine Prat
* @since 2.0
*/
-public interface AtmosphericRefraction {
+public abstract class AtmosphericRefraction {
+
+ /** Flag to tell if we must compute the correction.
+ * By default: computation is set up.
+ * @since 2.1
+ */
+ private boolean mustBeComputed;
+
+ /** The current atmospheric parameters.
+ * @since 2.1
+ */
+ private AtmosphericComputationParameters atmosphericParams;
+
+ /** Bilinear interpolating function for pixel (used by inverse location).
+ * @since 2.1
+ */
+ private BilinearInterpolatingFunction bifPixel;
+
+ /** Bilinear interpolating function of line (used by inverse location).
+ * @since 2.1
+ */
+ private BilinearInterpolatingFunction bifLine;
+
+ /**
+ * Default constructor.
+ */
+ protected AtmosphericRefraction() {
+ // Set up the atmospheric parameters ... with lazy evaluation of the grid (done only if necessary)
+ this.atmosphericParams = new AtmosphericComputationParameters();
+ this.mustBeComputed = true;
+ this.bifPixel = null;
+ this.bifLine = null;
+ }
/** Apply correction to the intersected point with an atmospheric refraction model.
* @param satPos satellite position, in <em>body frame</em>
@@ -35,12 +71,131 @@ public interface AtmosphericRefraction {
* @param rawIntersection intersection point before refraction correction
* @param algorithm intersection algorithm
* @return corrected point with the effect of atmospheric refraction
- * @throws RuggedException if there is no refraction data at altitude of rawIntersection or see
* {@link org.orekit.rugged.utils.ExtendedEllipsoid#pointAtAltitude(Vector3D, Vector3D, double)} or see
- * {@link IntersectionAlgorithm#refineIntersection(ExtendedEllipsoid, Vector3D, Vector3D, NormalizedGeodeticPoint)}
+ * {@link org.orekit.rugged.intersection.IntersectionAlgorithm#refineIntersection(org.orekit.rugged.utils.ExtendedEllipsoid, Vector3D, Vector3D, NormalizedGeodeticPoint)}
+ */
+ public abstract NormalizedGeodeticPoint applyCorrection(Vector3D satPos, Vector3D satLos, NormalizedGeodeticPoint rawIntersection,
+ IntersectionAlgorithm algorithm);
+
+ /** Deactivate computation (needed for the inverse location computation).
+ * @since 2.1
+ */
+ public void deactivateComputation() {
+ this.mustBeComputed = false;
+ }
+
+ /** Reactivate computation (needed for the inverse location computation).
+ * @since 2.1
+ */
+ public void reactivateComputation() {
+ this.mustBeComputed = true;
+ }
+
+ /** Tell if the computation must be performed.
+ * @return true if computation must be performed; false otherwise
+ * @since 2.1
+ */
+ public boolean mustBeComputed() {
+ return mustBeComputed;
+ }
+
+ /** Configuration of the interpolation grid. This grid is associated to the given sensor,
+ * with the given min and max lines.
+ * @param sensor line sensor
+ * @param minLine min line defined for the inverse location
+ * @param maxLine max line defined for the inverse location
+ * @since 2.1
*/
- NormalizedGeodeticPoint applyCorrection(Vector3D satPos, Vector3D satLos, NormalizedGeodeticPoint rawIntersection,
- IntersectionAlgorithm algorithm)
- throws RuggedException;
+ public void configureCorrectionGrid(final LineSensor sensor, final int minLine, final int maxLine) {
+ atmosphericParams.configureCorrectionGrid(sensor, minLine, maxLine);
+ }
+
+ /** Check if the current atmospheric parameters are the same as the asked ones.
+ * @param sensorName the asked sensor name
+ * @param minLine the asked min line
+ * @param maxLine the asked max line
+ * @return true if same context; false otherwise
+ * @since 2.1
+ */
+ public Boolean isSameContext(final String sensorName, final int minLine, final int maxLine) {
+
+ return (Double.compare(atmosphericParams.getMinLineSensor(), minLine) == 0) &&
+ (Double.compare(atmosphericParams.getMaxLineSensor(), maxLine) == 0) &&
+ (atmosphericParams.getSensorName().compareTo(sensorName) == 0);
+ }
+
+ /** Get the computation parameters.
+ * @return the AtmosphericComputationParameters
+ * @since 2.1
+ */
+ public AtmosphericComputationParameters getComputationParameters() {
+ return atmosphericParams;
+ }
+
+ /** Set the grid steps in pixel and line (used to compute inverse location).
+ * Overwrite the default values, for time optimization for instance.
+ * @param pixelStep pixel step for the inverse location computation
+ * @param lineStep line step for the inverse location computation
+ * @since 2.1
+ */
+ public void setGridSteps(final int pixelStep, final int lineStep) {
+ atmosphericParams.setGridSteps(pixelStep, lineStep);
+ }
+
+ /** Compute the correction functions for pixel and lines.
+ * The corrections are computed for pixels and lines, on a regular grid at sensor level.
+ * The corrections are based on the difference on grid nodes (where direct loc is known with atmosphere refraction)
+ * and the sensor pixel found by inverse loc without atmosphere refraction.
+ * The bilinear interpolating functions are then computed for pixel and for line.
+ * Need to be computed only once for a given sensor with the same minLine and maxLine.
+ * @param sensorPixelGridInverseWithout inverse location grid WITHOUT atmospheric refraction
+ * @since 2.1
+ */
+ public void computeGridCorrectionFunctions(final SensorPixel[][] sensorPixelGridInverseWithout) {
+
+ final int nbPixelGrid = atmosphericParams.getNbPixelGrid();
+ final int nbLineGrid = atmosphericParams.getNbLineGrid();
+ final double[] pixelGrid = atmosphericParams.getUgrid();
+ final double[] lineGrid = atmosphericParams.getVgrid();
+
+ // Initialize the needed diff functions
+ final double[][] gridDiffPixel = new double[nbPixelGrid][nbLineGrid];
+ final double[][] gridDiffLine = new double[nbPixelGrid][nbLineGrid];
+
+ // Compute the difference between grids nodes WITH - without atmosphere
+ for (int lineIndex = 0; lineIndex < nbLineGrid; lineIndex++) {
+ for (int pixelIndex = 0; pixelIndex < nbPixelGrid; pixelIndex++) {
+
+ if (sensorPixelGridInverseWithout[pixelIndex][lineIndex] != null) {
+ final double diffLine = lineGrid[lineIndex] - sensorPixelGridInverseWithout[pixelIndex][lineIndex].getLineNumber();
+ final double diffPixel = pixelGrid[pixelIndex] - sensorPixelGridInverseWithout[pixelIndex][lineIndex].getPixelNumber();
+ gridDiffPixel[pixelIndex][lineIndex] = diffPixel;
+ gridDiffLine[pixelIndex][lineIndex] = diffLine;
+
+ } else {
+ // Impossible to find the point in the given min line and max line
+ throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES,
+ atmosphericParams.getMinLineSensor(), atmosphericParams.getMaxLineSensor(), "");
+ }
+ }
+ }
+ // Definition of the interpolating function for pixel and for line
+ this.bifPixel = new BilinearInterpolatingFunction(pixelGrid, lineGrid, gridDiffPixel);
+ this.bifLine = new BilinearInterpolatingFunction(pixelGrid, lineGrid, gridDiffLine);
+ }
+
+ /**
+ * @return the bilinear interpolating function for pixel correction
+ */
+ public BilinearInterpolatingFunction getBifPixel() {
+ return bifPixel;
+ }
+
+ /**
+ * @return the bilinear interpolating function for line correction
+ */
+ public BilinearInterpolatingFunction getBifLine() {
+ return bifLine;
+ }
}
diff --git a/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java b/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java
index cadc13dd9f34acf422777970fdac5aa1f75b8882..37567e0be8d57624133966f13dd946263ed20908 100644
--- a/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java
+++ b/src/main/java/org/orekit/rugged/refraction/ConstantRefractionLayer.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -19,18 +19,19 @@ package org.orekit.rugged.refraction;
/**
* Class that represents a constant refraction layer to be used with {@link MultiLayerModel}.
* @author Sergio Esteves
+ * @author Guylaine Prat
* @since 2.0
*/
public class ConstantRefractionLayer {
- /** lowest altitude of this layer. */
+ /** lowest altitude of this layer (m). */
private final Double lowestAltitude;
/** refractive index of this layer. */
private final double refractiveIndex;
/** Simple constructor.
- * @param lowestAltitude lowest altitude of the layer
+ * @param lowestAltitude lowest altitude of the layer (m)
* @param refractiveIndex refractive index of the layer
*/
public ConstantRefractionLayer(final double lowestAltitude, final double refractiveIndex) {
@@ -38,12 +39,17 @@ public class ConstantRefractionLayer {
this.refractiveIndex = refractiveIndex;
}
+ /**
+ * @return the lowest altitude of the layer (m)
+ */
public double getLowestAltitude() {
return lowestAltitude;
}
+ /**
+ * @return the refractive index of the layer
+ */
public double getRefractiveIndex() {
return refractiveIndex;
}
-
}
diff --git a/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java b/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
index 1a26f7db50258851524b6d517a06f0ea3a5fa4a2..2c1f1918896c3c2e8f545848727254d3cb7d80bc 100644
--- a/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
+++ b/src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -23,7 +23,6 @@ import java.util.List;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.errors.OrekitException;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.IntersectionAlgorithm;
@@ -32,10 +31,12 @@ import org.orekit.rugged.utils.NormalizedGeodeticPoint;
/**
* Atmospheric refraction model based on multiple layers with associated refractive index.
- * @author Sergio Esteves, Luc Maisonobe
+ * @author Sergio Esteves
+ * @author Luc Maisonobe
+ * @author Guylaine Prat
* @since 2.0
*/
-public class MultiLayerModel implements AtmosphericRefraction {
+public class MultiLayerModel extends AtmosphericRefraction {
/** Observed body ellipsoid. */
private final ExtendedEllipsoid ellipsoid;
@@ -43,7 +44,7 @@ public class MultiLayerModel implements AtmosphericRefraction {
/** Constant refraction layers. */
private final List<ConstantRefractionLayer> refractionLayers;
- /** Atmosphere lowest altitude. */
+ /** Atmosphere lowest altitude (m). */
private final double atmosphereLowestAltitude;
/** Simple constructor.
@@ -53,26 +54,30 @@ public class MultiLayerModel implements AtmosphericRefraction {
* @param ellipsoid the ellipsoid to be used.
*/
public MultiLayerModel(final ExtendedEllipsoid ellipsoid) {
+
+ super();
+
this.ellipsoid = ellipsoid;
- refractionLayers = new ArrayList<ConstantRefractionLayer>(15);
- refractionLayers.add(new ConstantRefractionLayer(100000.00, 1.000000));
- refractionLayers.add(new ConstantRefractionLayer( 50000.00, 1.000000));
- refractionLayers.add(new ConstantRefractionLayer( 40000.00, 1.000001));
- refractionLayers.add(new ConstantRefractionLayer( 30000.00, 1.000004));
- refractionLayers.add(new ConstantRefractionLayer( 23000.00, 1.000012));
- refractionLayers.add(new ConstantRefractionLayer( 18000.00, 1.000028));
- refractionLayers.add(new ConstantRefractionLayer( 14000.00, 1.000052));
- refractionLayers.add(new ConstantRefractionLayer( 11000.00, 1.000083));
- refractionLayers.add(new ConstantRefractionLayer( 9000.00, 1.000106));
- refractionLayers.add(new ConstantRefractionLayer( 7000.00, 1.000134));
- refractionLayers.add(new ConstantRefractionLayer( 5000.00, 1.000167));
- refractionLayers.add(new ConstantRefractionLayer( 3000.00, 1.000206));
- refractionLayers.add(new ConstantRefractionLayer( 1000.00, 1.000252));
- refractionLayers.add(new ConstantRefractionLayer( 0.00, 1.000278));
- refractionLayers.add(new ConstantRefractionLayer( -1000.00, 1.000306));
-
- atmosphereLowestAltitude = refractionLayers.get(refractionLayers.size() - 1).getLowestAltitude();
+ this.refractionLayers = new ArrayList<ConstantRefractionLayer>(15);
+ this.refractionLayers.add(new ConstantRefractionLayer(100000.00, 1.000000));
+ this.refractionLayers.add(new ConstantRefractionLayer( 50000.00, 1.000000));
+ this.refractionLayers.add(new ConstantRefractionLayer( 40000.00, 1.000001));
+ this.refractionLayers.add(new ConstantRefractionLayer( 30000.00, 1.000004));
+ this.refractionLayers.add(new ConstantRefractionLayer( 23000.00, 1.000012));
+ this.refractionLayers.add(new ConstantRefractionLayer( 18000.00, 1.000028));
+ this.refractionLayers.add(new ConstantRefractionLayer( 14000.00, 1.000052));
+ this.refractionLayers.add(new ConstantRefractionLayer( 11000.00, 1.000083));
+ this.refractionLayers.add(new ConstantRefractionLayer( 9000.00, 1.000106));
+ this.refractionLayers.add(new ConstantRefractionLayer( 7000.00, 1.000134));
+ this.refractionLayers.add(new ConstantRefractionLayer( 5000.00, 1.000167));
+ this.refractionLayers.add(new ConstantRefractionLayer( 3000.00, 1.000206));
+ this.refractionLayers.add(new ConstantRefractionLayer( 1000.00, 1.000252));
+ this.refractionLayers.add(new ConstantRefractionLayer( 0.00, 1.000278));
+ this.refractionLayers.add(new ConstantRefractionLayer( -1000.00, 1.000306));
+
+ // get the lowest altitude of the atmospheric model
+ this.atmosphereLowestAltitude = refractionLayers.get(refractionLayers.size() - 1).getLowestAltitude();
}
/** Simple constructor.
@@ -80,137 +85,193 @@ public class MultiLayerModel implements AtmosphericRefraction {
* @param refractionLayers the refraction layers to be used with this model (layers can be in any order).
*/
public MultiLayerModel(final ExtendedEllipsoid ellipsoid, final List<ConstantRefractionLayer> refractionLayers) {
+
+ super();
+ // at this stage no optimization is set up: no optimization grid is defined
+
this.ellipsoid = ellipsoid;
this.refractionLayers = new ArrayList<>(refractionLayers);
+
+ // sort the layers from the highest (index = 0) to the lowest (index = size - 1)
Collections.sort(this.refractionLayers,
(l1, l2) -> Double.compare(l2.getLowestAltitude(), l1.getLowestAltitude()));
+
+ // get the lowest altitude of the model
atmosphereLowestAltitude = this.refractionLayers.get(this.refractionLayers.size() - 1).getLowestAltitude();
}
+ /** Compute the (position, LOS) of the intersection with the lowest atmospheric layer.
+ * @param satPos satellite position, in body frame
+ * @param satLos satellite line of sight, in body frame
+ * @param rawIntersection intersection point without refraction correction
+ * @return the intersection position and LOS with the lowest atmospheric layer
+ * @since 2.1
+ */
+ private IntersectionLOS computeToLowestAtmosphereLayer(
+ final Vector3D satPos, final Vector3D satLos,
+ final NormalizedGeodeticPoint rawIntersection) {
+
+ if (rawIntersection.getAltitude() < atmosphereLowestAltitude) {
+ throw new RuggedException(RuggedMessages.NO_LAYER_DATA, rawIntersection.getAltitude(),
+ atmosphereLowestAltitude);
+ }
+
+ Vector3D pos = satPos;
+ Vector3D los = satLos.normalize();
+
+ // Compute the intersection point with the lowest layer of atmosphere
+ double n1 = -1;
+ GeodeticPoint gp = ellipsoid.transform(satPos, ellipsoid.getBodyFrame(), null);
+
+ // Perform the exact computation (no optimization)
+ // TBN: the refractionLayers is ordered from the highest to the lowest
+ for (ConstantRefractionLayer refractionLayer : refractionLayers) {
+
+ if (refractionLayer.getLowestAltitude() > gp.getAltitude()) {
+ continue;
+ }
+
+ final double n2 = refractionLayer.getRefractiveIndex();
+
+ if (n1 > 0) {
+
+ // when we get here, we have already performed one iteration in the loop
+ // so gp is the los intersection with the layers interface (it was a
+ // point on ground at loop initialization, but is overridden at each iteration)
+
+ // get new los by applying Snell's law at atmosphere layers interfaces
+ // we avoid computing sequences of inverse-trigo/trigo/inverse-trigo functions
+ // we just use linear algebra and square roots, it is faster and more accurate
+
+ // at interface crossing, the interface normal is z, the local zenith direction
+ // the ray direction (i.e. los) is u in the upper layer and v in the lower layer
+ // v is in the (u, zenith) plane, so we can say
+ // (1) v = α u + β z
+ // with α>0 as u and v are roughly in the same direction as the ray is slightly bent
+
+ // let θ₠be the los incidence angle at interface crossing
+ // θ₠= π - angle(u, zenith) is between 0 and π/2 for a downwards observation
+ // let θ₂ be the exit angle at interface crossing
+ // from Snell's law, we have n₠sin θ₠= n₂ sin θ₂ and θ₂ is also between 0 and π/2
+ // we have:
+ // (2) u·z = -cos θâ‚
+ // (3) v·z = -cos θ₂
+ // combining equations (1), (2) and (3) and remembering z·z = 1 as z is normalized , we get
+ // (4) β = α cos θ₠- cos θ₂
+ // with all the expressions above, we can rewrite the fact v is normalized:
+ // 1 = v·v
+ // = α² u·u + 2αβ u·z + β² z·z
+ // = α² - 2αβ cos θ₠+ β²
+ // = α² - 2α² cos² θ₠+ 2 α cos θ₠cos θ₂ + α² cos² θ₠- 2 α cos θ₠cos θ₂ + cos² θ₂
+ // = α²(1 - cos² θâ‚) + cos² θ₂
+ // hence α² = (1 - cos² θ₂)/(1 - cos² θâ‚)
+ // = sin² θ₂ / sin² θâ‚
+ // as α is positive, and both θ₠and θ₂ are between 0 and π/2, we finally get
+ // α = sin θ₂ / sin θâ‚
+ // (5) α = nâ‚/nâ‚‚
+ // the α coefficient is independent from the incidence angle,
+ // it depends only on the ratio of refractive indices!
+ //
+ // back to equation (4) and using again the fact θ₂ is between 0 and π/2, we can now write
+ // β = α cos θ₠- cos θ₂
+ // = nâ‚/nâ‚‚ cos θ₠- cos θ₂
+ // = nâ‚/nâ‚‚ cos θ₠- √(1 - sin² θ₂)
+ // = nâ‚/nâ‚‚ cos θ₠- √(1 - (nâ‚/nâ‚‚)² sin² θâ‚)
+ // = nâ‚/nâ‚‚ cos θ₠- √(1 - (nâ‚/nâ‚‚)² (1 - cos² θâ‚))
+ // = nâ‚/nâ‚‚ cos θ₠- √(1 - (nâ‚/nâ‚‚)² + (nâ‚/nâ‚‚)² cos² θâ‚)
+ // (6) β = -k - √(k² - ζ)
+ // where ζ = (nâ‚/nâ‚‚)² - 1 and k = nâ‚/nâ‚‚ u·z, which is negative, and close to -1 for
+ // nadir observations. As we expect atmosphere models to have small transitions between
+ // layers, we have to handle accurately the case where nâ‚/nâ‚‚ ≈ 1 so ζ ≈ 0. In this case,
+ // a cancellation occurs inside the square root: √(k² - ζ) ≈ √k² ≈ -k (because k is negative).
+ // So β ≈ -k + k ≈ 0 and another cancellation occurs, outside of the square root.
+ // This means that despite equation (6) is mathematically correct, it is prone to numerical
+ // errors when consecutive layers have close refractive indices. A better equivalent
+ // expression is needed. The fact β is close to 0 in this case was expected because
+ // equation (1) reads v = α u + β z, and α = nâ‚/nâ‚‚, so when nâ‚/nâ‚‚ ≈ 1, we have
+ // α ≈ 1 and β ≈ 0, so v ≈ u: when two layers have similar refractive indices, the
+ // propagation direction is almost unchanged.
+ //
+ // The first step for the accurate computation of β is to compute ζ = (nâ‚/nâ‚‚)² - 1
+ // accurately and avoid a cancellation just after a division (which is the least accurate
+ // of the four operations) and a squaring. We will simply use:
+ // ζ = (nâ‚/nâ‚‚)² - 1
+ // = (n₠- n₂) (n₠+ n₂) / n₂²
+ // The cancellation is still there, but it occurs in the subtraction nâ‚ - nâ‚‚, which are
+ // the most accurate values we can get.
+ // The second step for the accurate computation of β is to rewrite equation (6)
+ // by both multiplying and dividing by the dual factor -k + √(k² - ζ):
+ // β = -k - √(k² - ζ)
+ // = (-k - √(k² - ζ)) * (-k + √(k² - ζ)) / (-k + √(k² - ζ))
+ // = (k² - (k² - ζ)) / (-k + √(k² - ζ))
+ // (7) β = ζ / (-k + √(k² - ζ))
+ // expression (7) is more stable numerically than expression (6), because when ζ ≈ 0
+ // its denominator is about -2k, there are no cancellation anymore after the square root.
+ // β is computed with the same accuracy as ζ
+ final double alpha = n1 / n2;
+ final double k = alpha * Vector3D.dotProduct(los, gp.getZenith());
+ final double zeta = (n1 - n2) * (n1 + n2) / (n2 * n2);
+ final double beta = zeta / (FastMath.sqrt(k * k - zeta) - k);
+ los = new Vector3D(alpha, los, beta, gp.getZenith());
+ }
+
+ // In case the altitude of the intersection without atmospheric refraction
+ // is above the lowest altitude of the atmosphere: stop the search
+ if (rawIntersection.getAltitude() > refractionLayer.getLowestAltitude()) {
+ break;
+ }
+
+ // Get for the intersection point: the position and the LOS
+ pos = ellipsoid.pointAtAltitude(pos, los, refractionLayer.getLowestAltitude());
+ gp = ellipsoid.transform(pos, ellipsoid.getBodyFrame(), null);
+
+ n1 = n2;
+ }
+ return new IntersectionLOS(pos, los);
+ }
+
/** {@inheritDoc} */
@Override
public NormalizedGeodeticPoint applyCorrection(final Vector3D satPos, final Vector3D satLos,
final NormalizedGeodeticPoint rawIntersection,
- final IntersectionAlgorithm algorithm)
- throws RuggedException {
+ final IntersectionAlgorithm algorithm) {
- try {
- if (rawIntersection.getAltitude() < atmosphereLowestAltitude) {
- throw new RuggedException(RuggedMessages.NO_LAYER_DATA, rawIntersection.getAltitude(),
- atmosphereLowestAltitude);
- }
+ final IntersectionLOS intersectionLOS = computeToLowestAtmosphereLayer(satPos, satLos, rawIntersection);
+ final Vector3D pos = intersectionLOS.getIntersectionPos();
+ final Vector3D los = intersectionLOS.getIntersectionLos();
- Vector3D pos = satPos;
- Vector3D los = satLos.normalize();
- double n1 = -1;
- GeodeticPoint gp = ellipsoid.transform(satPos, ellipsoid.getBodyFrame(), null);
-
- for (ConstantRefractionLayer refractionLayer : refractionLayers) {
-
- if (refractionLayer.getLowestAltitude() > gp.getAltitude()) {
- continue;
- }
-
- final double n2 = refractionLayer.getRefractiveIndex();
-
- if (n1 > 0) {
-
- // when we get here, we have already performed one iteration in the loop
- // so gp is the los intersection with the layers interface (it was a
- // point on ground at loop initialization, but is overridden at each iteration)
-
- // get new los by applying Snell's law at atmosphere layers interfaces
- // we avoid computing sequences of inverse-trigo/trigo/inverse-trigo functions
- // we just use linear algebra and square roots, it is faster and more accurate
-
- // at interface crossing, the interface normal is z, the local zenith direction
- // the ray direction (i.e. los) is u in the upper layer and v in the lower layer
- // v is in the (u, zenith) plane, so we can say
- // (1) v = α u + β z
- // with α>0 as u and v are roughly in the same direction as the ray is slightly bent
-
- // let θ₠be the los incidence angle at interface crossing
- // θ₠= π - angle(u, zenith) is between 0 and π/2 for a downwards observation
- // let θ₂ be the exit angle at interface crossing
- // from Snell's law, we have n₠sin θ₠= n₂ sin θ₂ and θ₂ is also between 0 and π/2
- // we have:
- // (2) u·z = -cos θâ‚
- // (3) v·z = -cos θ₂
- // combining equations (1), (2) and (3) and remembering z·z = 1 as z is normalized , we get
- // (4) β = α cos θ₠- cos θ₂
- // with all the expressions above, we can rewrite the fact v is normalized:
- // 1 = v·v
- // = α² u·u + 2αβ u·z + β² z·z
- // = α² - 2αβ cos θ₠+ β²
- // = α² - 2α² cos² θ₠+ 2 α cos θ₠cos θ₂ + α² cos² θ₠- 2 α cos θ₠cos θ₂ + cos² θ₂
- // = α²(1 - cos² θâ‚) + cos² θ₂
- // hence α² = (1 - cos² θ₂)/(1 - cos² θâ‚)
- // = sin² θ₂ / sin² θâ‚
- // as α is positive, and both θ₠and θ₂ are between 0 and π/2, we finally get
- // α = sin θ₂ / sin θâ‚
- // (5) α = nâ‚/nâ‚‚
- // the α coefficient is independent from the incidence angle,
- // it depends only on the ratio of refractive indices!
- //
- // back to equation (4) and using again the fact θ₂ is between 0 and π/2, we can now write
- // β = α cos θ₠- cos θ₂
- // = nâ‚/nâ‚‚ cos θ₠- cos θ₂
- // = nâ‚/nâ‚‚ cos θ₠- √(1 - sin² θ₂)
- // = nâ‚/nâ‚‚ cos θ₠- √(1 - (nâ‚/nâ‚‚)² sin² θâ‚)
- // = nâ‚/nâ‚‚ cos θ₠- √(1 - (nâ‚/nâ‚‚)² (1 - cos² θâ‚))
- // = nâ‚/nâ‚‚ cos θ₠- √(1 - (nâ‚/nâ‚‚)² + (nâ‚/nâ‚‚)² cos² θâ‚)
- // (6) β = -k - √(k² - ζ)
- // where ζ = (nâ‚/nâ‚‚)² - 1 and k = nâ‚/nâ‚‚ u·z, which is negative, and close to -1 for
- // nadir observations. As we expect atmosphere models to have small transitions between
- // layers, we have to handle accurately the case where nâ‚/nâ‚‚ ≈ 1 so ζ ≈ 0. In this case,
- // a cancellation occurs inside the square root: √(k² - ζ) ≈ √k² ≈ -k (because k is negative).
- // So β ≈ -k + k ≈ 0 and another cancellation occurs, outside of the square root.
- // This means that despite equation (6) is mathematically correct, it is prone to numerical
- // errors when consecutive layers have close refractive indices. A better equivalent
- // expression is needed. The fact β is close to 0 in this case was expected because
- // equation (1) reads v = α u + β z, and α = nâ‚/nâ‚‚, so when nâ‚/nâ‚‚ ≈ 1, we have
- // α ≈ 1 and β ≈ 0, so v ≈ u: when two layers have similar refractive indices, the
- // propagation direction is almost unchanged.
- //
- // The first step for the accurate computation of β is to compute ζ = (nâ‚/nâ‚‚)² - 1
- // accurately and avoid a cancellation just after a division (which is the least accurate
- // of the four operations) and a squaring. We will simply use:
- // ζ = (nâ‚/nâ‚‚)² - 1
- // = (n₠- n₂) (n₠+ n₂) / n₂²
- // The cancellation is still there, but it occurs in the subtraction nâ‚ - nâ‚‚, which are
- // the most accurate values we can get.
- // The second step for the accurate computation of β is to rewrite equation (6)
- // by both multiplying and dividing by the dual factor -k + √(k² - ζ):
- // β = -k - √(k² - ζ)
- // = (-k - √(k² - ζ)) * (-k + √(k² - ζ)) / (-k + √(k² - ζ))
- // = (k² - (k² - ζ)) / (-k + √(k² - ζ))
- // (7) β = ζ / (-k + √(k² - ζ))
- // expression (7) is more stable numerically than expression (6), because when ζ ≈ 0
- // its denominator is about -2k, there are no cancellation anymore after the square root.
- // β is computed with the same accuracy as ζ
- final double alpha = n1 / n2;
- final double k = alpha * Vector3D.dotProduct(los, gp.getZenith());
- final double zeta = (n1 - n2) * (n1 + n2) / (n2 * n2);
- final double beta = zeta / (FastMath.sqrt(k * k - zeta) - k);
- los = new Vector3D(alpha, los, beta, gp.getZenith());
- }
-
- if (rawIntersection.getAltitude() > refractionLayer.getLowestAltitude()) {
- break;
- }
-
- // get intersection point
- pos = ellipsoid.pointAtAltitude(pos, los, refractionLayer.getLowestAltitude());
- gp = ellipsoid.transform(pos, ellipsoid.getBodyFrame(), null);
-
- n1 = n2;
+ // at this stage the pos belongs to the lowest atmospheric layer.
+ // We can compute the intersection of line of sight (los) with Digital Elevation Model
+ // as usual (without atmospheric refraction).
+ return algorithm.refineIntersection(ellipsoid, pos, los, rawIntersection);
+ }
- }
+} // end of class MultiLayerModel
- return algorithm.refineIntersection(ellipsoid, pos, los, rawIntersection);
+/** Container for the (position, LOS) of the intersection with the lowest atmospheric layer.
+ * @author Guylaine Prat
+ * @since 2.1
+ */
+class IntersectionLOS {
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
+ /** Position of the intersection with the lowest atmospheric layer. */
+ private Vector3D intersectionPos;
+ /** LOS of the intersection with the lowest atmospheric layer. */
+ private Vector3D intersectionLos;
+
+ /** Default constructor.
+ * @param intersectionPos position of the intersection
+ * @param intersectionLos los of the intersection
+ */
+ IntersectionLOS(final Vector3D intersectionPos, final Vector3D intersectionLos) {
+ this.intersectionPos = intersectionPos;
+ this.intersectionLos = intersectionLos;
+ }
+ public Vector3D getIntersectionPos() {
+ return intersectionPos;
+ }
+
+ public Vector3D getIntersectionLos() {
+ return intersectionLos;
}
}
diff --git a/src/main/java/org/orekit/rugged/utils/DSGenerator.java b/src/main/java/org/orekit/rugged/utils/DSGenerator.java
index 05e60f63d117addec2889f1665fbf3ce5eabbcc6..535474fa07e1f13a90e2b032a292f712cda501eb 100644
--- a/src/main/java/org/orekit/rugged/utils/DSGenerator.java
+++ b/src/main/java/org/orekit/rugged/utils/DSGenerator.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java b/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
index 3324e0ad27f484055c5392090a4e4ec061443daf..6cc42556f3e35e6a0bc278f492de761824411c12 100644
--- a/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
+++ b/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,7 +22,6 @@ import org.hipparchus.util.FastMath;
import org.hipparchus.util.MathArrays;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
import org.orekit.rugged.errors.DumpManager;
import org.orekit.rugged.errors.RuggedException;
@@ -68,8 +67,7 @@ public class ExtendedEllipsoid extends OneAxisEllipsoid {
/** {@inheritDoc} */
@Override
- public GeodeticPoint transform(final Vector3D point, final Frame frame, final AbsoluteDate date)
- throws OrekitException {
+ public GeodeticPoint transform(final Vector3D point, final Frame frame, final AbsoluteDate date) {
DumpManager.dumpEllipsoid(this);
return super.transform(point, frame, date);
}
@@ -82,11 +80,9 @@ public class ExtendedEllipsoid extends OneAxisEllipsoid {
* when there are two points at the desired latitude along the line, it should
* be close to los surface intersection (m)
* @return point at latitude (m)
- * @exception RuggedException if no such point exists
*/
public Vector3D pointAtLatitude(final Vector3D position, final Vector3D los,
- final double latitude, final Vector3D closeReference)
- throws RuggedException {
+ final double latitude, final Vector3D closeReference) {
DumpManager.dumpEllipsoid(this);
@@ -165,10 +161,8 @@ public class ExtendedEllipsoid extends OneAxisEllipsoid {
* @param los pixel line-of-sight, not necessarily normalized (in body frame)
* @param longitude longitude with respect to ellipsoid (rad)
* @return point at longitude (m)
- * @exception RuggedException if no such point exists
*/
- public Vector3D pointAtLongitude(final Vector3D position, final Vector3D los, final double longitude)
- throws RuggedException {
+ public Vector3D pointAtLongitude(final Vector3D position, final Vector3D los, final double longitude) {
DumpManager.dumpEllipsoid(this);
@@ -191,24 +185,19 @@ public class ExtendedEllipsoid extends OneAxisEllipsoid {
* @param centralLongitude reference longitude lc such that the point longitude will
* be normalized between lc-Ï€ and lc+Ï€ (rad)
* @return point on ground
- * @exception RuggedException if no such point exists (typically line-of-sight missing body)
*/
public NormalizedGeodeticPoint pointOnGround(final Vector3D position, final Vector3D los,
- final double centralLongitude)
- throws RuggedException {
- try {
- DumpManager.dumpEllipsoid(this);
- final GeodeticPoint gp =
- getIntersectionPoint(new Line(position, new Vector3D(1, position, 1e6, los), 1.0e-12),
- position, getBodyFrame(), null);
- if (gp == null) {
- throw new RuggedException(RuggedMessages.LINE_OF_SIGHT_DOES_NOT_REACH_GROUND);
- }
- return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(),
- centralLongitude);
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
+ final double centralLongitude) {
+
+ DumpManager.dumpEllipsoid(this);
+ final GeodeticPoint gp =
+ getIntersectionPoint(new Line(position, new Vector3D(1, position, 1e6, los), 1.0e-12),
+ position, getBodyFrame(), null);
+ if (gp == null) {
+ throw new RuggedException(RuggedMessages.LINE_OF_SIGHT_DOES_NOT_REACH_GROUND);
}
+ return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(),
+ centralLongitude);
}
/** Get point at some altitude along a pixel line of sight.
@@ -216,55 +205,47 @@ public class ExtendedEllipsoid extends OneAxisEllipsoid {
* @param los pixel line-of-sight, not necessarily normalized (in body frame)
* @param altitude altitude with respect to ellipsoid (m)
* @return point at altitude (m)
- * @exception RuggedException if no such point exists (typically too negative altitude)
*/
- public Vector3D pointAtAltitude(final Vector3D position, final Vector3D los, final double altitude)
- throws RuggedException {
- try {
-
- DumpManager.dumpEllipsoid(this);
-
- // point on line closest to origin
- final double los2 = los.getNormSq();
- final double dot = Vector3D.dotProduct(position, los);
- final double k0 = -dot / los2;
- final Vector3D close0 = new Vector3D(1, position, k0, los);
-
- // very rough guess: if body is spherical, the desired point on line
- // is at distance ae + altitude from origin
- final double r = getEquatorialRadius() + altitude;
- final double delta2 = r * r - close0.getNormSq();
- if (delta2 < 0) {
- throw new RuggedException(RuggedMessages.LINE_OF_SIGHT_NEVER_CROSSES_ALTITUDE, altitude);
- }
- final double deltaK = FastMath.sqrt(delta2 / los2);
- final double k1 = k0 + deltaK;
- final double k2 = k0 - deltaK;
- double k = (FastMath.abs(k1) <= FastMath.abs(k2)) ? k1 : k2;
-
- // this loop generally converges in 3 iterations
- for (int i = 0; i < 100; ++i) {
-
- final Vector3D point = new Vector3D(1, position, k, los);
- final GeodeticPoint gpK = transform(point, getBodyFrame(), null);
- final double deltaH = altitude - gpK.getAltitude();
- if (FastMath.abs(deltaH) <= ALTITUDE_CONVERGENCE) {
- return point;
- }
+ public Vector3D pointAtAltitude(final Vector3D position, final Vector3D los, final double altitude) {
- // improve the offset using linear ratio between
- // altitude variation and displacement along line-of-sight
- k += deltaH / Vector3D.dotProduct(gpK.getZenith(), los);
+ DumpManager.dumpEllipsoid(this);
+ // point on line closest to origin
+ final double los2 = los.getNormSq();
+ final double dot = Vector3D.dotProduct(position, los);
+ final double k0 = -dot / los2;
+ final Vector3D close0 = new Vector3D(1, position, k0, los);
+
+ // very rough guess: if body is spherical, the desired point on line
+ // is at distance ae + altitude from origin
+ final double r = getEquatorialRadius() + altitude;
+ final double delta2 = r * r - close0.getNormSq();
+ if (delta2 < 0) {
+ throw new RuggedException(RuggedMessages.LINE_OF_SIGHT_NEVER_CROSSES_ALTITUDE, altitude);
+ }
+ final double deltaK = FastMath.sqrt(delta2 / los2);
+ final double k1 = k0 + deltaK;
+ final double k2 = k0 - deltaK;
+ double k = (FastMath.abs(k1) <= FastMath.abs(k2)) ? k1 : k2;
+
+ // this loop generally converges in 3 iterations
+ for (int i = 0; i < 100; ++i) {
+
+ final Vector3D point = new Vector3D(1, position, k, los);
+ final GeodeticPoint gpK = transform(point, getBodyFrame(), null);
+ final double deltaH = altitude - gpK.getAltitude();
+ if (FastMath.abs(deltaH) <= ALTITUDE_CONVERGENCE) {
+ return point;
}
- // this should never happen
- throw new RuggedException(RuggedMessages.LINE_OF_SIGHT_NEVER_CROSSES_ALTITUDE, altitude);
+ // improve the offset using linear ratio between
+ // altitude variation and displacement along line-of-sight
+ k += deltaH / Vector3D.dotProduct(gpK.getZenith(), los);
- } catch (OrekitException oe) {
- // this should never happen
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
}
+
+ // this should never happen
+ throw new RuggedException(RuggedMessages.LINE_OF_SIGHT_NEVER_CROSSES_ALTITUDE, altitude);
}
/** Convert a line-of-sight from Cartesian to topocentric.
@@ -302,22 +283,15 @@ public class ExtendedEllipsoid extends OneAxisEllipsoid {
* with respect to the primary point (in body frame and Cartesian coordinates)
* @return line-of-sight in topocentric frame (East, North, Zenith) of the point,
* scaled to match radians in the horizontal plane and meters along the vertical axis
- * @exception RuggedException if points cannot be converted to geodetic coordinates
*/
- public Vector3D convertLos(final Vector3D primary, final Vector3D secondary)
- throws RuggedException {
- try {
-
- // switch to geodetic coordinates using primary point as reference
- final GeodeticPoint point = transform(primary, getBodyFrame(), null);
- final Vector3D los = secondary.subtract(primary);
+ public Vector3D convertLos(final Vector3D primary, final Vector3D secondary) {
- // convert line of sight
- return convertLos(point, los);
+ // switch to geodetic coordinates using primary point as reference
+ final GeodeticPoint point = transform(primary, getBodyFrame(), null);
+ final Vector3D los = secondary.subtract(primary);
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
- }
+ // convert line of sight
+ return convertLos(point, los);
}
/** Transform a cartesian point to a surface-relative point.
@@ -327,11 +301,9 @@ public class ExtendedEllipsoid extends OneAxisEllipsoid {
* @param centralLongitude reference longitude lc such that the point longitude will
* be normalized between lc-Ï€ and lc+Ï€ (rad)
* @return point at the same location but as a surface-relative point
- * @exception OrekitException if point cannot be converted to body frame
*/
public NormalizedGeodeticPoint transform(final Vector3D point, final Frame frame, final AbsoluteDate date,
- final double centralLongitude)
- throws OrekitException {
+ final double centralLongitude) {
final GeodeticPoint gp = transform(point, frame, date);
return new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(),
centralLongitude);
diff --git a/src/main/java/org/orekit/rugged/utils/GridCreation.java b/src/main/java/org/orekit/rugged/utils/GridCreation.java
new file mode 100644
index 0000000000000000000000000000000000000000..d31612b527614af1ba0a88194cc1a7b5461ff937
--- /dev/null
+++ b/src/main/java/org/orekit/rugged/utils/GridCreation.java
@@ -0,0 +1,47 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.utils;
+
+/** Utility class for grids creation.
+ * @author Guylaine Prat
+ * @since 2.1
+ */
+public final class GridCreation {
+
+ /** Private constructor for utility class.
+ * Suppress default constructor for non instantiability ...
+ */
+ private GridCreation() {
+ super();
+ }
+
+ /** Create a linear grid between min and max value for a number n of points.
+ * TBN: no checks are performed here. Must be done by the calling method.
+ * @param min value for grid[0]
+ * @param max value for grid[n-1]
+ * @param n number of points
+ * @return the linear grid
+ */
+ public static double[] createLinearGrid(final double min, final double max, final int n) {
+
+ final double[] grid = new double[n];
+ for (int i = 0; i < n; ++i) {
+ grid[i] = ((n - 1 - i) * min + i * max) / (n - 1);
+ }
+ return grid;
+ }
+}
diff --git a/src/main/java/org/orekit/rugged/utils/MaxSelector.java b/src/main/java/org/orekit/rugged/utils/MaxSelector.java
index ada0e0b4c949f3728472480eea90f7267532b1d1..7037eddd72efa173f3313eb071d8363b5f22fbc8 100644
--- a/src/main/java/org/orekit/rugged/utils/MaxSelector.java
+++ b/src/main/java/org/orekit/rugged/utils/MaxSelector.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/utils/MinSelector.java b/src/main/java/org/orekit/rugged/utils/MinSelector.java
index 9c0fd0a7eeaa33985eb3ca16207b5d1d2ddb592c..ec126ed1d218f5f59e7147baa0e4b2b7b523b5f2 100644
--- a/src/main/java/org/orekit/rugged/utils/MinSelector.java
+++ b/src/main/java/org/orekit/rugged/utils/MinSelector.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java b/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
index bfae125cd300fffaf21f176181cab04a18197e65..543e8bec5d706de361bd63f7d90ce018ed6e438a 100644
--- a/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
+++ b/src/main/java/org/orekit/rugged/utils/NormalizedGeodeticPoint.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java b/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java
index 300ab31de5ed20c9f0246dc67cac82d5acdba952..98c7bd0cf0c82c4f6d77ee6b6defac4ef99f897c 100644
--- a/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java
+++ b/src/main/java/org/orekit/rugged/utils/RoughVisibilityEstimator.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,14 +16,13 @@
*/
package org.orekit.rugged.utils;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.util.FastMath;
import java.util.ArrayList;
import java.util.List;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.Frame;
import org.orekit.frames.Transform;
import org.orekit.time.AbsoluteDate;
@@ -64,11 +63,9 @@ public class RoughVisibilityEstimator {
* @param ellipsoid ground ellipsoid
* @param frame frame in which position and velocity are defined (may be inertial or body frame)
* @param positionsVelocities satellite position and velocity (m and m/s in specified frame)
- * @exception OrekitException if position-velocity cannot be converted to body frame
*/
public RoughVisibilityEstimator(final OneAxisEllipsoid ellipsoid, final Frame frame,
- final List<TimeStampedPVCoordinates> positionsVelocities)
- throws OrekitException {
+ final List<TimeStampedPVCoordinates> positionsVelocities) {
this.ellipsoid = ellipsoid;
diff --git a/src/main/java/org/orekit/rugged/utils/Selector.java b/src/main/java/org/orekit/rugged/utils/Selector.java
index 1fd39a10dc63569d99f0b2f243603f55e9bf9e96..c3dc0b034851af38f9aad0acee3d3168f43b9f91 100644
--- a/src/main/java/org/orekit/rugged/utils/Selector.java
+++ b/src/main/java/org/orekit/rugged/utils/Selector.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java b/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
index 75ef62129ec5e3684e1cf200dbda1d5ceaa5fb5e..aca3456a1aa23cff4db4992520e152d6958d0314 100644
--- a/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
+++ b/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,13 +16,12 @@
*/
package org.orekit.rugged.utils;
-import org.hipparchus.util.FastMath;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import org.orekit.errors.OrekitException;
+import org.hipparchus.util.FastMath;
import org.orekit.frames.Frame;
import org.orekit.frames.Transform;
import org.orekit.rugged.errors.DumpManager;
@@ -86,9 +85,6 @@ public class SpacecraftToObservedBody implements Serializable {
* @param quaternions satellite quaternions
* @param aInterpolationNumber number of points to use for attitude interpolation
* @param aFilter filter for derivatives from the sample to use in attitude interpolation
- * @exception RuggedException if [{@code minDate}, {@code maxDate}] search time span overshoots
- * position or attitude samples by more than {@code overshootTolerance}
- * ,
*/
public SpacecraftToObservedBody(final Frame inertialFrame, final Frame bodyFrame,
final AbsoluteDate minDate, final AbsoluteDate maxDate, final double tStep,
@@ -96,92 +92,86 @@ public class SpacecraftToObservedBody implements Serializable {
final List<TimeStampedPVCoordinates> positionsVelocities, final int pvInterpolationNumber,
final CartesianDerivativesFilter pvFilter,
final List<TimeStampedAngularCoordinates> quaternions, final int aInterpolationNumber,
- final AngularDerivativesFilter aFilter)
- throws RuggedException {
- try {
-
- this.inertialFrame = inertialFrame;
- this.bodyFrame = bodyFrame;
- this.minDate = minDate;
- this.maxDate = maxDate;
- this.overshootTolerance = overshootTolerance;
-
- // safety checks
- final AbsoluteDate minPVDate = positionsVelocities.get(0).getDate();
- final AbsoluteDate maxPVDate = positionsVelocities.get(positionsVelocities.size() - 1).getDate();
- if (minPVDate.durationFrom(minDate) > overshootTolerance) {
- throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, minDate, minPVDate, maxPVDate);
- }
- if (maxDate.durationFrom(maxPVDate) > overshootTolerance) {
- throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, maxDate, minPVDate, maxPVDate);
- }
+ final AngularDerivativesFilter aFilter) {
- final AbsoluteDate minQDate = quaternions.get(0).getDate();
- final AbsoluteDate maxQDate = quaternions.get(quaternions.size() - 1).getDate();
- if (minQDate.durationFrom(minDate) > overshootTolerance) {
- throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, minDate, minQDate, maxQDate);
- }
- if (maxDate.durationFrom(maxQDate) > overshootTolerance) {
- throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, maxDate, minQDate, maxQDate);
- }
+ this.inertialFrame = inertialFrame;
+ this.bodyFrame = bodyFrame;
+ this.minDate = minDate;
+ this.maxDate = maxDate;
+ this.overshootTolerance = overshootTolerance;
- // set up the cache for position-velocities
- final TimeStampedCache<TimeStampedPVCoordinates> pvCache =
- new ImmutableTimeStampedCache<TimeStampedPVCoordinates>(pvInterpolationNumber, positionsVelocities);
-
- // set up the cache for attitudes
- final TimeStampedCache<TimeStampedAngularCoordinates> aCache =
- new ImmutableTimeStampedCache<TimeStampedAngularCoordinates>(aInterpolationNumber, quaternions);
-
- final int n = (int) FastMath.ceil(maxDate.durationFrom(minDate) / tStep);
- this.tStep = tStep;
- this.bodyToInertial = new ArrayList<Transform>(n);
- this.inertialToBody = new ArrayList<Transform>(n);
- this.scToInertial = new ArrayList<Transform>(n);
- for (AbsoluteDate date = minDate; bodyToInertial.size() < n; date = date.shiftedBy(tStep)) {
-
- // interpolate position-velocity, allowing slight extrapolation near the boundaries
- final AbsoluteDate pvInterpolationDate;
- if (date.compareTo(pvCache.getEarliest().getDate()) < 0) {
- pvInterpolationDate = pvCache.getEarliest().getDate();
- } else if (date.compareTo(pvCache.getLatest().getDate()) > 0) {
- pvInterpolationDate = pvCache.getLatest().getDate();
- } else {
- pvInterpolationDate = date;
- }
- final TimeStampedPVCoordinates interpolatedPV =
- TimeStampedPVCoordinates.interpolate(pvInterpolationDate, pvFilter,
- pvCache.getNeighbors(pvInterpolationDate));
- final TimeStampedPVCoordinates pv = interpolatedPV.shiftedBy(date.durationFrom(pvInterpolationDate));
-
- // interpolate attitude, allowing slight extrapolation near the boundaries
- final AbsoluteDate aInterpolationDate;
- if (date.compareTo(aCache.getEarliest().getDate()) < 0) {
- aInterpolationDate = aCache.getEarliest().getDate();
- } else if (date.compareTo(aCache.getLatest().getDate()) > 0) {
- aInterpolationDate = aCache.getLatest().getDate();
- } else {
- aInterpolationDate = date;
- }
- final TimeStampedAngularCoordinates interpolatedQuaternion =
- TimeStampedAngularCoordinates.interpolate(aInterpolationDate, aFilter,
- aCache.getNeighbors(aInterpolationDate).collect(Collectors.toList()));
- final TimeStampedAngularCoordinates quaternion = interpolatedQuaternion.shiftedBy(date.durationFrom(aInterpolationDate));
-
- // store transform from spacecraft frame to inertial frame
- scToInertial.add(new Transform(date,
- new Transform(date, quaternion.revert()),
- new Transform(date, pv)));
-
- // store transform from body frame to inertial frame
- final Transform b2i = bodyFrame.getTransformTo(inertialFrame, date);
- bodyToInertial.add(b2i);
- inertialToBody.add(b2i.getInverse());
+ // safety checks
+ final AbsoluteDate minPVDate = positionsVelocities.get(0).getDate();
+ final AbsoluteDate maxPVDate = positionsVelocities.get(positionsVelocities.size() - 1).getDate();
+ if (minPVDate.durationFrom(minDate) > overshootTolerance) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, minDate, minPVDate, maxPVDate);
+ }
+ if (maxDate.durationFrom(maxPVDate) > overshootTolerance) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, maxDate, minPVDate, maxPVDate);
+ }
+ final AbsoluteDate minQDate = quaternions.get(0).getDate();
+ final AbsoluteDate maxQDate = quaternions.get(quaternions.size() - 1).getDate();
+ if (minQDate.durationFrom(minDate) > overshootTolerance) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, minDate, minQDate, maxQDate);
+ }
+ if (maxDate.durationFrom(maxQDate) > overshootTolerance) {
+ throw new RuggedException(RuggedMessages.OUT_OF_TIME_RANGE, maxDate, minQDate, maxQDate);
+ }
+
+ // set up the cache for position-velocities
+ final TimeStampedCache<TimeStampedPVCoordinates> pvCache =
+ new ImmutableTimeStampedCache<TimeStampedPVCoordinates>(pvInterpolationNumber, positionsVelocities);
+
+ // set up the cache for attitudes
+ final TimeStampedCache<TimeStampedAngularCoordinates> aCache =
+ new ImmutableTimeStampedCache<TimeStampedAngularCoordinates>(aInterpolationNumber, quaternions);
+
+ final int n = (int) FastMath.ceil(maxDate.durationFrom(minDate) / tStep);
+ this.tStep = tStep;
+ this.bodyToInertial = new ArrayList<Transform>(n);
+ this.inertialToBody = new ArrayList<Transform>(n);
+ this.scToInertial = new ArrayList<Transform>(n);
+ for (AbsoluteDate date = minDate; bodyToInertial.size() < n; date = date.shiftedBy(tStep)) {
+
+ // interpolate position-velocity, allowing slight extrapolation near the boundaries
+ final AbsoluteDate pvInterpolationDate;
+ if (date.compareTo(pvCache.getEarliest().getDate()) < 0) {
+ pvInterpolationDate = pvCache.getEarliest().getDate();
+ } else if (date.compareTo(pvCache.getLatest().getDate()) > 0) {
+ pvInterpolationDate = pvCache.getLatest().getDate();
+ } else {
+ pvInterpolationDate = date;
}
+ final TimeStampedPVCoordinates interpolatedPV =
+ TimeStampedPVCoordinates.interpolate(pvInterpolationDate, pvFilter,
+ pvCache.getNeighbors(pvInterpolationDate));
+ final TimeStampedPVCoordinates pv = interpolatedPV.shiftedBy(date.durationFrom(pvInterpolationDate));
+
+ // interpolate attitude, allowing slight extrapolation near the boundaries
+ final AbsoluteDate aInterpolationDate;
+ if (date.compareTo(aCache.getEarliest().getDate()) < 0) {
+ aInterpolationDate = aCache.getEarliest().getDate();
+ } else if (date.compareTo(aCache.getLatest().getDate()) > 0) {
+ aInterpolationDate = aCache.getLatest().getDate();
+ } else {
+ aInterpolationDate = date;
+ }
+ final TimeStampedAngularCoordinates interpolatedQuaternion =
+ TimeStampedAngularCoordinates.interpolate(aInterpolationDate, aFilter,
+ aCache.getNeighbors(aInterpolationDate).collect(Collectors.toList()));
+ final TimeStampedAngularCoordinates quaternion = interpolatedQuaternion.shiftedBy(date.durationFrom(aInterpolationDate));
+
+ // store transform from spacecraft frame to inertial frame
+ scToInertial.add(new Transform(date,
+ new Transform(date, quaternion.revert()),
+ new Transform(date, pv)));
+
+ // store transform from body frame to inertial frame
+ final Transform b2i = bodyFrame.getTransformTo(inertialFrame, date);
+ bodyToInertial.add(b2i);
+ inertialToBody.add(b2i.getInverse());
- } catch (OrekitException oe) {
- throw new RuggedException(oe, oe.getSpecifier(), oe.getParts());
}
}
@@ -262,30 +252,24 @@ public class SpacecraftToObservedBody implements Serializable {
/** Get transform from spacecraft to inertial frame.
* @param date date of the transform
* @return transform from spacecraft to inertial frame
- * @exception RuggedException if frames cannot be computed at date
*/
- public Transform getScToInertial(final AbsoluteDate date)
- throws RuggedException {
+ public Transform getScToInertial(final AbsoluteDate date) {
return interpolate(date, scToInertial);
}
/** Get transform from inertial frame to observed body frame.
* @param date date of the transform
* @return transform from inertial frame to observed body frame
- * @exception RuggedException if frames cannot be computed at date
*/
- public Transform getInertialToBody(final AbsoluteDate date)
- throws RuggedException {
+ public Transform getInertialToBody(final AbsoluteDate date) {
return interpolate(date, inertialToBody);
}
/** Get transform from observed body frame to inertial frame.
* @param date date of the transform
* @return transform from observed body frame to inertial frame
- * @exception RuggedException if frames cannot be computed at date
*/
- public Transform getBodyToInertial(final AbsoluteDate date)
- throws RuggedException {
+ public Transform getBodyToInertial(final AbsoluteDate date) {
return interpolate(date, bodyToInertial);
}
@@ -293,10 +277,8 @@ public class SpacecraftToObservedBody implements Serializable {
* @param date date of the transform
* @param list transforms list to interpolate from
* @return interpolated transform
- * @exception RuggedException if frames cannot be computed at date
*/
- private Transform interpolate(final AbsoluteDate date, final List<Transform> list)
- throws RuggedException {
+ private Transform interpolate(final AbsoluteDate date, final List<Transform> list) {
// check date range
if (!isInRange(date)) {
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8
index 38413426ef1eb35879f0adfcebbb337631f620fb..30a675f16e0c3bb415f7866d69203832895380ef 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_da.utf8
@@ -1,5 +1,5 @@
# internal error, contact maintenance at {0}
-INTERNAL_ERROR = intern fejl. Kontakt vedligeholdsansvarlig {0}
+INTERNAL_ERROR = intern fejl. Kontakt vedligeholdsansvarlig på {0}
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = ingen data fundet på [{0}, {1}], flisen dækker kun fra [0, 0] til [{2}, {3}] (inkluderet)
@@ -62,7 +62,10 @@ CANNOT_PARSE_LINE = kan ikke fortolke linje {0}, fil {1}: {2}
LIGHT_TIME_CORRECTION_REDEFINED = lystidskorrektion omdefineret, linje {0}, fil {1}: {2}
# aberration of light correction redefined, line {0}, file {1}: {2}
-ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = aberrationskorrektion omdefineret, linje {0}, fil {1}: {2}
+ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = lysaberrationskorrektion omdefineret, linje {0}, fil {1}: {2}
+
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = <MISSING TRANSLATION>
# tile {0} already defined, line {1}, file {2}: {3}
TILE_ALREADY_DEFINED = flise {0} allerede defineret, linje {1}, fil {2}: {3}
@@ -71,20 +74,25 @@ TILE_ALREADY_DEFINED = flise {0} allerede defineret, linje {1}, fil {2}: {3}
UNKNOWN_TILE = ukendt flise {0}, linje {1}, fil {2}: {3}
# no parameters have been selected for estimation
-NO_PARAMETERS_SELECTED = <MISSING TRANSLATION>
+NO_PARAMETERS_SELECTED = ingen parametre er udvalgt til estimering
# no reference mappings for parameters estimation
-NO_REFERENCE_MAPPINGS = <MISSING TRANSLATION>
+NO_REFERENCE_MAPPINGS = ingen referencemapping til estimering af parametre
# a different parameter with name {0} already exists
-DUPLICATED_PARAMETER_NAME = <MISSING TRANSLATION>
+DUPLICATED_PARAMETER_NAME = en anden parameter ned navnet {0} findes allerede
# rugged name is not found
-INVALID_RUGGED_NAME = <MISSING TRANSLATION>
+INVALID_RUGGED_NAME = rugged navn blev ikke fundet
# refining using {0} rugged instance is not handled
-UNSUPPORTED_REFINING_CONTEXT = <MISSING TRANSLATION>
+UNSUPPORTED_REFINING_CONTEXT = raffinering med rugged instansen {0} blev ikke håndteret
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
-NO_LAYER_DATA = <MISSING TRANSLATION>
+NO_LAYER_DATA = ingen atmosfæriske lagdata ved højden {0} (laveste højde: {1})
+
+# step {0} is not valid : {1}
+INVALID_STEP = skridt {0} er ikke gyldigt : {1}
+# range between min line {0} and max line {1} too small {2}
+INVALID_RANGE_FOR_LINES = interval mellem minimumslinje {0} og maksimumslinje {1} for lille {2}
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
index 065de378968f59ff30c8930ca6282baadb6bf63b..63f06fe26e823245d490aeab49e6a28714125ced 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
@@ -1,5 +1,5 @@
-# internal error, contact maintenance at {0}
-INTERNAL_ERROR = Interner Fehler, wenden Sie sich bitte an die Software-Wartung, Adresse {0}
+# internal error, please notify development team by creating an issue at {0}
+INTERNAL_ERROR = <MISSING TRANSLATION>
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = Keine Angaben im Index, die Ziegel nimmt nur Bezug auf [0, 0] bis [{2}, {3}] (inklusive)
@@ -64,6 +64,9 @@ LIGHT_TIME_CORRECTION_REDEFINED = <MISSING TRANSLATION>
# aberration of light correction redefined, line {0}, file {1}: {2}
ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = <MISSING TRANSLATION>
+
# tile {0} already defined, line {1}, file {2}: {3}
TILE_ALREADY_DEFINED = <MISSING TRANSLATION>
@@ -87,3 +90,9 @@ UNSUPPORTED_REFINING_CONTEXT = <MISSING TRANSLATION>
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
NO_LAYER_DATA = <MISSING TRANSLATION>
+
+# step {0} is not valid : {1}
+INVALID_STEP = <MISSING TRANSLATION>
+
+# range between min line {0} and max line {1} is invalid {2}
+INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
index fdd3477562e3244a13324262ff8c93fff7f5e795..ec8394218db8d9c69365b155fed52d251c16a6aa 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
@@ -1,5 +1,5 @@
-# internal error, contact maintenance at {0}
-INTERNAL_ERROR = internal error, contact maintenance at {0}
+# internal error, please notify development team by creating an issue at {0}
+INTERNAL_ERROR = internal error, please notify development team by creating an issue at {0}
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
@@ -64,6 +64,9 @@ LIGHT_TIME_CORRECTION_REDEFINED = light time correction redefined, line {0}, fil
# aberration of light correction redefined, line {0}, file {1}: {2}
ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = aberration of light correction redefined, line {0}, file {1}: {2}
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = atmospheric refraction correction redefined, line {0}, file {1}: {2}
+
# tile {0} already defined, line {1}, file {2}: {3}
TILE_ALREADY_DEFINED = tile {0} already defined, line {1}, file {2}: {3}
@@ -87,3 +90,9 @@ UNSUPPORTED_REFINING_CONTEXT = refining using {0} rugged instance is not handled
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
NO_LAYER_DATA = no atmospheric layer data at altitude {0} (lowest altitude: {1})
+
+# step {0} is not valid : {1}
+INVALID_STEP = step {0} is not valid : {1}
+
+# range between min line {0} and max line {1} is invalid {2}
+INVALID_RANGE_FOR_LINES = range between min line {0} and max line {1} is invalid {2}
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
index cb625d1015466ee2bb6d933caa98940349933d26..872c2fcb92de319989c71fcee05431ba5ffa6b91 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
@@ -1,5 +1,5 @@
-# internal error, contact maintenance at {0}
-INTERNAL_ERROR = error interno, contacte al soporte técnico en {0}
+# internal error, please notify development team by creating an issue at {0}
+INTERNAL_ERROR = <MISSING TRANSLATION>
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = no hay datos en los Ãndices [{0}, {1}], la faceta sólo cubre desde [0, 0] a [{2}, {3}] (inclusive)
@@ -8,7 +8,7 @@ OUT_OF_TILE_INDICES = no hay datos en los Ãndices [{0}, {1}], la faceta sólo c
OUT_OF_TILE_ANGLES = no hay datos para la latitud {0} y la longitud {1}, la faceta sólo cubre las latitudes de {2} a {3} y las longitudes de {4} a {5}
# no Digital Elevation Model data at latitude {0} and longitude {1}
-NO_DEM_DATA = <MISSING TRANSLATION>
+NO_DEM_DATA = ho hay datos del Modelo Digital del Terreno para la latitud {0} y longitud {1}
# the tile selected for latitude {0} and longitude {1} does not contain required point neighborhood
TILE_WITHOUT_REQUIRED_NEIGHBORS_SELECTED = la faceta seleccionada para la latitud {0} y longitud {1} no cumple el requisito de vecindad
@@ -47,43 +47,52 @@ FRAMES_MISMATCH_WITH_INTERPOLATOR_DUMP = el sistema de referencia {0} no corresp
NOT_INTERPOLATOR_DUMP_DATA = los datos no están en el volcado de datos del interpolador
# debug dump is already active for this thread
-DEBUG_DUMP_ALREADY_ACTIVE = <MISSING TRANSLATION>
+DEBUG_DUMP_ALREADY_ACTIVE = el volcado de datos en modo depuración ya está activo para este hilo
# unable to active debug dump with file {0}: {1}
-DEBUG_DUMP_ACTIVATION_ERROR = <MISSING TRANSLATION>
+DEBUG_DUMP_ACTIVATION_ERROR = no se puede activar el volcado de datos en modo depuración con los ficheros {0}: {1}
# debug dump is not active for this thread
-DEBUG_DUMP_NOT_ACTIVE = <MISSING TRANSLATION>
+DEBUG_DUMP_NOT_ACTIVE = el volcado de datos en modo depuración no está activo para este hilo
# cannot parse line {0}, file {1}: {2}
-CANNOT_PARSE_LINE = <MISSING TRANSLATION>
+CANNOT_PARSE_LINE = no se puede leer la lÃnea {0}, fichero {1}: {2}
# light time correction redefined, line {0}, file {1}: {2}
-LIGHT_TIME_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+LIGHT_TIME_CORRECTION_REDEFINED = la corrección luz-tiempo ha sido redefinida, lÃnea {0}, fichero {1}: {2}
# aberration of light correction redefined, line {0}, file {1}: {2}
-ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = la aberración de la corrección luz ha sido redefinida, lÃnea {0}, fichero {1}: {2}
+
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = <MISSING TRANSLATION>
# tile {0} already defined, line {1}, file {2}: {3}
-TILE_ALREADY_DEFINED = <MISSING TRANSLATION>
+TILE_ALREADY_DEFINED = la faceta {0} ya está definida, lÃnea {1}, fichero {2}: {3}
# unknown tile {0}, line {1}, file {2}: {3}
-UNKNOWN_TILE = <MISSING TRANSLATION>
+UNKNOWN_TILE = faceta {0} desconocida, lÃnea {1}, fichero {2}: {3}
# no parameters have been selected for estimation
-NO_PARAMETERS_SELECTED = <MISSING TRANSLATION>
+NO_PARAMETERS_SELECTED = no se ha seleccionado ningún parámetro que estimar
# no reference mappings for parameters estimation
-NO_REFERENCE_MAPPINGS = <MISSING TRANSLATION>
+NO_REFERENCE_MAPPINGS = no hay mapeados de referencia para estimar los parámetros
# a different parameter with name {0} already exists
-DUPLICATED_PARAMETER_NAME = <MISSING TRANSLATION>
+DUPLICATED_PARAMETER_NAME = ya existe un parámetro con el nombre {0}
# rugged name is not found
-INVALID_RUGGED_NAME = <MISSING TRANSLATION>
+INVALID_RUGGED_NAME = el nombre no se considera válido para Rugged
# refining using {0} rugged instance is not handled
-UNSUPPORTED_REFINING_CONTEXT = <MISSING TRANSLATION>
+UNSUPPORTED_REFINING_CONTEXT = no se puede refinar usando {0} instancias rugged
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
-NO_LAYER_DATA = <MISSING TRANSLATION>
\ No newline at end of file
+NO_LAYER_DATA = no hay datos de atmósfera para la altitud {0} (altitud mÃnima: {1})
+
+# step {0} is not valid : {1}
+INVALID_STEP = <MISSING TRANSLATION>
+
+# range between min line {0} and max line {1} is invalid {2}
+INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
index 322d9d94c20dd3879e9bc5fa449be87889b12ea6..59152480f0f0a248198f43aa31e0b356e0affa4b 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
@@ -1,5 +1,5 @@
-# internal error, contact maintenance at {0}
-INTERNAL_ERROR = erreur interne, contactez la maintenance à {0}
+# internal error, please notify development team by creating an issue at {0}
+INTERNAL_ERROR = erreur interne, merci de signaler le problème en ouvrant une fiche d''anomalie sur {0}
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = aucune donnée aux indices [{0}, {1}], la tuile ne couvre que de [0, 0] à [{2}, {3}] inclus
@@ -64,6 +64,9 @@ LIGHT_TIME_CORRECTION_REDEFINED = correction de la durée lumière redéfinie li
# aberration of light correction redefined, line {0}, file {1}: {2}
ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = correction de l''aberration de la lumière redéfinie ligne {0} du fichier {1}: {2}
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = correction de la refraction atmosphérique redéfinie ligne {0} du fichier {1}: {2}
+
# tile {0} already defined, line {1}, file {2}: {3}
TILE_ALREADY_DEFINED = tuile {0} déjà définie ligne {1} du fichier {2}: {3}
@@ -87,3 +90,9 @@ UNSUPPORTED_REFINING_CONTEXT = le cas d''affinage utilisant {0} instances de rug
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
NO_LAYER_DATA = pas de couche atmosphérique définie pour l''altitude {0} (altitude la plus basse : {1})
+
+# step {0} is not valid : {1}
+INVALID_STEP = le pas {0} n''est pas valable : {1}
+
+# range between min line {0} and max line {1} is invalid {2}
+INVALID_RANGE_FOR_LINES = l''écart entre la ligne min {0} et la ligne max {1} est non valide {2}
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
index 2ef204f2abe3e887d270911d20aaa7261c5d807a..7953c301262bff78a6be8e08af1cb01cd78e29a5 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
@@ -1,5 +1,5 @@
-# internal error, contact maintenance at {0}
-INTERNAL_ERROR = erro interno, contacte co soporte técnico no {0}
+# internal error, please notify development team by creating an issue at {0}
+INTERNAL_ERROR = <MISSING TRANSLATION>
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = non hai datos nos Ãndices [{0}, {1}], a faceta só cubre dende [0, 0] a [{2}, {3}] (inclusive)
@@ -64,6 +64,9 @@ LIGHT_TIME_CORRECTION_REDEFINED = <MISSING TRANSLATION>
# aberration of light correction redefined, line {0}, file {1}: {2}
ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = <MISSING TRANSLATION>
+
# tile {0} already defined, line {1}, file {2}: {3}
TILE_ALREADY_DEFINED = <MISSING TRANSLATION>
@@ -86,4 +89,10 @@ INVALID_RUGGED_NAME = <MISSING TRANSLATION>
UNSUPPORTED_REFINING_CONTEXT = <MISSING TRANSLATION>
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
-NO_LAYER_DATA = <MISSING TRANSLATION>
\ No newline at end of file
+NO_LAYER_DATA = <MISSING TRANSLATION>
+
+# step {0} is not valid : {1}
+INVALID_STEP = <MISSING TRANSLATION>
+
+# range between min line {0} and max line {1} is invalid {2}
+INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
index ae2f6523c1201af72c5cf92a476fd78bbd0e8a54..b6101683412513d15e9a761c7e5ec9f25efa0595 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
@@ -2,13 +2,13 @@
INTERNAL_ERROR = errore interno, contattare l''assistenza a {0}
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
-OUT_OF_TILE_INDICES = nessun dato agli indici [{0}, {1}], il quadrante non copre che da [0, 0] a [{2}, {3}] inclus
+OUT_OF_TILE_INDICES = nessun dato agli indici [{0}, {1}], il quadrante non copre che da [0, 0] a [{2}, {3}] inclusi
# no data at latitude {0} and longitude {1}, tile covers only latitudes {2} to {3} and longitudes {4} to {5}
-OUT_OF_TILE_ANGLES = nessun dato alla latitudine {0} e alla longitudine {1}, il quadrante non copre che le latitudini da {2} a {3} et les longitudes de {4} Ã {5}
+OUT_OF_TILE_ANGLES = nessun dato alla latitudine {0} e alla longitudine {1}, il quadrante non copre che le latitudini da {2} a {3} et le longitudini da {4} a {5}
# no Digital Elevation Model data at latitude {0} and longitude {1}
-NO_DEM_DATA = <MISSING TRANSLATION>
+NO_DEM_DATA = nessun dato nel Modello Digitale di Elevazione alla latitudine {0} e alla longitudine {1}
# the tile selected for latitude {0} and longitude {1} does not contain required point neighborhood
TILE_WITHOUT_REQUIRED_NEIGHBORS_SELECTED = il quadrante selezionato per la latitudine {0} e la longitudine {1} non contiene i punti dei dintorni richiesti
@@ -35,10 +35,10 @@ LINE_OF_SIGHT_NEVER_CROSSES_LATITUDE = la linea di visibilità non attraversa ma
LINE_OF_SIGHT_NEVER_CROSSES_LONGITUDE = la linea di visibilità non attraversa mai la longitudine {0}
# line never crosses altitude {0}
-LINE_OF_SIGHT_NEVER_CROSSES_ALTITUDE = la linea di visibilità non attraversa mai la altitudine {0}
+LINE_OF_SIGHT_NEVER_CROSSES_ALTITUDE = la linea di visibilità non attraversa mai l''altitudine {0}
# line-of-sight enters the Digital Elevation Model behind spacecraft!
-DEM_ENTRY_POINT_IS_BEHIND_SPACECRAFT = la linea di visibilità entra nel Modello Digitale di Suolo dietro il satellite!
+DEM_ENTRY_POINT_IS_BEHIND_SPACECRAFT = la linea di visibilità entra nel Modello Digitale di Elevazione dietro il satellite!
# frame {0} does not match frame {1} from interpolator dump
FRAMES_MISMATCH_WITH_INTERPOLATOR_DUMP = il riferimento {0} non corrisponde al riferimento {1} dell''interpolatore salvato
@@ -47,43 +47,52 @@ FRAMES_MISMATCH_WITH_INTERPOLATOR_DUMP = il riferimento {0} non corrisponde al r
NOT_INTERPOLATOR_DUMP_DATA = i dati non corrispondono a un salvatagggio d''interpolatore
# debug dump is already active for this thread
-DEBUG_DUMP_ALREADY_ACTIVE = <MISSING TRANSLATION>
+DEBUG_DUMP_ALREADY_ACTIVE = dump di debug già attivo per questo thread
# unable to active debug dump with file {0}: {1}
-DEBUG_DUMP_ACTIVATION_ERROR = <MISSING TRANSLATION>
+DEBUG_DUMP_ACTIVATION_ERROR = impossibile attivare il dump di debug con il file {0}: {1}
# debug dump is not active for this thread
-DEBUG_DUMP_NOT_ACTIVE = <MISSING TRANSLATION>
+DEBUG_DUMP_NOT_ACTIVE = dump di debug non attivo per questo thread
# cannot parse line {0}, file {1}: {2}
-CANNOT_PARSE_LINE = <MISSING TRANSLATION>
+CANNOT_PARSE_LINE = impossibile analizzare la linea {0}, file{1}: {2}
# light time correction redefined, line {0}, file {1}: {2}
-LIGHT_TIME_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+LIGHT_TIME_CORRECTION_REDEFINED = Correzione luce-tempo ridefinita, linea {0} del file {1}: {2}
# aberration of light correction redefined, line {0}, file {1}: {2}
-ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = Correzione dell''aberrazione stellare ridefinita, linea {0} del file {1}: {2}
+
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = <MISSING TRANSLATION>
# tile {0} already defined, line {1}, file {2}: {3}
-TILE_ALREADY_DEFINED = <MISSING TRANSLATION>
+TILE_ALREADY_DEFINED = quadrante {0} già definito, linea {1}, file {2}: {3}
# unknown tile {0}, line {1}, file {2}: {3}
-UNKNOWN_TILE = <MISSING TRANSLATION>
+UNKNOWN_TILE = quadrante {0} sconosciuto, linea {1}, file {2}: {3}
# no parameters have been selected for estimation
-NO_PARAMETERS_SELECTED = <MISSING TRANSLATION>
+NO_PARAMETERS_SELECTED = nessun parametro è stato selezionato per essere stimato
# no reference mappings for parameters estimation
-NO_REFERENCE_MAPPINGS = <MISSING TRANSLATION>
+NO_REFERENCE_MAPPINGS = nessun mapping di riferimento per la stima dei parametri
# a different parameter with name {0} already exists
-DUPLICATED_PARAMETER_NAME = <MISSING TRANSLATION>
+DUPLICATED_PARAMETER_NAME = un altro parametro chiamato {0} esiste giÃ
# rugged name is not found
-INVALID_RUGGED_NAME = <MISSING TRANSLATION>
+INVALID_RUGGED_NAME = nome non valido per Rugged
-# refining using {0} rugged instance is not handled
-UNSUPPORTED_REFINING_CONTEXT = <MISSING TRANSLATION>
+# refining context is only handled for limited number of configurations
+UNSUPPORTED_REFINING_CONTEXT = il refining che usa {0} istanze rugged non è gestito
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
-NO_LAYER_DATA = <MISSING TRANSLATION>
+NO_LAYER_DATA = nessun dato atmosferico all''altitudine {0} (altitudine più bassa: {1})
+
+# step {0} is not valid : {1}
+INVALID_STEP = Step {0} non valido: {1}
+
+# range between min line {0} and max line {1} too small {2}
+ INVALID_RANGE_FOR_LINES = Scarto fra la linea min {0} e la linea max {1} troppo piccolo {2}
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8
index c51adee3934b8de6c7551c66101385bcca910c9e..33a5f7d52284c566c277b958edbbb5a0d025777d 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8
@@ -1,5 +1,5 @@
-# internal error, contact maintenance at {0}
-INTERNAL_ERROR = intern feil. Kontakt vedlikeholdsansvarlig {0}
+# internal error, please notify development team by creating an issue at {0}
+INTERNAL_ERROR = intern feil, kontakt utviklingerne ved å åpne en problemrapport på {0}
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = ingen data funnet på [{0}, {1}], flisen dekker kun fra [0, 0] til [{2}, {3}] (inkludert)
@@ -8,7 +8,7 @@ OUT_OF_TILE_INDICES = ingen data funnet på [{0}, {1}], flisen dekker kun fra [0
OUT_OF_TILE_ANGLES = ingen data på breddegrad {0} og lengdegrad {1}, flisen dekker kun breddegradene {2} til {3} og lengdegradene {4} til {5}
# no Digital Elevation Model data at latitude {0} and longitude {1}
-NO_DEM_DATA = <MISSING TRANSLATION>
+NO_DEM_DATA = ingen Digital Elevation Model data på breddegrad {0} og lengdegrad {1}
# the tile selected for latitude {0} and longitude {1} does not contain required point neighborhood
TILE_WITHOUT_REQUIRED_NEIGHBORS_SELECTED = den valgte flisen for breddegrad {0} og lengdegrad {1} inneholder ikke nødvendig nabopunkt
@@ -47,43 +47,52 @@ FRAMES_MISMATCH_WITH_INTERPOLATOR_DUMP = rammen {0} stemmer ikke med rammen {1}
NOT_INTERPOLATOR_DUMP_DATA = dataen er ikke en interpolar-dump
# debug dump is already active for this thread
-DEBUG_DUMP_ALREADY_ACTIVE = <MISSING TRANSLATION>
+DEBUG_DUMP_ALREADY_ACTIVE = debug dump er allerede aktiv for denne tråden
# unable to active debug dump with file {0}: {1}
-DEBUG_DUMP_ACTIVATION_ERROR = <MISSING TRANSLATION>
+DEBUG_DUMP_ACTIVATION_ERROR = kan ikke aktivere debug dump med filen {0}: {1}
# debug dump is not active for this thread
-DEBUG_DUMP_NOT_ACTIVE = <MISSING TRANSLATION>
+DEBUG_DUMP_NOT_ACTIVE = debug dump er ikke aktiv for denne tråden
# cannot parse line {0}, file {1}: {2}
-CANNOT_PARSE_LINE = <MISSING TRANSLATION>
+CANNOT_PARSE_LINE = kan ikke lese linje {0}, fil {1}: {2}
# light time correction redefined, line {0}, file {1}: {2}
-LIGHT_TIME_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+LIGHT_TIME_CORRECTION_REDEFINED = redefinert lystidkorreksjon, linje {0}, fil {1}: {2}
# aberration of light correction redefined, line {0}, file {1}: {2}
-ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = <MISSING TRANSLATION>
+ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = lyskorreksjons aberrasjonen redefinert, linje {0}, fil {1}: {2}
+
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = <MISSING TRANSLATION>
# tile {0} already defined, line {1}, file {2}: {3}
-TILE_ALREADY_DEFINED = <MISSING TRANSLATION>
+TILE_ALREADY_DEFINED = flis {0} er allerede definert, linje {1}, fil {2}: {3}
# unknown tile {0}, line {1}, file {2}: {3}
-UNKNOWN_TILE = <MISSING TRANSLATION>
+UNKNOWN_TILE = ukjent flis {0}, linje {1}, fil {2}: {3}
# no parameters have been selected for estimation
-NO_PARAMETERS_SELECTED = <MISSING TRANSLATION>
+NO_PARAMETERS_SELECTED = ingen parametere har blitt valgt til anslaget
# no reference mappings for parameters estimation
-NO_REFERENCE_MAPPINGS = <MISSING TRANSLATION>
+NO_REFERENCE_MAPPINGS = ingen korrespondansereferanse for parameteranslaget
# a different parameter with name {0} already exists
-DUPLICATED_PARAMETER_NAME = <MISSING TRANSLATION>
+DUPLICATED_PARAMETER_NAME = en annen parameter med navn {0} finnes allerede
# rugged name is not found
-INVALID_RUGGED_NAME = <MISSING TRANSLATION>
+INVALID_RUGGED_NAME = rugged navnet ble ikke funnet
# refining using {0} rugged instance is not handled
-UNSUPPORTED_REFINING_CONTEXT = <MISSING TRANSLATION>
+UNSUPPORTED_REFINING_CONTEXT = raffinere med {0} rugged instanser er ikke støttet
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
-NO_LAYER_DATA = <MISSING TRANSLATION>
\ No newline at end of file
+NO_LAYER_DATA = ikke noe atmosfærisk lag definert ved {0} (laveste høyde: {1})
+
+# step {0} is not valid : {1}
+INVALID_STEP = steget {0} er ikke gyldig: {1}
+
+# range between min line {0} and max line {1} is invalid {2}
+INVALID_RANGE_FOR_LINES = avstanden mellom min linje {0} og max linje {1} er ugyldig {2}
diff --git a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8 b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8
index 99cf4324d4ddbee53a976227df3cab25a458f637..d2a286608423c53dfbce9fc037c9dda42f8aacc9 100644
--- a/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8
+++ b/src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8
@@ -1,5 +1,5 @@
-# internal error, contact maintenance at {0}
-INTERNAL_ERROR = eroare internă, contactați echipa de întrținere la {0}
+# internal error, please notify development team by creating an issue at {0}
+INTERNAL_ERROR = <MISSING TRANSLATION>
# no data at indices [{0}, {1}], tile only covers from [0, 0] to [{2}, {3}] (inclusive)
OUT_OF_TILE_INDICES = date inexistente pentru indicii [{0}, {1}], regiunea oferă acoperire doar pentru intervalul de la [0, 0] la [{2}, {3}] (inclusiv)
@@ -64,6 +64,9 @@ LIGHT_TIME_CORRECTION_REDEFINED = corecția duratei luminoase redefinită la lin
# aberration of light correction redefined, line {0}, file {1}: {2}
ABERRATION_OF_LIGHT_CORRECTION_REDEFINED = corecția aberației luminoase redefinită la linia {0} din fișierul {1}: {2}
+# atmospheric refraction correction redefined, line {0}, file {1}: {2}
+ATMOSPHERIC_REFRACTION_REDEFINED = <MISSING TRANSLATION>
+
# tile {0} already defined, line {1}, file {2}: {3}
TILE_ALREADY_DEFINED = titlul {0} este deja definit, linia {1} din fișierul {2}: {3}
@@ -86,4 +89,10 @@ INVALID_RUGGED_NAME = nume invalid pentru Rugged
UNSUPPORTED_REFINING_CONTEXT = Estimarea realizată folosind {0} instanțe Rugged nu este suportată
# no atmospheric layer data at altitude {0} (lowest altitude: {1})
-NO_LAYER_DATA = nu există informații referitoare la atmosferă pentru altitudinea {0} (altitudinea minimă: {1})
\ No newline at end of file
+NO_LAYER_DATA = nu există informații referitoare la atmosferă pentru altitudinea {0} (altitudinea minimă: {1})
+
+# step {0} is not valid : {1}
+INVALID_STEP = <MISSING TRANSLATION>
+
+# range between min line {0} and max line {1} is invalid {2}
+INVALID_RANGE_FOR_LINES = <MISSING TRANSLATION>
diff --git a/src/site/markdown/building.md b/src/site/markdown/building.md
index 4ffb5aa2a6bfc16a8dcb576a47bfeaf3ac425d4e..d620655a8bdeb797009e2711b352b3fce87ca6d6 100644
--- a/src/site/markdown/building.md
+++ b/src/site/markdown/building.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,8 +12,9 @@
limitations under the License.
-->
-Building Rugged
-===============
+<a name="top"></a>
+
+# Building Rugged
Rugged can be built from source using several different tools.
@@ -21,10 +22,9 @@ All these tools are Java based and can run on many different operating
systems, including Unix, GNU/Linux, Windows and Mac OS X. Some GNU/Linux
distributions provide these tools in their packages repositories.
-Building with Maven 3
----------------------
+## Building with Maven 3
-[Maven](http://maven.apache.org/) is a build tool that goes far beyond
+[Maven](http://maven.apache.org/ "Maven homepage") is a build tool that goes far beyond
simply compiling and packaging a product. It is also able to resolve
dependencies (including downloading the appropriate versions from the public
repositories), to run automated tests, to launch various checking tools and
@@ -57,15 +57,14 @@ with the following command:
mvn install
For other commands like generating the site, or generating the
-[checkstyle](http://checkstyle.sourceforge.net/),
-[findbugs](http://findbugs.sourceforge.net/) or
-[jacoco](http://www.eclemma.org/jacoco/) reports, see the maven
-plugins documentation at [maven site](http://maven.apache.org/plugins/index.html).
+[checkstyle](http://checkstyle.sourceforge.net/ "Checkstyle homepage"),
+[spotbugs](https://spotbugs.github.io/ "Spotbugs homepage") or
+[jacoco](http://www.eclemma.org/jacoco/ "Jacoco homepage") reports, see the maven
+plugins documentation at [maven site](http://maven.apache.org/plugins/index.html "Maven plugins homepage").
-Building with Eclipse
----------------------
+## Building with Eclipse
-[Eclipse](http://www.eclipse.org/) is a very rich Integrated Development
+[Eclipse](http://www.eclipse.org/ "Eclipse homepage") is a very rich Integrated Development
Environment (IDE). It is a huge product and not a simple build tool.
For systems not providing eclipse as a package, it can be downloaded from its
@@ -89,7 +88,9 @@ The simplest way to use Rugged with Eclipse is to follow these steps:
* set the external libraries to JRE system library (provided by Eclipse),
Junit 4.x (provided by Eclipse), Hipparchus (available at
Hipparchus project
- [downloads page](https://www.hipparchus.org/downloads.html),
+ [downloads page](https://www.hipparchus.org/downloads.html)),
and Orekit (available at Orekit
- [downloads page](https://www.orekit.org/forge/projects/orekit/files)
+ [download page](https://www.orekit.org/download.html))
in the libraries tab of the Configure Build Path dialog
+
+[Top of the page](#top)
\ No newline at end of file
diff --git a/src/site/markdown/configuration.md b/src/site/markdown/configuration.md
index 12ae628f9bb99b66ddd8263bb79c6bc9e5eb59f2..0239a94378744748c6b7a47dda87ce1896eac830 100644
--- a/src/site/markdown/configuration.md
+++ b/src/site/markdown/configuration.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,31 +12,32 @@
limitations under the License.
-->
-Configuration
-=============
+<a name="top"></a>
-As Rugged relied on Orekit for the frames computation, Orekit
-must be properly initialized for Rugged to run.
+# Configuration
-The simplest way to configure is to first retrieve the example orekit-data.zip
-file from Orekit [files](https://www.orekit.org/forge/projects/orekit/files) section
-and to unzip it in a known fixed location on your computer (let's assume it is on
-your home folder, and it creates an orekit-data subfolder there).
+As Rugged relied on [Orekit](https://www.orekit.org/ "Orekit homepage") for the frames computation, Orekit
+must be properly initialized for Rugged to run.
-Then near the start of your main program, and before Orekit is called for the
-first time, you will add the following code snippet:
+The simplest way to configure is to first retrieve the example `orekit-data-master.zip`
+file from Rugged download page, available in the [Rugged project download page](https://www.orekit.org/rugged/download.html)
+(Get the physical data)
+and to unzip it anywhere you want, rename the `orekit-data-master` folder that will be created
+into `orekit-data` and add the following lines at the start of your program (before Orekit is called for the
+first time):
- File home = new File(System.getProperty("user.home"));
- File orekitData = new File(home, "orekit-data");
+ File orekitData = new File("/path/to/the/folder/orekit-data");
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
This is sufficient to start working.
-Note that some of the data in the orekit-data folder needs to be updated,
-typically the UTC-TAI.history file, which is updated about once every 18 months
+Note that some of the data in the orekit-data-master folder needs to be updated,
+typically the UTC-TAI history file, which is updated about once every 18 months
by IERS, and the files in the Earth-Orientation-Parameters folder which are updated
regularly by IERS. The update frequency depends on which file you use.
-The data provided in the example archive from Orekit site are example only and are
+The data provided in the example archive from Rugged site are example only and are
not kept up to date. The real operational data are live, and remain under the
-responsibility of the user.
\ No newline at end of file
+responsibility of the user.
+
+[Top of the page](#top)
diff --git a/src/site/markdown/contact.md b/src/site/markdown/contact.md
index 25ef297c698dd24fd6a0b2f92006fb20143aba50..9209202aa66b6c217e72128a21b7f47c13f2888c 100644
--- a/src/site/markdown/contact.md
+++ b/src/site/markdown/contact.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,34 +12,29 @@
limitations under the License.
-->
-Contacts
-========
+<a name="top"></a>
-Mailing lists
--------------
+# Contacts
-Most discussions should occur on the public mailing lists.
+## Forum
-| topic | post address | subscribe URL | archive URL |
-|---------------|------------------------------|--------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|
-| announces | orekit-announces@orekit.org | [https://www.orekit.org/wws/subscribe/orekit-announces](https://www.orekit.org/wws/subscribe/orekit-announces) | [https://www.orekit.org/wws/arc/orekit-announces](https://www.orekit.org/wws/arc/orekit-announces) |
-| users | rugged-users@orekit.org | [https://www.orekit.org/wws/subscribe/rugged-users](https://www.orekit.org/wws/subscribe/rugged-users) | [https://www.orekit.org/wws/arc/rugged-users](https://www.orekit.org/wws/arc/rugged-users) |
-| developers | rugged-developers@orekit.org | [https://www.orekit.org/wws/subscribe/rugged-developers](https://www.orekit.org/wws/subscribe/rugged-developers) | [https://www.orekit.org/wws/arc/rugged-developers](https://www.orekit.org/wws/arc/rugged-developers) |
+Most discussions should occur on the public forums [https://forum.orekit.org/](https://forum.orekit.org/).
+The main categories are:
-Please register to these mailing lists before attempting to post!
+| category | URL |
+|---------------|----------------------------------------------------------------------------------------------------|
+| announces | [https://forum.orekit.org/c/rugged-announcements](https://forum.orekit.org/c/rugged-announcements) |
+| users | [https://forum.orekit.org/c/rugged-usage](https://forum.orekit.org/c/rugged-usage) |
+| developers | [https://forum.orekit.org/c/rugged-development](https://forum.orekit.org/c/rugged-development) |
-We're preventing unregistered members from posting in order to prevent spam. Thank you.
+## Technical contact
-Technical contact
------------------
-
-If for some reason you cannot use the public lists, you can reach the CS
+If for some reason you cannot use the public forums, you can reach the CS
Systèmes d'Information Rugged team for any question (either technically
oriented or administrative) at the following email address:
[rugged@c-s.fr](mailto:rugged@c-s.fr)
-Administrative contact
-----------------------
+## Administrative contact
If you want to discuss with the space division staff at CS Systèmes d'Information,
please use the following address:
@@ -51,5 +46,8 @@ please use the following address:
31506 Toulouse CEDEX 5
FRANCE
- phone: +33 5-61-17-66-66 (ask for Luc Maisonobe or Sébastien Harasse)
+ phone: +33 5-61-17-66-66 (ask for Luc Maisonobe or Jonathan Guinet)
fax: +33 5-61-34-84-15
+
+[Top of the page](#top)
+
diff --git a/src/site/markdown/contributing.md b/src/site/markdown/contributing.md
index 7983d10c8f042d98d9841bd826fd893330afb45e..0e3eb12e1164024f8ba215c138cb8bb0a3290928 100644
--- a/src/site/markdown/contributing.md
+++ b/src/site/markdown/contributing.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,15 +12,14 @@
limitations under the License.
-->
-Contributing to Ruggged
-=======================
+# Contributing to Ruggged
Rugged is free software, which means you can use the source code as you wish,
without charges, in your applications, and that you can improve it and have
your improvements included in the next mainstream release.
If you are interested in participating in the development effort,
-subscribe to the mailing lists and step up to discuss it. The
-larger the community is, the better Rugged will be. The main
+subscribe to the forums (as described in the [Contact page](./contact.html)) and step up to discuss it.
+The larger the community is, the better Rugged will be. The main
rule is that everything intended to be included in Rugged core must
be distributed under the Apache License Version 2.0.
diff --git a/src/site/markdown/design/preliminary-design.md b/src/site/markdown/design/design.md
similarity index 96%
rename from src/site/markdown/design/preliminary-design.md
rename to src/site/markdown/design/design.md
index 077de384fe515f8efeba5d2fe7366140d8693f09..d7509c87df757aa2304d83423b61fa974ac9c91b 100644
--- a/src/site/markdown/design/preliminary-design.md
+++ b/src/site/markdown/design/design.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,14 +12,15 @@
limitations under the License.
-->
-Overview
---------
+<a name="top"></a>
+
+## Design of the major functions
The top level design describes the various libraries and their interactions. The lowest level
corresponding to the Hipparchus library is not shown here for clarity.
The following sequence and class diagrams show the three most important functions: initialization
-of the libraries, direct location and inverse location.
+of the libraries, direct location and inverse location. The last class diagram is a focus on Digital Elevation Model loading.
### Initialization
@@ -31,6 +32,7 @@ of options for algorithm, ellipsoid and frame choices.
+
The Rugged instance will store everything and create the various objects defining the configuration
(creating the algorithm, ellipsoid and frames from the identifiers provided by the user. Using simple
enumerates for frames or ellipsoid allow a simpler interface for regular users who are not space flight
@@ -98,8 +100,7 @@ were done using a mean plane do not represent reality. These final fixes are sim
simple values as results, the first step in fact provided a Taylor expansion, thus allowing to slightly shift the result
at will.
-Focus point on Digital Elevation Model loading
-----------------------------------------------
+## Focus point on Digital Elevation Model loading
The Digital Elevation Model is used at a very low level in the Rugged library, but read at a high level in the mission
specific interface library. The following design has been selected in order to allow the lower layer to delegate the
@@ -119,4 +120,6 @@ be reallocated by the Tile. The loader only sees interfaces in the API and doesn
tiles that are used under the hood. Different DEM intersection algorithms can use different tiles implementations without
any change to the mission specific interface. One example of this independence corresponds to the Duvenhage algorithm, has
in addition to the raw elevation grid, the tile will also contain a min/max kd-tree, so there are both a dedicated specialized
-tile and a corresponding TileFactory in use when this algorithm is run.
\ No newline at end of file
+tile and a corresponding TileFactory in use when this algorithm is run.
+
+[Top of the page](#top)
diff --git a/src/site/markdown/design/digital-elevation-model.md b/src/site/markdown/design/digital-elevation-model.md
index 3efdf808b865debb0b8b0a0dc7a5b4eded396c48..ad2c9e5c5897f91e840a710cb7e147ee2a21a67a 100644
--- a/src/site/markdown/design/digital-elevation-model.md
+++ b/src/site/markdown/design/digital-elevation-model.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,8 +12,12 @@
limitations under the License.
-->
-DEM intersection
-------------
+<a name="top"></a>
+
+# Digital Elevation Model
+
+## DEM intersection
+
The page [technical choices](./technical-choices.html) explain how Rugged goes from an on-board pixel
line-of-sight to a ground-based line-of-sight arrival in the vicinity of the ellipsoid entry point. At
this step, we have a 3D line defined near the surface and want to compute where it exactly traverses the
@@ -43,8 +47,7 @@ meaningful in terms of computation, so it should only be used for testing purpos
intended as a basic reference that can be used for validation and tests. The no-operation algorithm can be used for
low accuracy fast computation needs without changing the complete data product work-flow.
-DEM loading
------------
+## DEM loading
As the min/max KD-tree structure is specific to the Duvenhage algorithm, and as the algorithm is hidden behind
a generic interface, the tree remains an implementation detail the user should not see. The min/max KD-tree structure is
@@ -54,3 +57,5 @@ On the other hand, Rugged is not expected to parsed DEM files, so the algorithm
layer. In order to pass these data, a specific callback function is implemented in the mission specific interface layer and
registered to Rugged, which can call it to retrieve parts of the DEM, in the form of small cells. The implicit KD-tree is then
built from leafs to root and cached.
+
+[Top of the page](#top)
diff --git a/src/site/markdown/design/overview.md b/src/site/markdown/design/overview.md
index 7d3c92d6feecb8ef616a8c81075fb69a393f17ee..18c3819f6fe2ca670ad64023376d924669a2efed 100644
--- a/src/site/markdown/design/overview.md
+++ b/src/site/markdown/design/overview.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,11 +12,14 @@
limitations under the License.
-->
-Global architecture
--------------------
+<a name="top"></a>
+
+# Design Overview
+
+## Global architecture
Rugged is an intermediate level mission-independent library. It relies on
-the Orekit library and on the Hipparchus library. It is itself
+the [Orekit](https://www.orekit.org/ "Orekit homepage") library and on the [Hipparchus](https://hipparchus.org/ "Hipparchus homepage") library. It is itself
intended to be used from a mission-specific interface by one or more
image processing applications.
@@ -48,8 +51,7 @@ The Rugged library is developed in the Java language and has full access to the
Hipparchus libraries. It is designed and developed by space flight dynamics and
geometry specialists, with support from the image processing specialists for the API definition.
-Functional Breakdown
---------------------
+## Functional Breakdown
The following table sorts out the various topics between the various layers.
@@ -67,7 +69,10 @@ The following table sorts out the various topics between the various layers.
| IERS data correction | Orekit |All frame transforms support the full set of IERS Earth Orientation Parameters corrections, including of course the large DUT1 time correction, but also the smaller corrections to older IAU-76/80 or newer IAU-2000/2006 precession nutation models as well as the polar wander. The frames level accuracy is at sub-millimeter level
| Grid-post elevation model | Rugged |Only raster elevation models are supported
|Triangulated Irregular Network elevation model | Not supported |If vector elevation models are needed, they must be converted to raster form in order to be used
-| Geoid computation | Orekit |Rugged expects the Digital Elevation Models to be provided with respect to a reference ellipsoid. Orekit can be used to convert a geoid-based DEM to an ellipsoid-based DEM, directly from any gravity field
+| Geoid computation | Orekit |Rugged expects the Digital Elevation Models to be provided with respect to a reference ellipsoid. Orekit can be used to convert a geoid-based DEM to an ellipsoid-based DEM, directly from any gravity field
| Time-dependent deformations | Interface/Rugged |Simple line-of-sight models (typically polynomial) can be used
| Calibration |Image processing or interface|The calibration phase remains at the mission-specific caller level (pixels geometry, clock synchronization …), the caller is required to provide the already calibrated line of sights
| DEM file parsing | Interface |The elevation models are dedicated to the mission and there are several formats (DTED, GeoTIFF, raw data …).Rugged only deals with raw elevation on small latitude/longitude cells
+| Atmospheric refraction | Abstract/Rugged |Atmospheric refraction correction is supported with a default multi-layer model provided. Some other models can be provided by the user
+
+[Top of the page](#top)
diff --git a/src/site/markdown/design/technical-choices.md b/src/site/markdown/design/technical-choices.md
index db864f3de8b8ec88f4ae3aae2e9d2f66b805975e..7526760f5168af9fcfba9c55c71c045809fd0f0e 100644
--- a/src/site/markdown/design/technical-choices.md
+++ b/src/site/markdown/design/technical-choices.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,10 +12,13 @@
limitations under the License.
-->
-Earth frames
-------------
+<a name="top"></a>
-As Rugged is built on top of Orekit and Hipparchus, all the flight dynamics and
+# Technical choices
+
+## Earth frames
+
+As Rugged is built on top of [Orekit](https://www.orekit.org/ "Orekit homepage") and [Hipparchus](https://hipparchus.org/ "Hipparchus homepage"), all the flight dynamics and
mathematical computation are delegated to these two libraries and the full accuracy available
is used. This implies for example that when computing frames conversions between the inertial
frame and the Earth frame, the complete set of IERS Earth Orientation Parameters (EOP)
@@ -77,8 +80,7 @@ it is still possible to compute very accurately the geometry of the image.
As a summary, Rugged may give results slightly more accurate than other geometric correction
libraries, and is compatible with both the legacy frames and the newer frames.
-Position and attitude
----------------------
+## Position and attitude
The global geometry of the image depends on the spacecraft position and attitude. Both are obtained using any
Orekit provided propagators. Thanks to the architecture of the Orekit propagation framework, propagation can
@@ -103,7 +105,7 @@ components between Q1 and Q2 or -Q1 and Q2 leads to completely different rotatio
will typically have one sign change per orbit at some random point. The third reason is that instead of doing an
interpolation that respect quaternions constraint, the interpolation departs from the constraint first and attempts to
recover afterwards in a normalization step. Orekit uses a method based on Sergeï Tanygin's paper
-[Attitude interpolation](http://www.agi.com/downloads/resources/white-papers/Attitude-interpolation.pdf) with slight
+[Attitude interpolation](http://www.agi.com/resources/white-papers/attitude-interpolation) with slight
changes to use modified Rodrigues vectors as defined in Malcolm D Shuster's
[A Survey of Attitude Representations](http://www.ladispe.polito.it/corsi/Meccatronica/02JHCOR/2011-12/Slides/Shuster_Pub_1993h_J_Repsurv_scan.pdf),
despite attitude is still represented by quaternions in Orekit (Rodrigues vectors are used only for interpolation).
@@ -122,8 +124,8 @@ As a summary, Rugged relies on either propagation or interpolation at user choic
more sophisticated than linear interpolation of quaternion components, but no differences are expect at this level,
except for simpler development and validation as everything is readily implemented and validated in Orekit.
-Optical path
-------------
+## Optical path
+
### Inside spacecraft
@@ -198,8 +200,7 @@ when the effect is explicitly expected to be compensated at a later stage in the
posteriori polynomial models. This use case can occur in operational products. It seems however better to compensate these effects early
as they can be computed to full accuracy with a negligible computation overhead.
-Arrival on ellipsoid
---------------------
+## Arrival on ellipsoid
Once a pixel line-of-sight is known in Earth frame, computing its intersection with a reference ellipsoid is straightforward using an
instance of OneAxisEllipsoid. The Orekit library computes this intersection as a NormalizedGeodeticPoint instance on the ellipsoid surface.
@@ -224,8 +225,7 @@ hypothesis is also available (i.e. it consider the line-of-sight is a straight l
is not recommended. The computing overhead due to properly using ellipsoid shape is of the order of magnitude of 3%, so ignoring this on the
sake of performances is irrelevant.
-Errors compensation summary
----------------------------
+## Errors compensation summary
The following table summarizes the error compensations performed in the Rugged library which are not present in some other geometry correction libraries:
@@ -237,3 +237,6 @@ The following table summarizes the error compensations performed in the Rugged l
| light time correction | 1.2m | East-West |pixel-dependent, can be switched off if compensated elsewhere in the processing chain
| aberration of light | 20m | along track |depends on spacecraft velocity, can be switched off if compensated elsewhere in the processing chain
| flat-body | 0.8m | across line-of-sight |error increases a lot for large fields of view, can be switched off, but this is not recommended
+| atmospheric refraction | < 2m | horizontal shift |for multi-layer atmospheric model
+
+[Top of the page](#top)
diff --git a/src/site/markdown/downloads.md b/src/site/markdown/downloads.md
index 4775696160c053de5dc3868a34b7674c8a6855d5..4131befc0504dc42263d34b13b96273602bb56d2 100644
--- a/src/site/markdown/downloads.md
+++ b/src/site/markdown/downloads.md
@@ -1,10 +1,10 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,14 +12,14 @@
limitations under the License.
-->
-Downloads
-=========
+<a name="top"></a>
+
+# Downloads
-Development Library version
----------------------------
+## Development Library version
The development version of the Rugged library is always available to
-download from our version control system. We use [ Git](http://git-scm.com/)
+download from our version control system. We use [Git](http://git-scm.com/ "Git homepage")
as our SCM. The anonymous read access to our Git repository allows users who
need the latest features and the latest bug fixes to get them even before an
official release.
@@ -29,10 +29,9 @@ be easily adapted if you are using one of the numerous Git graphical
user interface available or if Git is supported by you integrated
development environment:
- git clone https://www.orekit.org/git/rugged-main.git
+ git clone -b develop https://gitlab.orekit.org/orekit/rugged.git
-Released Library versions
--------------------------
+## Released Library versions
Rugged is provided both in several packaging systems. You can pick up
the one that better suits your needs. Source packages are the most complete
@@ -44,51 +43,66 @@ with groupID org.orekit and artifactId rugged so maven
internal mechanism will download automatically all artifacts and dependencies
as required.
+
| package | link |
|----------|-----------------------------------------------------------------------------------------------------------|
-| source | [rugged-2.0-sources.zip](https://www.orekit.org/forge/attachments/download/717/rugged-2.0-sources.zip) |
-| binary | [rugged-2.0.jar](https://www.orekit.org/forge/attachments/download/718/rugged-2.0.jar) |
-| javadoc | [rugged-2.0-javadoc.jar](https://www.orekit.org/forge/attachments/download/719/rugged-2.0-javadoc.jar) |
-version 2.0 downloads (release date: 2017-12-22)
+| source | rugged-2.1-sources.zip (URL to be defined after official release) |
+| binary | rugged-2.1.jar (URL to be defined after official release) |
+| javadoc | rugged-2.1-javadoc.jar (URL to be defined after official release) |
+version 2.1 downloads (release date: 2019-03-14)
| package | link |
|----------|-----------------------------------------------------------------------------------------------------------|
-| source | [rugged-1.0-sources.zip](https://www.orekit.org/forge/attachments/download/592/rugged-1.0-sources.zip) |
-| binary | [rugged-1.0.jar](https://www.orekit.org/forge/attachments/download/593/rugged-1.0.jar) |
-| javadoc | [rugged-1.0-javadoc.jar](https://www.orekit.org/forge/attachments/download/594/rugged-1.0-javadoc.jar) |
+| source | [`rugged-2.0-sources.zip`](https://gitlab.orekit.org/orekit/rugged/uploads/f7f30111d4d3cef19636cb7c504530dd/rugged-2.0-sources.zip) |
+| binary | [`rugged-2.0.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/8393279152c0cad15659e145018fa834/rugged-2.0.jar) |
+| javadoc | [`rugged-2.0-javadoc.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/b42c3ef2fcff36aa44570d114102a439/rugged-2.0-javadoc.jar) |
+version 2.0 downloads (release date: 2017-12-19)
+
+| package | link |
+|----------|-----------------------------------------------------------------------------------------------------------|
+| source | [`rugged-1.0-sources.zip`](https://gitlab.orekit.org/orekit/rugged/uploads/0a5e5a39e72dfa94f54c3193170d5ee2/rugged-1.0-sources.zip) |
+| binary | [`rugged-1.0.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/55df1454320b8f625c05d9bee5c9abcd/rugged-1.0.jar) |
+| javadoc | [`rugged-1.0-javadoc.jar`](https://gitlab.orekit.org/orekit/rugged/uploads/8f7f399b1dd6ebf55b17f9a49fc88782/rugged-1.0-javadoc.jar) |
version 1.0 downloads (release date: 2016-02-10)
+
## Data
-For convenience, a zip archive containing some configuration data is
-available for download. Similar files can be custom made by users with updated data.
-Configuring data loading is explained in the configuration page For a start, the simplest configuration
-is to download the orekit-data.zip file from the download page, to unzip it anywhere you want, note the
-path of the orekit-data folder that will be created and add the following lines at the start of
-your program:
+For convenience, a zip archive containing some configuration data is available
+for download. Similar files can be custom made by users with updated data.
+Configuring data loading is explained in the configuration page. For a start,
+the simplest configuration is to download the
+[orekit-data-master.zip](https://gitlab.orekit.org/orekit/orekit-data/-/archive/master/orekit-data-master.zip)
+file from the forge, to unzip it anywhere you want, rename the `orekit-data-master` folder that will be created
+into `orekit-data` and add the following lines at the start of your program:
File orekitData = new File("/path/to/the/folder/orekit-data");
DataProvidersManager manager = DataProvidersManager.getInstance();
manager.addProvider(new DirectoryCrawler(orekitData));
-This file contents is:
+This file contains the following data sets. Note that the data is updated only
+from time to time, so users must check by themselves they cover the time range
+needed for their computation.
- * leap seconds data up to end of 2017,
+ * leap seconds data,
- * IERS Earth orientation parameters from 1973 to end 2017
- with predicted date to mid 2018 for some parameters (both IAU-1980 and IAU-2000),
+ * IERS Earth orientation parameters from 1973 (both IAU-1980 and IAU-2000),
- * Marshall Solar Activity Futur Estimation from 1999 to end 2017,
+ * Marshall Solar Activity Future Estimation from 1999,
- * DE 430 planetary ephemerides from 1990 to 2069,
+ * JPL DE 430 planetary ephemerides from 1990 to 2069,
* Eigen 06S gravity field,
* FES 2004 ocean tides model.
+
There are no guarantees that this file will be available indefinitely or that its
content will be updated. It should be considered as a simple configuration example.
Users are encouraged to set up their own configuration data.
-The file is available in the [orekit files page](https://www.orekit.org/forge/projects/orekit/files).
+The file is available by following the
+[download](https://gitlab.orekit.org/orekit/orekit-data/-/archive/master/orekit-data-master.zip)
+link in the project dedicated to Orekit Data in the forge.
+[Top of the page](#top)
diff --git a/src/site/markdown/faq.md b/src/site/markdown/faq.md
index 563190782cbbe01b4a4fa4fd43dc11b0efe19a56..697867b8a25ae906a2f2495744a547205f1f83cf 100644
--- a/src/site/markdown/faq.md
+++ b/src/site/markdown/faq.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,13 +12,26 @@
limitations under the License.
-->
-References
-----------
+<a name="top"></a>
+
+# Frequently Asked Questions (FAQ)
+
+## References
### Has Rugged already been used?
-Yes. Rugged is used operationally in the Image Processing Facility
-of the Sentinel 2 ESA mission, which was launched in June 2015.
+Yes, it has been used in successful operational missions.
+
+Rugged is used operationally in the Image Processing Facility
+of the Sentinel 2 European Space Agency (ESA) mission, which was launched in June 2015.
+
+Rugged is used in the frame of ESA Scientific Exploitation of Operational Missions (SEOM),
+to calculate topographic shadow masks for Sentinel 2 products.
+
+Rugged has been used to validate Airbus Defence and Space (ADS) geolocation library.
+
+Rugged has been used as a Research Library by the French Space Agency (CNES) for
+refinement studies for VHR push broom sensors (Pleiades).
### Is Rugged validated?
@@ -39,41 +52,43 @@ configuring Rugged to use the same legacy models (these legacy models like for e
TOD and MOD frames are available for consistency with existing systems).
-Installation
-------------
+## Installation
### What are the dependencies for Rugged?
-Rugged relies on the Orekit space flight dynamics library and on
-Hipparchus mathematical libraries. Both libraries are free
+Rugged relies on the [Orekit](https://www.orekit.org/ "Orekit homepage") space flight dynamics library and on
+[Hipparchus](https://hipparchus.org/ "Hipparchus homepage") mathematical libraries. Both libraries are free
software libraries distributed under the terms of the Apache Software
License version 2.0.
-Runtime errors
---------------
+## Runtime errors
### I get an error "no IERS UTC-TAI history data loaded" (or something similar in another language). What does it mean?
-This error is probably the most frequent one, or at least it's the first one new users encounter.
+This error is probably *the* most frequent one, or at least it's the first one new users encounter.
Rugged relies on the Orekit library to perform all space flight related computation (typically
frames transforms). This library in turn needs some external data to be loaded in order to run.
This includes UTC-TAI history for leap seconds handling, Earth Orientation Parameters for
-transforms to and from Earth fixed frames, or planetar ephemerides for Sun direction, for example.
+transforms to and from Earth fixed frames, or planetary ephemerides for Sun direction, for example.
The error message "no IERS UTC-TAI history data loaded" means the UTC-TAI history file which is used for leap
seconds management was not found. As leap seconds are used each time a UTC date is used, this message is
often seen very early and is the first one unsuspecting users experience. It often means the user forgot
-to configure Orekit to load data.
+to configure Orekit to load data. Orekit supports by default either the IERS UTC-TAI.history file or the
+USNO tai-utc.dat file. If either file is found in the Orekit configuration, it will be automatically loaded
+and the message should not appear.
-Configuring data loading is explained in the configuration page For a start, the simplest configuration
-is to download the orekit-data.zip file from the Orekit project download page, to unzip it anywhere you
-want, note the path of the orekit-data folder that will be created and add the following lines at the start
-of your program:
+Configuring data loading is explained in the configuration page. For a start, the simplest configuration
+ is to download the [orekit-data-master.zip](https://gitlab.orekit.org/orekit/orekit-data/-/archive/master/orekit-data-master.zip)
+file from the forge, to unzip it anywhere you want, rename the `orekit-data-master` folder that will be created
+into `orekit-data` and add the following lines at the start of your program:
File orekitData = new File("/path/to/the/folder/orekit-data");
DataProvidersManager manager = DataProvidersManager.getInstance();
manager.addProvider(new DirectoryCrawler(orekitData));
Using a folder allows one to change the data in it after the initial download, e.g., adding new EOP files as they
-are published by IERS.
+are published by IERS. Updating the content of the orekit-data remains the responsibility of the user.
+
+[Top of the page](#top)
diff --git a/src/site/markdown/guidelines.md b/src/site/markdown/guidelines.md
index d35f13efedfd5fda13a7f022f18ac53ed6581391..fc6746dca77d10d6c01cd87e71bf4de5f310046e 100644
--- a/src/site/markdown/guidelines.md
+++ b/src/site/markdown/guidelines.md
@@ -1,10 +1,10 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,13 +12,13 @@
limitations under the License.
-->
-Development Guidelines
-======================
+<a name="top"></a>
+
+# Development Guidelines
The following guidelines are used for Rugged development.
-Development
------------
+## Development
Rugged is an intermediate level library. It may be used in very different
contexts which cannot be foreseen, from quick studies up to critical
@@ -34,7 +34,7 @@ operations. The main driving goals are the following ones:
The first goal, validation, implies tests must be as extensive as possible.
They should include realistic operational cases but also contingency cases.
-The [jacoco](http://www.eclemma.org/jacoco/) tool must be used to
+The [jacoco](http://www.eclemma.org/jacoco/ "Jacoco homepage") tool must be used to
monitor test coverage. A very high level of coverage is desired. We do not
set up mandatory objective figures, but only guidelines here. However,a 60%
line coverage would clearly not be acceptable at all and 80% would be considered
@@ -44,7 +44,7 @@ The second goal, robustness, has some specific implications for a low level
component like Rugged. In some sense, it can be considered an extension of the
previous goal as it can also be improved by testing. It can also be improved
by automatic checking tools that analyze either source code or binary code. The
-[findbugs](http://findbugs.sourceforge.net/) tool is already configured for
+[spotbugs](https://spotbugs.github.io/ "Spotbugs homepage") tool is already configured for
automatic checks of the library using a maven plugin.
This is however not sufficient. A library is intended to be used by applications
@@ -84,13 +84,60 @@ difficult to catch bugs are caused by mutable objects that are changed in some d
buried code and have an impact on user code that forgot to perform a defensive copy.
Orbits, dates, vectors, and rotations are all immutable objects.
-Style Rules
------------
+## Source Control Management
+
+The source code control management system used is [Git](http://git-scm.com/ "Git homepage"). The
+main Rugged repository is located at [https://gitlab.orekit.org/orekit/rugged.git](https://gitlab.orekit.org/orekit/rugged.git).
+
+Starting after version 2.0, the branch management workflow is adapted from
+both [git flow](http://nvie.com/posts/a-successful-git-branching-model/) and
+from the [Orfeo ToolBox Workflow](https://wiki.orfeo-toolbox.org/index.php/Git#Workflow "OTB workflow").
+It is the same as chosen for Orekit.
+
+
+
+This implies that development occurs on a develop branch only.
+Developers create feature branches, and merge them on the develop
+branch when ready. The develop branch should always be functional
+so people wanting to be on the bleeding edge can use it (for example
+to create nightly builds or to prepare their application for upcoming
+features before the official release).
+
+In order to improve traceability, when a feature branch is merged into
+develop, it should use
+
+ git merge ---no-ff
+
+the --no-ff flag prevents fast-forward so the history makes it clear there
+was a feature branch at this point.
+
+Feature branches are temporary, they are deleted when they are not useful anymore.
+Feature branches may be present only in one developer workspace and never appear
+in the main repository, however, they may also be pushed on the main repository
+if the developer wants to share work or needs community feedback.
+
+When a release is desired, a dedicated branch should be created, with a name
+following the pattern release-x.y. These branches are created from the
+develop branch. When the release is ready, the branch is merged both into the
+master branch and into the develop branch. Once a release branch has been set
+up, it will remain. This allows users relying on this specific version to be
+able to retrieve the fixes published afterward (i.e. x.y.1, x.y.2...).
+
+After a release has been published and pushed to master, it may be necessary
+to publish an urgent bugfix if a serious problem in the released version is
+found. Short-lived bugfix branches that are created directly from master are
+devoted to this. These bugfix branches are merged back into master and develop.
+
+The master branch always refer to the latest stable release performed. No
+direct work is done on this branch. It is updated only by merging either
+release branches or bugfix branches branches to it.
+
+
+## Style Rules
For reading ease and consistency, the existing code style should be
preserved for all new developments. The rules are common ones, inherited
-mainly from the Sun [Code Conventions for the Java
-Programming Language](http://java.sun.com/docs/codeconv/) guide style and
+mainly from the Sun Code Conventions for the Java Programming Language guide style and
from the default [checkstyle](http://checkstyle.sourceforge.net/) tool
configuration. A few of these rules are displayed below. The complete
definition is given by the checkstyle configuration file in the project
@@ -99,70 +146,69 @@ root directory.
* *header rule*
all source files start with the Apache license header,
-
+
* *indentation rules*
no tabs, 4 spaces indentation, no indentation for case statements,
-
+
* *operators wrapping rules*
lines are wrapped after operators (unlike Sun),
-
+
* *whitespace rules*
operators are surrounded by spaces, method parameters open parenthesis
is not preceded by space, lines do not end with white space,
-
+
* *curly brace rules*
open curly brace are at end of line, with the matching closing curly brace
aligned with the start of the corresponding keyword (_if_, _for_,
_while_, _case_ or _do_),
-
+
* *encoding rules*
characters encoding is _UTF8_, the git property _core.autocrlf_ should be
set to _input_ on Linux development machines and to _true_ on Windows
development machines (to ensure proper conversion on all operating systems),
-
+
* *naming rules*
classes names begin with upper case, instance methods and fields
names begin with lower case, class fields are all upper case with
words separated by underscores,
-
+
* *ordering rules*
class variables come first, followed by instance variables, followed
by constructors, and followed by methods, public modifiers come first,
followed by protected modifiers followed by private modifiers,
-
+
* *javadoc rules*
all elements have complete javadoc, even private fields and methods
(there are some rare exceptions, in case of code translated from
the fortran language and models with huge parameters sets),
-
+
* *robustness rules*
switch/case construct have a default argument, even when all possible
cases are already handled, as many classes as possible are immutable,
-
+
* *miscellaneous rules*
_star_ imports are forbidden, parameters and local variables are final
wherever possible.
-Design Rules
-------------
+## Design Rules
* *coverage* (validation)
seek for a line test coverage of at least 80% (more is better)
-* *findbugs* (robustness)
+* *spotbugs* (robustness)
- fix _all_ errors and warnings found by findbugs
+ fix _all_ errors and warnings found by spotbugs
* *no runtime assumptions* (robustness)
@@ -186,3 +232,6 @@ Design Rules
* *checkstyle* (style)
fix _all_ errors and warnings found by checkstyle
+
+[Top of the page](#top)
+
\ No newline at end of file
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 849eec9ff9c652909f0a6ea956a0d60b79db938a..ea5d6286546fefcc09896c0820188bceab18da69 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,12 +12,13 @@
limitations under the License.
-->
-Overview
-========
+<a name="top"></a>
- Rugged is a sensor-to-terrain mapping tool which takes into account Digital Elevation Models (DEM)
+# Overview
+
+ Rugged is a sensor-to-terrain mapping tool which takes into account Digital Elevation Models (DEM)
in its line of sight computation. It is a free software
- intermediate-level library written in Java and implemented as an add-on for Orekit.
+ intermediate-level library written in Java and implemented as an add-on for [Orekit](https://www.orekit.org/ "Orekit homepage").
@@ -36,20 +37,19 @@ Overview
Direct and inverse location can be used to perform full ortho-rectification
of images and correlation between sensors observing the same area.
-Features
---------
+## Features
* Direct/inverse location
* Refinement
- * can support several types of Digital Elevation Models, including user-provided models
+ * Can support several types of Digital Elevation Models, including user-provided models
- * several intersection models algorithms available
+ * Several intersection models algorithms available
- * can propagate orbit by itself for preliminary mission analysis or data generation
+ * Can propagate orbit by itself for preliminary mission analysis or data generation
- * can propagate attitude by itself for preliminary mission analysis or data generation
+ * Can propagate attitude by itself for preliminary mission analysis or data generation
* *very* fast
@@ -58,7 +58,7 @@ Features
* Mathews, Herring, Buffett (2002)
* Capitaine (2006)
- * complete set of corrections applied for greater accuracy
+ * Complete set of corrections applied for greater accuracy
* δΔψ, δΔε on precession nutation (about 3m correction since 2013, steadily increasing)
* ΔUTâ‚, lod on proper rotation (can theoretically reach up to 400m)
* u, v pole wander (polhody), (about 15m correction)
@@ -68,9 +68,9 @@ Features
(0m at nadir, 10m at 30° dive angle, hundreds of meters for skimming los)
* atmospheric refraction
- * not limited to Earth
+ * Not limited to Earth
- * highly portable (Linux, Windows, MacOSX, ...)
+ * Highly portable (Linux, Windows, MacOSX, ...)
* Localized in several languages
@@ -84,8 +84,7 @@ Features
* Romanian
* Spanish
-Free software
--------------
+## Free software
Rugged is freely available both in source and binary formats, with all related
documentation and tests.
@@ -97,12 +96,17 @@ any application, free or not. There are no strings attached to your own code.
Everybody is encouraged to use Rugged as a common intermediate level layer to improve
interoperability in space systems.
-Maintained library
-------------------
+## Maintained library
-Rugged has been in development since 2014 inside [CS Systèmes
-d'Information](http://www.c-s.fr/) and is still used and maintained by its dual teams
+Rugged has been in development since 2014 inside [CS Systèmes d'Information](http://www.c-s.fr/ "CS SI homepage")
+and is still used and maintained by its dual teams
of space dynamics and image processing experts.
Rugged is used for image processing of the Sentinel 2 mission at European Space
-Agency (ESA).
+Agency (ESA), as well as in the frame of ESA Scientific Exploitation of Operational Missions (SEOM),
+to calculate topographic shadow masks for Sentinel 2 products.
+
+Rugged has been also used as a Research Library by the French Space Agency (CNES) for
+study on refining for VHR push broom sensors (Pleiades).
+
+[Top of the page](#top)
\ No newline at end of file
diff --git a/src/site/markdown/sources.md b/src/site/markdown/sources.md
index 95cbd732b5ca63ff681ba40d85cc4047e0bc4dd6..27344b7d3846a03afb0ccb38515719d3d1e224f0 100644
--- a/src/site/markdown/sources.md
+++ b/src/site/markdown/sources.md
@@ -1,10 +1,10 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,31 +12,44 @@
limitations under the License.
-->
-Getting the sources
-===================
+<a name="top"></a>
+
+# Getting the sources
-Released versions
------------------
+## Released versions
In order to get the source for officially released versions, go to the
-[Files](https://www.orekit.org/forge/projects/rugged/files) tab in Rugged
-forge and select one of the rugged-{module}-x.y-src.zip files. The module
-part is the module (you need at least the core module, but other modules
-may be interesting for you too). The x.y part in the name specifies the version.
+[Release page](https://gitlab.orekit.org/orekit/rugged/tags) in Rugged
+forge and select one of the `rugged-x.y-sources.zip` files. The `x.y` part in the name
+specifies the version.
+
+If this is the first time you download the library and
+you have not yet set up your own data set with UTC-TAI history, JPL ephemerides,
+IERS Earth Orientation Parameters ... you may want to also download the
+`orekit-data.zip` file which is an example file suitable for a quick start (see
+[configuration](./configuration.html) for further reading about data configuration).
+
+It is also possible to retrieve published versions from the Git repository
+(see next section below), if retrieving either release-x.y branches or the
+master branch.
+
+## Development version
-Development version
--------------------
+The development of the Rugged project is done using the [Git](http://git-scm.com/ "Git homepage")
+source code control system. Rugged Git master repository is available online.
+The latest developments are in the develop branch. This is the one you want to retrieve
+if you need the latest feature before they are published in an official release.
+See [guidelines](./guidelines.html) for the branching workflow used in Rugged.
-The development of the Rugged project is done using the [Git](http://git-scm.com/)
-source code control system. Rugged Git master repository is available online.
+ * you can browse it using the [Repository](https://gitlab.orekit.org/orekit/rugged/tree/develop)
+tab in Rugged Gitlab.
-You can browse it using the [Repository](https://www.orekit.org/forge/projects/rugged/repository)
-tab in Rugged forge
+ * you can clone it anonymously with the command:
-You can clone it anonymously with the command:
+ git clone -b develop https://gitlab.orekit.org/orekit/rugged.git
- git clone https://www.orekit.org/git/rugged-main.git
+ * if you are a committer, you can clone it using your ssh credentials with the command:
-If you are a committer, you can clone it using your ssh credentials with the command:
+ git clone -b develop git@gitlab.orekit.org:orekit/rugged.git
- git clone ssh://git@www.orekit.org/rugged-main.git
+[Top of the page](#top)
\ No newline at end of file
diff --git a/src/site/markdown/tutorials/direct-location-with-DEM.md b/src/site/markdown/tutorials/direct-location-with-DEM.md
index ab2ec7729d6395a412a1161d466d563c08b4773f..26798b6a9dbee49b2cdb8bbc000d7ecbcc2e02ae 100644
--- a/src/site/markdown/tutorials/direct-location-with-DEM.md
+++ b/src/site/markdown/tutorials/direct-location-with-DEM.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,9 +12,13 @@
limitations under the License.
-->
+<a name="top"></a>
+
# Direct Location with a DEM
-The aim of this tutorial is to compute a direct location grid by intersection of the line of sight with a DEM (Digital Elevation Model), using Duvenhage's algorithm. This algorithm is the most performant one in Rugged.
+The aim of this tutorial is to compute a direct location grid by intersection of
+the line of sight with a DEM (Digital Elevation Model), using Duvenhage's algorithm.
+This algorithm is the most performant one in Rugged.
The following figure shows the effects of taking into account the DEM in the computation of latitude, longitude and altitude:
@@ -22,16 +26,32 @@ The following figure shows the effects of taking into account the DEM in the com
## Feeding Rugged with DEM tiles
-Rugged does not parse DEM files but takes buffers of elevation data as input. It is up to the calling application to read the DEM and load the data into buffers. Rugged provides a tile mecanism with cache for large DEMs allowing the user to load one tile at a time. This is in line with the format of world coverage DEMs such as SRTM. Rugged offers an interface for updating the DEM tiles in cache with a callback function triggered everytime a coordinate falls outside the current region.
+Rugged does not parse DEM files but takes buffers of elevation data as input.
+It is up to the calling application to read the DEM and load the data into buffers.
+Rugged provides a tile mecanism with cache for large DEMs allowing the user to load
+one tile at a time. This is in line with the format of world coverage DEMs such as SRTM.
+Rugged offers an interface for updating the DEM tiles in cache with a callback function
+triggered everytime a coordinate falls outside the current region.
-The calling application must implement the callback function for loading the tiles. We recommend to use GDAL (http://www.gdal.org/) to parse the DEM files as it handles most formats (including geoTIFF for Aster DEM or DTED for SRTM). Rugged does not include the parsing of the DEM, by design, and yet we could have used GDAL. We want Rugged to remain a low-level library that does not pull too many third-party libraries.
+The calling application must implement the callback function for loading the tiles.
+We recommend to use GDAL (http://www.gdal.org/) to parse the DEM files as it handles most
+formats (including geoTIFF for Aster DEM or DTED for SRTM). Rugged does not include the
+parsing of the DEM, by design, and yet we could have used GDAL.
+We want Rugged to remain a low-level library that does not pull too many third-party libraries.
### Implementing the interface TileUpdater for DEM loading.
-In this tutorial, we will not include real DEM data. Instead we are going to create a fake DEM representing a volcano in a form of a perfect cone, similar to the Mayon volcano in the Philippines, except that we will locate it somewhere just below our satellite. This example is already part of Rugged tests cases, the source code is available in the package `org.orekit.rugged.raster`, file VolcanicConeElevationUpdater.java.
+In this tutorial, we will not include real DEM data. Instead we are going to create a fake DEM
+representing a volcano in a form of a perfect cone, similar to the Mayon volcano
+in the Philippines, except that we will locate it somewhere just below our satellite.
+This example is already part of Rugged tests cases, the source code is available
+in the package `org.orekit.rugged.raster`, file VolcanicConeElevationUpdater.java.
-The class `VolcanicConeElevationUpdater` implements the interface `TileUpdater` with its method `updateTile`. The method is in charge of loading a tile. The extent of the tile must be such that it covers at least the ground point with coordinates (latitude, longitude) which are passed as arguments to the method. The tile is an object of type `UpdatableTile` which has two methods :
+The class `VolcanicConeElevationUpdater` implements the interface `TileUpdater` with its method `updateTile`.
+The method is in charge of loading a tile. The extent of the tile must be such that it covers
+at least the ground point with coordinates (latitude, longitude) which are passed as arguments to the method.
+The tile is an object of type `UpdatableTile` which has two methods :
* `setGeometry(minLatitude, minLongitude, latitudeStep, longitudeStep, latitudeRows, longitudeRows)` : initializes the extent of the new tile before loading
@@ -88,7 +108,7 @@ Here's the source code of the class `VolcanicConeElevationUpdater` :
### Important notes on DEM tiles :
-* Ground point elevation are obtained by bilinear interpolation between 4 neighbouring cells. There is no specific algorithm for border management. As a consequence, a point falling on the border of the tile is considered outside. **DEM tiles must be overlapping by at least one line/column in all directions**, in a similar way as for the SRTM DEMs.
+* Ground point elevation are obtained by bilinear interpolation between 4 neighbouring cells. There is no specific algorithm for border management. As a consequence, a point falling on the border of the tile is considered outside. **DEM tiles must be overlapping by at least one line/column in all directions**.
* In Rugged terminology, the minimum latitude and longitude correspond to the centre of the farthest Southwest cell of the DEM. Be careful if using GDAL to pass the correct information as there is half a pixel shift with respect to the lower left corner coordinates in gdalinfo.
@@ -102,7 +122,8 @@ This diagram tries to represent the meaning of the different parameters in the d
## Initializing Rugged with a DEM
-The initialization step differs slightly from the first tutorial [Direct location](direct-location.html), as we need to pass the information about our TileUpdater.
+The initialization step differs slightly from the first tutorial [Direct location](./direct-location.html),
+as we need to pass the information about our TileUpdater.
Instantiate an object derived from TileUpdater :
@@ -127,7 +148,8 @@ Initialize Rugged with these parameters :
## Computing a direct location grid
-In a similar way as in the first tutorial [DirectLocation](./direct-location.html), we call Rugged direct location method. This time it is called in a loop so as to generate a full grid on disk.
+In a similar way as in the first tutorial [Direct Location](./direct-location.html),
+we call Rugged direct location method. This time it is called in a loop so as to generate a full grid on disk.
DataOutputStream dos = new DataOutputStream(new FileOutputStream("demDirectLoc.c1"));
int lineStep = (maxLine - minLine) / nbLineStep;
@@ -170,3 +192,5 @@ In a similar way as in the first tutorial [DirectLocation](./direct-location.htm
## Source code
The source code is available in DirectLocationWithDEM.java (package fr.cs.examples under src/tutorials)
+
+[Top of the page](#top)
diff --git a/src/site/markdown/tutorials/direct-location.md b/src/site/markdown/tutorials/direct-location.md
index b9d042cd95fd55da4c9c94ed2cfbb5b5dcd7e49c..3b74860cfa93a112a786fed9facdeb2e4c4aee12 100644
--- a/src/site/markdown/tutorials/direct-location.md
+++ b/src/site/markdown/tutorials/direct-location.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,6 +12,8 @@
limitations under the License.
-->
+<a name="top"></a>
+
# Rugged initialization and direct location
This tutorial explains how to initialize Rugged and use it to geolocate a satellite image.
@@ -21,7 +23,7 @@ list of positions, velocities and attitude quaternions recorded during the acqui
passing all this information to Rugged, we will be able to precisely locate each point of
the image on the Earth. Well, not exactly precise, as this first tutorial does not use a
Digital Elevation Model, but considers the Earth as an ellipsoid. The DEM will be added in
-a second tutorial: [Direct location with a DEM](direct-location-with-DEM.html). The objective
+a second tutorial: [Direct location with a DEM](./direct-location-with-DEM.html). The objective
here is limited to explain how to initialize everything Rugged needs to know about the sensor
and the acquisition.
@@ -127,9 +129,9 @@ which frames we are using and convert if necessary.
Conversion from inertial to Earth-rotating frame is transparent to the user and is based on the most
recent precession/nutation model on top of which corrections published by the IERS are applied. IERS
-bulletins and other physical data are provided within the orekit-data folder. There are several ways
+bulletins and other physical data are provided within the orekit data folder. There are several ways
to configure Orekit to use this data. More information is given
-[here](https://www.orekit.org/forge/projects/orekit/wiki/Configuration).
+[here](../configuration.html)
In our application, we simply need to know the name of the frames we are working with. Positions and
velocities are given in the ITRF terrestrial frame, while the quaternions are given in EME2000
@@ -224,7 +226,7 @@ Elevation Model in this tutorial, we could have omitted this call and it would h
We preferred to let it in so users do not forget to set the Digital Elevation Model for intersection
algorithms that really use them. As the model will be ignored, we can put the parameters for this
setter to `null` and `0`. Of course if another algorithm had been chosen, null parameters would clearly
-not work, this is explained in another tutorial: [Direct location with a DEM](direct-location-with-DEM.html).
+not work, this is explained in another tutorial: [Direct location with a DEM](./direct-location-with-DEM.html).
The *setEllipsoid* setter defines the shape and orientation of the ellipsoid. We use simple predefined enumerates:
`EllipsoidId.WGS84`, `InertialFrameId.EME2000`, but could also use a custom ellipsoid if needed.
@@ -321,3 +323,5 @@ Otherwise an ArrayIndexOutOfBoundsException will be thrown.
## Source code
The source code is available in DirectLocation.java (package fr.cs.examples under src/tutorials)
+
+[Top of the page](#top)
diff --git a/src/site/markdown/tutorials/inverse-location.md b/src/site/markdown/tutorials/inverse-location.md
index d425200336a716c8ab2e5c4d6bb7626ba96866c1..72b2cbda670b68e93afca9c0d0538d53662358af 100644
--- a/src/site/markdown/tutorials/inverse-location.md
+++ b/src/site/markdown/tutorials/inverse-location.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,14 +12,18 @@
limitations under the License.
-->
+<a name="top"></a>
+
# Inverse Location
-The aim of this tutorial is to compute the inverse location of a point on Earth in order to give the sensor pixel, with the associated line, seeing this point.
+The aim of this tutorial is to compute the inverse location of a point on Earth
+in order to give the sensor pixel, with the associated line, seeing this point.
-We will also explain how to find the date at which sensor sees a ground point, which is a kind of inverse location only focusing on date.
+We will also explain how to find the date at which sensor sees a ground point,
+which is a kind of inverse location only focusing on date.
## Inverse location of a point on Earth
-The initialization of Rugged is similar as in the [Direct location](direct-location.html) tutorial up to rugged initialization..
+The initialization of Rugged is similar as in the [Direct location](./direct-location.html) tutorial up to rugged initialization..
### Point defined by its latitude, longitude and altitude
Once Rugged initialized, one can compute the line number and the pixel number of a point defined by its Geodetic coordinates:
@@ -28,12 +32,17 @@ Once Rugged initialized, one can compute the line number and the pixel number of
import org.orekit.rugged.linesensor.SensorPixel;
GeodeticPoint gp = new GeodeticPoint(latitude, longitude, altitude);
SensorPixel sensorPixel = rugged.inverseLocation(sensorName, gp, minLine, maxLine);
+
where minLine (maxLine, respectively) is the minimum line number for the search interval (maximum line number, respectively).
-The inverse location will give the sensor pixel number and the associated line number seeing the point on ground. *In case the point cannot be seen between the prescribed line numbers, the return result is null. No exception will be thrown in this particular case*.
+The inverse location will give the sensor pixel number and the associated line number
+seeing the point on ground.
+**In case the point cannot be seen between the prescribed line numbers, the return result is null.
+No exception will be thrown in this particular case**.
### Point defined by its latitude and longitude (no altitude)
-Similarly, one can compute the line number and the pixel number of a point defined solely by its latitude en longitude. The altitude will be determined automatically with the DEM.
+Similarly, one can compute the line number and the pixel number of a point defined solely
+by its latitude en longitude. The altitude will be determined automatically with the DEM.
SensorPixel sensorPixel = rugged.inverseLocation(sensorName, latitude, longitude, minLine, maxLine);
@@ -51,7 +60,8 @@ Similarly, for a point defined solely by its latitude en longitude (altitude det
AbsoluteDate dateLine = rugged.dateLocation(sensorName, latitude, longitude, minLine, maxLine);
## Determine the min/max lines interval
-Rugged provides a way to determine a **very** rough estimation of the line using only the position-velocities of the satellite. It assumes the position-velocities are regular enough and without holes.
+Rugged provides a way to determine a **very** rough estimation of the line using only
+the position-velocities of the satellite. It assumes the position-velocities are regular enough and without holes.
OneAxisEllipsoid oneAxisEllipsoid = ruggedBuilder.getEllipsoid();
Frame pvFrame = ruggedBuilder.getInertialFrame();
@@ -63,7 +73,8 @@ One can compute the approximated line with the rough visibility estimator:
double roughLine = lineSensor.getLine(roughLineDate);
The result will never be null, but may be really far from reality if ground point is away from trajectory.
-With this rough line, taken some margin around (for instance 100), one can initialize the min/max lines as search boundaries for inverse location, taken into account sensor min and max lines:
+With this rough line, taken some margin around (for instance 100), one can initialize
+the min/max lines as search boundaries for inverse location, taken into account sensor min and max lines:
int minLineRough = (int) FastMath.max(FastMath.floor(roughLine - margin), sensorMinLine);
int maxLineRough = (int) FastMath.min(FastMath.floor(roughLine + margin), sensorMaxLine);
@@ -74,3 +85,5 @@ then one can compute the inverse location:
## Source code
The source code is available in InverseLocation.java (package fr.cs.examples under src/tutorials)
+
+[Top of the page](#top)
diff --git a/src/site/markdown/tutorials/matlab-example.md b/src/site/markdown/tutorials/matlab-example.md
new file mode 100644
index 0000000000000000000000000000000000000000..eedd485683bfb58f922bdaaf95d32d1654a8b36c
--- /dev/null
+++ b/src/site/markdown/tutorials/matlab-example.md
@@ -0,0 +1,25 @@
+<!--- Copyright 2013-2019 CS Systèmes d'Information
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+# Calling Rugged from Matlab
+
+Examples of direct and inverse location were provided by the Centre de Techniques Spatiales of the Algerian Space Agency.
+
+Under `src/site/resources/sources/matlab-examples/` :
+
+ * Direct location: `DirectLocation.m`
+ * Inverse location: `InverseLocation.m`
+ * Function to parse a DIMAP file: `dim2rugged.m`
+
+If you have any question about the examples, please contact issam.boukerch@yahoo.fr, researcher at the CTS.
diff --git a/src/site/markdown/tutorials/tile-updater.md b/src/site/markdown/tutorials/tile-updater.md
index fdcf99c2f81685718658f45c4ce1e37b80d1e726..84eedc7a3f2238bafd1d4445556cbafe2d4ade1a 100644
--- a/src/site/markdown/tutorials/tile-updater.md
+++ b/src/site/markdown/tutorials/tile-updater.md
@@ -1,4 +1,4 @@
-<!--- Copyright 2013-2017 CS Systèmes d'Information
+<!--- Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
diff --git a/src/site/resources/images/rugged-architecture.odg b/src/site/resources/images/rugged-architecture.odg
new file mode 100644
index 0000000000000000000000000000000000000000..e1449e7299ab529ff5854e316977a4ad006bb011
Binary files /dev/null and b/src/site/resources/images/rugged-architecture.odg differ
diff --git a/src/site/resources/images/rugged-architecture.png b/src/site/resources/images/rugged-architecture.png
index f947765ed55c9eeb71f1941d8edb27848c1651f3..d0304d24a51fe6806cba404af5f64a6380b9c14a 100644
Binary files a/src/site/resources/images/rugged-architecture.png and b/src/site/resources/images/rugged-architecture.png differ
diff --git a/src/site/resources/images/rugged-git-flow.odg b/src/site/resources/images/rugged-git-flow.odg
new file mode 100644
index 0000000000000000000000000000000000000000..f58d9724458e16908794b6885352fa71ada707ad
Binary files /dev/null and b/src/site/resources/images/rugged-git-flow.odg differ
diff --git a/src/site/resources/images/rugged-git-flow.png b/src/site/resources/images/rugged-git-flow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b714b226d4fd203c7961e2bfa1c02f4822a4029
Binary files /dev/null and b/src/site/resources/images/rugged-git-flow.png differ
diff --git a/src/site/resources/images/rugged-logo-small.jpg b/src/site/resources/images/rugged-logo-small.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..199352c7786c4eda30b106a28ce43268fbcd86b5
Binary files /dev/null and b/src/site/resources/images/rugged-logo-small.jpg differ
diff --git a/src/site/resources/images/rugged-logo.jpg b/src/site/resources/images/rugged-logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..52ced7407785c22025d63dc6cc0724565ea53fc2
Binary files /dev/null and b/src/site/resources/images/rugged-logo.jpg differ
diff --git a/src/site/resources/images/rugged-logo.png b/src/site/resources/images/rugged-logo.png
deleted file mode 100644
index 16ced1419a788f1026ffc0fb4482f19bd71edbe4..0000000000000000000000000000000000000000
Binary files a/src/site/resources/images/rugged-logo.png and /dev/null differ
diff --git a/src/site/resources/sources/matlab-examples/.gitkeep b/src/site/resources/sources/matlab-examples/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/site/resources/sources/matlab-examples/DirectLocation.m b/src/site/resources/sources/matlab-examples/DirectLocation.m
new file mode 100644
index 0000000000000000000000000000000000000000..16d5d410168f267dda937c4dafa9c552b57891bd
--- /dev/null
+++ b/src/site/resources/sources/matlab-examples/DirectLocation.m
@@ -0,0 +1,167 @@
+
+
+function DirectLocation()
+clear all
+
+%Put 'orekit-data.zip' in the current directory, if not I get an error in line 55 %org.orekit.errors.OrekitException: aucune donnée d'historique UTC-TAI n'a été chargée
+
+% These seems to work if pasted to prompt.
+% javaaddpath 'C:\ ... enter your path here ...\MATLAB'
+% javaaddpath 'C:\.. enter your path here ...\MATLAB\orekit-7.1.jar'
+% javaaddpath 'C:\.. enter your path here ...\\MATLAB\rugged-1.0.jar'
+% javaaddpath 'C:\.. enter your path here... \\MATLAB\commons-math3-3.6.1.jar'
+%%
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.orekit.rugged.los.*;
+import org.orekit.rugged.utils.*;
+
+%% Configure Orekit. The file orekit-data.zip must be in current dir
+import org.orekit.data.ZipJarCrawler
+import org.orekit.time.AbsoluteDate
+import org.orekit.time.TimeScalesFactory
+DM=org.orekit.data.DataProvidersManager.getInstance();
+crawler=org.orekit.data.ZipJarCrawler('orekit-data.zip');
+DM.clearProviders();
+DM.addProvider(crawler);
+
+
+%%
+
+%The raw viewing direction of pixel i with respect to the instrument is defined by the vector:
+rawDirs = ArrayList();
+for i =1:2000
+ %20° field of view, 2000 pixels
+ rawDirs.add (Vector3D(0,i*deg2rad(20)/2000,1));
+end
+
+%The instrument is oriented 10° off nadir around the X-axis, we need to rotate the viewing
+%direction to obtain the line of sight in the satellite frame
+losBuilder = LOSBuilder(rawDirs);
+losBuilder.addTransform(FixedRotation(ParameterType.FIXED, Vector3D.PLUS_I, deg2rad(10)));
+lineOfSight = losBuilder.build();
+
+ %%
+
+ import org.orekit.time.AbsoluteDate;
+ import org.orekit.time.TimeScalesFactory;
+ import org.orekit.rugged.linesensor.LinearLineDatation;
+
+
+%We use Orekit for handling time and dates, and Rugged for defining the datation model:
+ utc = TimeScalesFactory.getUTC();
+ absDate = AbsoluteDate('2009-12-11T16:59:30.0', utc);
+ lineDatation = LinearLineDatation(absDate, 1, 20);
+
+
+ %%
+ import org.orekit.rugged.linesensor.LineSensor;
+%With the LOS and the datation now defined , we can initialize a line sensor object in Rugged:
+lineSensor = LineSensor('mySensor', lineDatation, Vector3D.ZERO, lineOfSight);
+%%
+
+import org.orekit.frames.*;
+import org.orekit.utils.*;
+%In our application, we simply need to know the name of the frames we are working with. Positions and
+%velocities are given in the ITRF terrestrial frame, while the quaternions are given in EME2000
+%inertial frame.
+eme2000 = FramesFactory.getEME2000();
+simpleEOP = true; % we don't want to compute tiny tidal effects at millimeter level
+itrf = FramesFactory.getITRF(IERSConventions.IERS_2010, simpleEOP);
+%%
+
+satelliteQList = ArrayList();
+gps=TimeScalesFactory.getGPS();
+
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:58:42.592937', -0.340236, 0.333952, -0.844012, -0.245684);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:59:06.592937', -0.354773, 0.329336, -0.837871, -0.252281);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:59:30.592937', -0.369237, 0.324612, -0.831445, -0.258824);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:59:54.592937', -0.3836, 0.319792, -0.824743, -0.265299);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:00:18.592937', -0.397834, 0.314883, -0.817777, -0.271695);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:00:42.592937', -0.411912, 0.309895, -0.810561, -0.278001);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:01:06.592937', -0.42581, 0.304838, -0.803111, -0.284206);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:01:30.592937', -0.439505, 0.299722, -0.795442, -0.290301);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:01:54.592937', -0.452976, 0.294556, -0.787571, -0.296279);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:02:18.592937', -0.466207, 0.28935, -0.779516, -0.302131);
+
+%%
+satellitePVList = ArrayList();
+
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:58:42.592937', -726361.466, -5411878.485, 4637549.599, -2463.635, -4447.634, -5576.736);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:59:04.192937', -779538.267, -5506500.533, 4515934.894, -2459.848, -4312.676, -5683.906);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:59:25.792937', -832615.368, -5598184.195, 4392036.13, -2454.395, -4175.564, -5788.201);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:59:47.392937', -885556.748, -5686883.696, 4265915.971, -2447.273, -4036.368, -5889.568);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:00:08.992937', -938326.32, -5772554.875, 4137638.207, -2438.478, -3895.166, -5987.957);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:00:30.592937', -990887.942, -5855155.21, 4007267.717, -2428.011, -3752.034, -6083.317);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:00:52.192937', -1043205.448, -5934643.836, 3874870.441, -2415.868, -3607.05, -6175.6);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:01:13.792937', -1095242.669, -6010981.571, 3740513.34, -2402.051, -3460.291, -6264.76);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:01:35.392937', -1146963.457, -6084130.93, 3604264.372, -2386.561, -3311.835, -6350.751);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:01:56.992937', -1198331.706, -6154056.146, 3466192.446, -2369.401, -3161.764, -6433.531);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:02:18.592937', -1249311.381, -6220723.191, 3326367.397, -2350.574, -3010.159, -6513.056);
+%%
+
+% import org.orekit.rugged.api.AlgorithmId;
+% import org.orekit.rugged.api.BodyRotatingFrameId;
+% import org.orekit.rugged.api.EllipsoidId;
+% import org.orekit.rugged.api.InertialFrameId;
+% import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.api.*;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.utils.*;
+% import org.orekit.utils.CartesianDerivativesFilter;
+
+rugged=RuggedBuilder();
+rugged.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+rugged.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
+rugged.setTimeSpan(absDate, absDate.shiftedBy(60.0), 0.01, 5 / lineSensor.getRate(0));
+rugged.setTrajectory(InertialFrameId.EME2000,...
+ satellitePVList, 4, CartesianDerivativesFilter.USE_P,...
+ satelliteQList, 4, AngularDerivativesFilter.USE_R);
+rugged.addLineSensor(lineSensor);
+Rugged=rugged.build();
+
+%%
+
+import org.orekit.bodies.GeodeticPoint;
+ position = lineSensor.getPosition(); % This returns a zero vector since we set the relative position of the sensor w.r.T the satellite to 0.
+ firstLineDate = lineSensor.getDate(0);
+ los = lineSensor.getLos(firstLineDate, 0);
+ upLeftPoint = Rugged.directLocation(firstLineDate, position, los);
+
+fprintf('upper left point: Lat = %8.3f °, Lon = %8.3f °, h = %8.3f m\n',rad2deg(upLeftPoint.getLatitude()), rad2deg(upLeftPoint.getLongitude()),upLeftPoint.getAltitude() )
+
+end
+
+function satelliteQList=addSatelliteQ( gps, satelliteQList ,absDate,q0, q1, q2, q3)
+ import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.time.AbsoluteDate;
+import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+ attitudeDate = AbsoluteDate(absDate, gps);
+ rotation = Rotation(q0, q1, q2, q3, true);
+ rotationRate = Vector3D.ZERO;
+ rotationAcceleration = Vector3D.ZERO;
+ pair = TimeStampedAngularCoordinates(attitudeDate, rotation, rotationRate, rotationAcceleration);
+ satelliteQList.add(pair);
+
+end
+
+function satellitePVList= addSatellitePV( gps, eme2000, itrf, satellitePVList, absDate, px, py, pz, vx, vy, vz)
+ import org.orekit.time.AbsoluteDate;
+ import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+ import org.orekit.utils.TimeStampedPVCoordinates;
+ import org.orekit.utils.PVCoordinates;
+ import org.orekit.frames.Transform;
+ ephemerisDate = AbsoluteDate(absDate, gps);
+ position = Vector3D(px, py, pz);
+ velocity = Vector3D(vx, vy, vz);
+ pvITRF = PVCoordinates(position, velocity);
+ transform = itrf.getTransformTo(eme2000, ephemerisDate);
+ pvEME2000 = transform.transformPVCoordinates(pvITRF);
+ satellitePVList.add( TimeStampedPVCoordinates(ephemerisDate, pvEME2000.getPosition(), pvEME2000.getVelocity(), Vector3D.ZERO));
+end
+
diff --git a/src/site/resources/sources/matlab-examples/InverseLocation.m b/src/site/resources/sources/matlab-examples/InverseLocation.m
new file mode 100644
index 0000000000000000000000000000000000000000..154b54f14a66f5f48f6db12a7bf3e639c3dc5355
--- /dev/null
+++ b/src/site/resources/sources/matlab-examples/InverseLocation.m
@@ -0,0 +1,183 @@
+function InverseLocation()
+clear all
+
+%Put 'orekit-data.zip' in the current directory, if not I get an error in line 55 %org.orekit.errors.OrekitException: aucune donnée d'historique UTC-TAI n'a été chargée
+
+% These seems to work if pasted to prompt.
+% javaaddpath 'C:\ ... enter your path here ...\MATLAB'
+% javaaddpath 'C:\.. enter your path here ...\MATLAB\orekit-7.1.jar'
+% javaaddpath 'C:\.. enter your path here ...\\MATLAB\rugged-1.0.jar'
+% javaaddpath 'C:\.. enter your path here... \\MATLAB\commons-math3-3.6.1.jar'
+%%
+import org.orekit.rugged.errors.RuggedException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.orekit.rugged.los.*;
+import org.orekit.rugged.utils.*;
+
+%% Configure Orekit. The file orekit-data.zip must be in current dir
+% Initialize Orekit, assuming an orekit-data folder is in user home directory
+
+import org.orekit.data.ZipJarCrawler
+import org.orekit.time.AbsoluteDate
+import org.orekit.time.TimeScalesFactory
+DM=org.orekit.data.DataProvidersManager.getInstance();
+crawler=org.orekit.data.ZipJarCrawler('orekit-data.zip');
+DM.clearProviders();
+DM.addProvider(crawler);
+
+
+%% Building of the LOS
+
+%The raw viewing direction of pixel i with respect to the instrument is defined by the vector:
+rawDirs = ArrayList();
+for i =1:2000
+ %20° field of view, 2000 pixels
+ rawDirs.add (Vector3D(0,i*deg2rad(20)/2000,1));
+end
+
+%The instrument is oriented 10° off nadir around the X-axis, we need to rotate the viewing
+%direction to obtain the line of sight in the satellite frame
+
+losBuilder = LOSBuilder(rawDirs);
+losBuilder.addTransform(FixedRotation(ParameterType.FIXED, Vector3D.PLUS_I, deg2rad(10)));
+lineOfSight = losBuilder.build();
+
+ %% Configure the Datation
+
+ import org.orekit.time.AbsoluteDate;
+ import org.orekit.time.TimeScalesFactory;
+ import org.orekit.rugged.linesensor.LinearLineDatation;
+
+
+%We use Orekit for handling time and dates, and Rugged for defining the datation model:
+ utc = TimeScalesFactory.getUTC();
+ absDate = AbsoluteDate('2009-12-11T16:59:30.0', utc);
+ lineDatation = LinearLineDatation(absDate, 1, 20);
+
+
+ %% Initialize the Line Sensor using LOS and Datation
+ import org.orekit.rugged.linesensor.LineSensor;
+%With the LOS and the datation now defined , we can initialize a line sensor object in Rugged:
+sensorName = 'mySensor';
+lineSensor = LineSensor(sensorName, lineDatation, Vector3D.ZERO, lineOfSight);
+%% Configure Frames (EME2000 and ITRF)
+import org.orekit.frames.*;
+import org.orekit.utils.*;
+%In our application, we simply need to know the name of the frames we are working with. Positions and
+%velocities are given in the ITRF terrestrial frame, while the quaternions are given in EME2000
+%inertial frame.
+eme2000 = FramesFactory.getEME2000();
+simpleEOP = true; % we don't want to compute tiny tidal effects at millimeter level
+itrf = FramesFactory.getITRF(IERSConventions.IERS_2010, simpleEOP);
+%% Reading Quaternions
+
+satelliteQList = ArrayList();
+gps=TimeScalesFactory.getGPS();
+
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:58:42.592937', -0.340236, 0.333952, -0.844012, -0.245684);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:59:06.592937', -0.354773, 0.329336, -0.837871, -0.252281);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:59:30.592937', -0.369237, 0.324612, -0.831445, -0.258824);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T16:59:54.592937', -0.3836, 0.319792, -0.824743, -0.265299);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:00:18.592937', -0.397834, 0.314883, -0.817777, -0.271695);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:00:42.592937', -0.411912, 0.309895, -0.810561, -0.278001);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:01:06.592937', -0.42581, 0.304838, -0.803111, -0.284206);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:01:30.592937', -0.439505, 0.299722, -0.795442, -0.290301);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:01:54.592937', -0.452976, 0.294556, -0.787571, -0.296279);
+addSatelliteQ(gps, satelliteQList, '2009-12-11T17:02:18.592937', -0.466207, 0.28935, -0.779516, -0.302131);
+
+%% Reading Potitions/Velocities
+satellitePVList = ArrayList();
+
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:58:42.592937', -726361.466, -5411878.485, 4637549.599, -2463.635, -4447.634, -5576.736);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:59:04.192937', -779538.267, -5506500.533, 4515934.894, -2459.848, -4312.676, -5683.906);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:59:25.792937', -832615.368, -5598184.195, 4392036.13, -2454.395, -4175.564, -5788.201);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T16:59:47.392937', -885556.748, -5686883.696, 4265915.971, -2447.273, -4036.368, -5889.568);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:00:08.992937', -938326.32, -5772554.875, 4137638.207, -2438.478, -3895.166, -5987.957);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:00:30.592937', -990887.942, -5855155.21, 4007267.717, -2428.011, -3752.034, -6083.317);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:00:52.192937', -1043205.448, -5934643.836, 3874870.441, -2415.868, -3607.05, -6175.6);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:01:13.792937', -1095242.669, -6010981.571, 3740513.34, -2402.051, -3460.291, -6264.76);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:01:35.392937', -1146963.457, -6084130.93, 3604264.372, -2386.561, -3311.835, -6350.751);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:01:56.992937', -1198331.706, -6154056.146, 3466192.446, -2369.401, -3161.764, -6433.531);
+addSatellitePV(gps, eme2000, itrf, satellitePVList, '2009-12-11T17:02:18.592937', -1249311.381, -6220723.191, 3326367.397, -2350.574, -3010.159, -6513.056);
+
+%% Configure and Build Rugged
+
+import org.orekit.rugged.api.*;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.utils.*;
+
+
+rugged=RuggedBuilder();
+rugged.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+rugged.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
+rugged.setTimeSpan(absDate, absDate.shiftedBy(60.0), 0.01, 5 / lineSensor.getRate(0));
+rugged.setTrajectory(InertialFrameId.EME2000,...
+ satellitePVList, 4, CartesianDerivativesFilter.USE_P,...
+ satelliteQList, 4, AngularDerivativesFilter.USE_R);
+rugged.addLineSensor(lineSensor);
+Rugged=rugged.build();
+
+%% Geodetic Point creation and Inverse Location
+%Point defined by its latitude, longitude and altitude
+
+import org.orekit.bodies.GeodeticPoint;
+latitude = deg2rad(34.27452);
+longitude = deg2rad(-99.56804);
+altitude = 0.0;
+
+gp=GeodeticPoint(latitude, longitude, altitude);
+
+% Search the sensor pixel seeing point
+% the obteined result must be (1000,1000).
+% the above geodetic point coordinates are obteined using DirecLocation.m to
+% project the image point (1000,1000) on the ground.
+
+minLine = 950;
+maxLine = 1050;
+sensorPixel = Rugged.inverseLocation(sensorName, gp, minLine, maxLine);
+%% Test of the result and Print outputs
+%we need to test if the sensor pixel is found in the prescribed lines
+%otherwise the sensor pixel is empty
+if (isempty(sensorPixel))
+ fprintf('Sensor Pixel is Empty: point cannot be seen between the prescribed line numbers\n')
+else
+ fprintf('Sensor Pixel found : line = %5.3f, pixel = %5.3f \n', sensorPixel.getLineNumber(), sensorPixel.getPixelNumber())
+ %Find the date at which the sensor sees the ground point
+ dateLine = Rugged.dateLocation(sensorName, gp, minLine, maxLine);
+ fprintf(['Date at which the sensor sees the ground point :', char(dateLine.toString()),'\n'])
+end
+
+end
+%% read Quaternions Function
+function satelliteQList=addSatelliteQ( gps, satelliteQList ,absDate,q0, q1, q2, q3)
+ import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.time.AbsoluteDate;
+import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+ attitudeDate = AbsoluteDate(absDate, gps);
+ rotation = Rotation(q0, q1, q2, q3, true);
+ rotationRate = Vector3D.ZERO;
+ rotationAcceleration = Vector3D.ZERO;
+ pair = TimeStampedAngularCoordinates(attitudeDate, rotation, rotationRate, rotationAcceleration);
+ satelliteQList.add(pair);
+
+end
+%% read Position/Velocity Function
+function satellitePVList= addSatellitePV( gps, eme2000, itrf, satellitePVList, absDate, px, py, pz, vx, vy, vz)
+ import org.orekit.time.AbsoluteDate;
+ import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+ import org.orekit.utils.TimeStampedPVCoordinates;
+ import org.orekit.utils.PVCoordinates;
+ import org.orekit.frames.Transform;
+ ephemerisDate = AbsoluteDate(absDate, gps);
+ position = Vector3D(px, py, pz);
+ velocity = Vector3D(vx, vy, vz);
+ pvITRF = PVCoordinates(position, velocity);
+ transform = itrf.getTransformTo(eme2000, ephemerisDate);
+ pvEME2000 = transform.transformPVCoordinates(pvITRF);
+ satellitePVList.add( TimeStampedPVCoordinates(ephemerisDate, pvEME2000.getPosition(), pvEME2000.getVelocity(), Vector3D.ZERO));
+end
diff --git a/src/site/resources/sources/matlab-examples/dim2rugged.m b/src/site/resources/sources/matlab-examples/dim2rugged.m
new file mode 100644
index 0000000000000000000000000000000000000000..f154193637ec1790f8b9530408c42965daa66659
--- /dev/null
+++ b/src/site/resources/sources/matlab-examples/dim2rugged.m
@@ -0,0 +1,337 @@
+%In this example we aim to create the rugged object based on the DIM file (in xml format).
+
+%Dimap is a format file used to provide interior and exterior orientation
+%elements, this format is used by several satellites such: SPOT5,
+%Formosat, THEOS, ALSAT-2A, KOMPSAT-2 and other.
+%Except SPOT5 and Formosat, the interior orientation parameters are
+%given in the form of polynomial coefficients that allow the estimation of the
+%look direction of a considered pixel in a frame called RLOS and also the
+%Bias angles to transform the look directions from RLOS to RSAT.
+%(see: DOI 10.1007/s12524-014-0380-x and doi:10.5194/isprsarchives-XL-1-W1-35-2013)
+%as an example for THEOS Dimap file see:
+%http://ortho-qgis.googlecode.com/svn/trunk/Chiangmai1Dimap.xml
+%This example has been tested and works also using ALSAT-2A DIM file.
+
+function dim2rugged()
+clear all
+%Put 'orekit-data.zip' in the current directory, if not I get an error in line 55 %org.orekit.errors.OrekitException: aucune donnée d'historique UTC-TAI n'a été chargée
+
+% These seems to work if pasted to prompt.
+% javaaddpath 'C:\ ... enter your path here ...\MATLAB'
+% javaaddpath 'C:\.. enter your path here ...\MATLAB\orekit-7.1.jar'
+% javaaddpath 'C:\.. enter your path here ...\\MATLAB\rugged-1.0.jar'
+% javaaddpath 'C:\.. enter your path here... \\MATLAB\commons-math3-3.6.1.jar'
+
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+
+dimFile='Chiangmai1Dimap.xml';
+
+%terrainaltitude is the altitude of the ground intersection point
+terrainAltitude=800;
+
+%this function returns a RuggedBuilder based on DIM file and a nominal terrainAltitude
+ruggedBuilder= Dim2RuggedBuilderObj(dimFile,terrainAltitude);
+
+%the terrainAltitude can be changed using ruggedBuilder.setConstantElevation(terrainAltitude);
+%then dimRugged=ruggedBuilder.build(); must be called to create a new Rugged that
+%allow the direct location at a different terrain altitude without parsing
+%the DIM file again.
+dimRugged=ruggedBuilder.build();
+
+%This exemple consider the PAN image only where the sensor line is called
+%PAN Sensor
+lineSensor=dimRugged.getLineSensor('PAN Sensor');
+
+%Get the LOS and the datation of the first pixel of the image
+position = lineSensor.getPosition();
+lineDate = lineSensor.getDate(0);
+los = lineSensor.getLos(lineDate, 0);
+
+%Get the corresponding ground coordinates of the considered pixel at terrainAltitude
+upLeftPoint = dimRugged.directLocation(lineDate, position, los);
+
+%Print the results
+fprintf('upper left point: Lat = %8.6f °, Lon = %8.6f °, h = %8.2f m\n',rad2deg(upLeftPoint.getLatitude()), rad2deg(upLeftPoint.getLongitude()),upLeftPoint.getAltitude() )
+
+
+end
+function ruggedBuilder= Dim2RuggedBuilderObj(dimFile,terrainAltitude)
+% This function creates a RuggedBuilder object based on DIM file
+% The intersection are done at terrainAltitude, when this object is used for DirectLocation
+%% Configure Orekit. The file orekit-data.zip must be in current dir
+import org.orekit.data.ZipJarCrawler
+import org.orekit.time.AbsoluteDate
+import org.orekit.time.TimeScalesFactory
+DM=org.orekit.data.DataProvidersManager.getInstance();
+crawler=org.orekit.data.ZipJarCrawler('orekit-data.zip');
+DM.clearProviders();
+DM.addProvider(crawler);
+%%
+%Read XML document and get Document Object Model node
+
+xDoc = xmlread(dimFile);
+
+%REFERENCE_TIME is the time of imaging of the REFERENCE_LINE
+Element='REFERENCE_TIME';
+referenceTime=GetElementValue(Element,xDoc);
+
+%FormatTime to get the read time in the standard format
+referenceTime=FormatTime(referenceTime);
+
+%LINE_PERIOD is the time required to record an image line
+Element='LINE_PERIOD';
+
+%LineRate is the inverse of the line period
+lineRate=1/(str2double(GetElementValue(Element,xDoc)));
+
+%REFERENCE_LINE the line used for datation reference
+Element='REFERENCE_LINE';
+referenceLine=str2double(GetElementValue(Element,xDoc));
+
+%NROWS the number of Rows
+Element='NROWS';
+nRows=str2double(GetElementValue(Element,xDoc));
+
+%NCOLS the number of columns
+Element='NCOLS';
+nCols=str2double(GetElementValue(Element,xDoc));
+
+%YAW, PITCH, ROLL are the angles between RLOS and RSAT, where RLOS is the
+%frame where the los are measured and RSAT is the frame tied to the
+%spacecraft where the quatenions represent the rotaion between RSAT and
+%EME2000
+
+Element='YAW';
+yaw=str2double(GetElementValue(Element,xDoc));
+
+Element='PITCH';
+pitch=str2double(GetElementValue(Element,xDoc));
+
+Element='ROLL';
+roll=str2double(GetElementValue(Element,xDoc));
+
+%XLOS_i and YLOS_i are the polynomial coefficiens that allow the
+%calculation of LOS direction of each pixel in RLOS
+%(see: DOI 10.1007/s12524-014-0380-x)
+
+Element='XLOS_3';
+xLosPoly=str2double(GetElementValue(Element,xDoc));
+Element='XLOS_2';
+xLosPoly=[xLosPoly, str2double(GetElementValue(Element,xDoc))];
+Element='XLOS_1';
+xLosPoly=[xLosPoly, str2double(GetElementValue(Element,xDoc))];
+Element='XLOS_0';
+xLosPoly=[xLosPoly, str2double(GetElementValue(Element,xDoc))];
+
+Element='YLOS_3';
+yLosPoly=str2double(GetElementValue(Element,xDoc));
+Element='YLOS_2';
+yLosPoly=[yLosPoly, str2double(GetElementValue(Element,xDoc))];
+Element='YLOS_1';
+yLosPoly=[yLosPoly, str2double(GetElementValue(Element,xDoc))];
+Element='YLOS_0';
+yLosPoly=[yLosPoly, str2double(GetElementValue(Element,xDoc))];
+%%
+quaternions = xDoc.getElementsByTagName('Quaternion');
+%read the Quaternions into the arraylist
+satelliteQList=ParseQuaternions(quaternions);
+
+%%
+pv = xDoc.getElementsByTagName('Point');
+%read the Positions/Velocities into the arraylist
+satellitePVList=ParsePV(pv);
+
+%%
+%Build the LOS based on whole pushbroom size (ncols), the polynomial
+%describing the LOS and bias angles (yaw,pitch,roll)
+lineOfSight=LosBuilding(nCols,xLosPoly,yLosPoly,yaw,pitch,roll);
+
+ %%
+ import org.orekit.time.AbsoluteDate;
+ import org.orekit.time.TimeScalesFactory;
+ import org.orekit.rugged.linesensor.LinearLineDatation;
+
+%setup of the datation
+
+ gps = TimeScalesFactory.getGPS();
+ absDate = AbsoluteDate(referenceTime, gps);
+ lineDatation = LinearLineDatation(absDate, referenceLine, lineRate);
+
+ %%
+ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+ import org.orekit.rugged.linesensor.LineSensor;
+ %With the LOS and the datation now defined , we can initialize a line sensor object in Rugged:
+ lineSensor = LineSensor('PAN Sensor', lineDatation, Vector3D.ZERO, lineOfSight);
+
+%%
+import org.orekit.rugged.api.*;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.utils.*;
+
+ruggedBuilder=RuggedBuilder();
+
+%the intersection during the direct location will be at "terrainAltitude"
+ruggedBuilder.setConstantElevation(terrainAltitude);
+ruggedBuilder.setAlgorithm(AlgorithmId.CONSTANT_ELEVATION_OVER_ELLIPSOID);
+ruggedBuilder.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
+
+captureDuration=(nRows+100)/ lineSensor.getRate(0);
+
+ruggedBuilder.setTimeSpan(absDate, absDate.shiftedBy(captureDuration), 0.001, 5 / lineSensor.getRate(0));
+ruggedBuilder.setTrajectory(InertialFrameId.EME2000,...
+ satellitePVList, 4, CartesianDerivativesFilter.USE_P,...
+ satelliteQList, 4, AngularDerivativesFilter.USE_R);
+ruggedBuilder.addLineSensor(lineSensor);
+
+
+end
+function lineOfSight=LosBuilding(nCols,xLosPoly,yLosPoly,yaw,pitch,roll)
+import java.util.ArrayList;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.orekit.rugged.los.*;
+import org.orekit.rugged.utils.*;
+
+rawDirs = ArrayList();
+
+for i =1:nCols
+
+ psiY = -polyval(xLosPoly,i)/1000;
+ psiX = polyval(yLosPoly,i)/1000;
+ rawDirs.add (Vector3D(psiX,psiY,1));
+
+end
+
+losBuilder = LOSBuilder(rawDirs);
+losBuilder.addTransform(FixedRotation(ParameterType.FIXED, Vector3D.PLUS_K,yaw));
+losBuilder.addTransform(FixedRotation(ParameterType.FIXED, Vector3D.PLUS_J,pitch));
+losBuilder.addTransform(FixedRotation(ParameterType.FIXED, Vector3D.PLUS_I,roll));
+
+lineOfSight = losBuilder.build();
+
+end
+
+function valElement=GetElementValue(element,xDoc)
+% valElement=GetElementValue(element,xDoc) returne a string contained in
+% the corresponding "element" in the XML "xDoc" file
+valElement=char(xDoc.getElementsByTagName(element).item(0).getTextContent);
+
+end
+
+function time=FormatTime(time)
+%FormatTime replace the space contained the time string by "T"
+position=strfind(time,' ');
+time(position)='T';
+
+end
+function satellitePVList=ParsePV(pv)
+%ParsePV parse the "Point" element in the dimap file to get an ArrayList
+import java.util.ArrayList;
+import java.util.List;
+import org.orekit.time.TimeScalesFactory;
+import org.orekit.frames.*;
+import org.orekit.utils.*;
+
+satellitePVList = ArrayList();
+
+gps=TimeScalesFactory.getGPS();
+eme2000 = FramesFactory.getEME2000();
+simpleEOP = true; % we don't want to compute tiny tidal effects at millimeter level
+itrf = FramesFactory.getITRF(IERSConventions.IERS_2010, simpleEOP);
+
+
+nPV = pv.getLength;
+position=[];
+velocity=[];
+
+for i=0:nPV - 1
+ entries = pv.item(i).getChildNodes;
+ node = entries.getFirstChild;
+while ~isempty(node)
+
+ if strcmpi(node.getNodeName, 'TIME')
+ T= FormatTime(char(node.getTextContent));
+ end
+ if strcmpi(node.getNodeName, 'Location')
+ position= str2num(char(node.getTextContent));
+ end
+ if strcmpi(node.getNodeName, 'Velocity')
+ velocity= str2num(char(node.getTextContent));
+ end
+
+ node = node.getNextSibling;
+
+end
+addSatellitePV(gps, eme2000, itrf, satellitePVList, T, position(1), position(2), position(3), velocity(1), velocity(2), velocity(3));
+
+end
+
+
+end
+
+
+function satelliteQList=ParseQuaternions(quaternions)
+%ParseQuaternions parse the "Quaternion" element in the dimap file to get an ArrayList
+import java.util.ArrayList;
+import java.util.List;
+import org.orekit.time.TimeScalesFactory;
+
+satelliteQList = ArrayList();
+gps=TimeScalesFactory.getGPS();
+
+nQuaternions=quaternions.getLength;
+
+for i=0:nQuaternions - 1
+ entries = quaternions.item(i).getChildNodes;
+ node = entries.getFirstChild;
+while ~isempty(node)
+ if strcmpi(node.getNodeName, 'TIME')
+ T= FormatTime(char(node.getTextContent));
+ end
+ if strcmpi(node.getNodeName, 'Q0')
+ Q0= str2double(char(node.getTextContent));
+ end
+ if strcmpi(node.getNodeName, 'Q1')
+ Q1= str2double(char(node.getTextContent));
+ end
+ if strcmpi(node.getNodeName, 'Q2')
+ Q2= str2double(char(node.getTextContent));
+ end
+ if strcmpi(node.getNodeName, 'Q3')
+ Q3= str2double(char(node.getTextContent));
+ end
+ node = node.getNextSibling;
+end
+addSatelliteQ(gps, satelliteQList, T, Q0, Q1, Q2, Q3);
+end
+
+end
+
+function satelliteQList=addSatelliteQ( gps, satelliteQList ,absDate,q0, q1, q2, q3)
+import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.time.AbsoluteDate;
+import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+ attitudeDate = AbsoluteDate(absDate, gps);
+ rotation = Rotation(q0, q1, q2, q3, true);
+ rotationRate = Vector3D.ZERO;
+ rotationAcceleration = Vector3D.ZERO;
+ pair = TimeStampedAngularCoordinates(attitudeDate, rotation, rotationRate, rotationAcceleration);
+ satelliteQList.add(pair);
+
+end
+
+function satellitePVList= addSatellitePV( gps, eme2000, itrf, satellitePVList, absDate, px, py, pz, vx, vy, vz)
+ import org.orekit.time.AbsoluteDate;
+ import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+ import org.orekit.utils.TimeStampedPVCoordinates;
+ import org.orekit.utils.PVCoordinates;
+ import org.orekit.frames.Transform;
+ ephemerisDate = AbsoluteDate(absDate, gps);
+ position = Vector3D(px, py, pz);
+ velocity = Vector3D(vx, vy, vz);
+ pvITRF = PVCoordinates(position, velocity);
+ transform = itrf.getTransformTo(eme2000, ephemerisDate);
+ pvEME2000 = transform.transformPVCoordinates(pvITRF);
+ satellitePVList.add( TimeStampedPVCoordinates(ephemerisDate, pvEME2000.getPosition(), pvEME2000.getVelocity(), Vector3D.ZERO));
+end
diff --git a/src/site/site.xml b/src/site/site.xml
index 9b7f20f6acbd6744515a95cabc5d117373c2caa4..6c5f116c1d01ed471fed3343676325af4b759956 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2013-2017 CS Systèmes d'Information
+ Copyright 2013-2019 CS Systèmes d'Information
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -17,11 +17,12 @@
<bannerLeft>
<name>CS Systèmes d'Information</name>
<src>/images/logo_cs_2008_baseline_ang.jpg</src>
+ <height>180</height>
<href>http://www.c-s.fr/</href>
</bannerLeft>
<bannerRight>
<name>Rugged</name>
- <src>/images/rugged-logo.png</src>
+ <src>/images/rugged-logo-small.jpg</src>
<href>/index.html</href>
</bannerRight>
<body>
@@ -31,7 +32,7 @@
<item name="Building" href="/building.html" />
<item name="Configuration" href="/configuration.html" />
<item name="FAQ" href="/faq.html" />
- <item name="License" href="/license.html" />
+ <item name="License" href="/licenses.html" />
<item name="Downloads" href="/downloads.html" />
<item name="Changes" href="/changes-report.html" />
<item name="Contact" href="/contact.html" />
@@ -40,12 +41,13 @@
<item name="Overview" href="/design/overview.html" />
<item name="Technical choices" href="/design/technical-choices.html" />
<item name="Digital Elevation Model" href="/design/digital-elevation-model.html" />
- <item name="Preliminary design" href="/design/preliminary-design.html" />
+ <item name="Design" href="/design/design.html" />
</menu>
<menu name="Tutorials">
<item name="Direct location" href="/tutorials/direct-location.html" />
<item name="Direct location with DEM" href="/tutorials/direct-location-with-DEM.html" />
<item name="Inverse location" href="/tutorials/inverse-location.html" />
+ <item name="Matlab examples" href="/tutorials/matlab-example.html" />
</menu>
<menu name="Development">
<item name="Contributing" href="/contributing.html" />
diff --git a/src/test/java/org/orekit/rugged/TestUtils.java b/src/test/java/org/orekit/rugged/TestUtils.java
index e37b7a38e8e757b70c4c2c890ec471a6346bf9f1..1c8c97e2353361f59c4033f78154f2ac7e4992aa 100644
--- a/src/test/java/org/orekit/rugged/TestUtils.java
+++ b/src/test/java/org/orekit/rugged/TestUtils.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,12 +17,7 @@
package org.orekit.rugged;
-import org.hipparchus.geometry.euclidean.threed.Rotation;
-import org.hipparchus.geometry.euclidean.threed.RotationConvention;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
-import org.hipparchus.util.FastMath;
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -30,14 +25,20 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.RotationConvention;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
+import org.hipparchus.util.FastMath;
+import org.junit.Assert;
import org.orekit.attitudes.AttitudeProvider;
import org.orekit.attitudes.NadirPointing;
import org.orekit.attitudes.YawCompensation;
import org.orekit.bodies.BodyShape;
import org.orekit.bodies.CelestialBodyFactory;
+import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
import org.orekit.data.DataProvidersManager;
-import org.orekit.errors.OrekitException;
import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
import org.orekit.forces.gravity.ThirdBodyAttraction;
import org.orekit.forces.gravity.potential.GravityFieldFactory;
@@ -60,6 +61,7 @@ import org.orekit.propagation.numerical.NumericalPropagator;
import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.propagation.semianalytical.dsst.utilities.JacobiPolynomials;
import org.orekit.propagation.semianalytical.dsst.utilities.NewcombOperators;
+import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.time.AbsoluteDate;
@@ -155,8 +157,7 @@ public class TestUtils {
public static void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
ArrayList<TimeStampedPVCoordinates> satellitePVList,
String absDate,
- double px, double py, double pz, double vx, double vy, double vz)
- throws OrekitException {
+ double px, double py, double pz, double vx, double vy, double vz) {
AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
Vector3D position = new Vector3D(px, py, pz);
@@ -182,11 +183,8 @@ public class TestUtils {
}
/** Create an Earth for Junit tests.
- * @return the Earth as the WGS84 ellipsoid
- * @throws OrekitException
*/
- public static BodyShape createEarth()
- throws OrekitException {
+ public static BodyShape createEarth() {
return new OneAxisEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
@@ -195,10 +193,8 @@ public class TestUtils {
/** Created a gravity field.
* @return normalized spherical harmonics coefficients
- * @throws OrekitException
*/
- public static NormalizedSphericalHarmonicsProvider createGravityField()
- throws OrekitException {
+ public static NormalizedSphericalHarmonicsProvider createGravityField() {
return GravityFieldFactory.getNormalizedProvider(12, 12);
}
@@ -206,9 +202,8 @@ public class TestUtils {
/** Create an orbit.
* @param mu Earth gravitational constant
* @return the orbit
- * @throws OrekitException
*/
- public static Orbit createOrbit(double mu) throws OrekitException {
+ public static Orbit createOrbit(double mu) {
// the following orbital parameters have been computed using
// Orekit tutorial about phasing, using the following configuration:
@@ -230,36 +225,13 @@ public class TestUtils {
FastMath.PI, PositionAngle.TRUE,
eme2000, date, mu);
}
-
- /** Create an orbit at a chosen date for Refining tests
- * @param mu Earth gravitational constant
- * @param date the chosen date
- * @return the orbit
- * @throws OrekitException
- */
- public Orbit createOrbit(final double mu, final AbsoluteDate date) throws OrekitException {
-
- final Frame eme2000 = FramesFactory.getEME2000();
- return new CircularOrbit(694000.0 + Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
- -4.029194321683225E-4,
- 0.0013530362644647786,
- FastMath.toRadians(98.2), // Pleiades inclination 98.2 deg
- FastMath.toRadians(-86.47 + 180),
- FastMath.toRadians(135.9 + 0.3),
- PositionAngle.TRUE,
- eme2000,
- date,
- mu);
- }
-
+
/** Create the propagator of an orbit.
* @return propagator of the orbit
- * @throws OrekitException
*/
public static Propagator createPropagator(BodyShape earth,
NormalizedSphericalHarmonicsProvider gravityField,
- Orbit orbit)
- throws OrekitException {
+ Orbit orbit) {
AttitudeProvider yawCompensation = new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth));
SpacecraftState state = new SpacecraftState(orbit,
@@ -321,12 +293,10 @@ public class TestUtils {
/** Propagate an orbit between 2 given dates
* @return a list of TimeStampedPVCoordinates
- * @throws OrekitException
*/
public static List<TimeStampedPVCoordinates> orbitToPV(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
- double step)
- throws OrekitException {
+ double step) {
Propagator propagator = new KeplerianPropagator(orbit);
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
@@ -346,12 +316,10 @@ public class TestUtils {
/** Propagate an attitude between 2 given dates
* @return a list of TimeStampedAngularCoordinates
- * @throws OrekitException
*/
public static List<TimeStampedAngularCoordinates> orbitToQ(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
- double step)
- throws OrekitException {
+ double step) {
Propagator propagator = new KeplerianPropagator(orbit);
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
@@ -367,5 +335,77 @@ public class TestUtils {
propagator.propagate(maxDate);
return list;
}
+
+ /**
+ * Asserts that two SensorPixel are equal to within a positive delta for each component.
+ * For more details see:
+ * org.junit.assert.assertEquals(String message, double expected, double actual, double delta)
+ */
+ static public void sensorPixelAssertEquals(SensorPixel expected, SensorPixel result, double delta) {
+
+ assertEquals(null,expected.getLineNumber(), result.getLineNumber(), delta);
+ assertEquals(null,expected.getPixelNumber(), result.getPixelNumber(), delta);
+ }
+
+ /**
+ * Tell if two SensorPixel are the same, where each components are equal to within a positive delta.
+ * For more details see:
+ * org.junit.assert.assertEquals(String message, double expected, double actual, double delta)
+ * @param expected expected sensor pixel
+ * @param result actual sensor pixel
+ * @param delta delta within two values are consider equal
+ * @return true if the two SensorPixel are the same, false otherwise
+ */
+ static public Boolean sameSensorPixels(SensorPixel expected, SensorPixel result, double delta) {
+
+ Boolean sameSensorPixel = false;
+
+ // To have same pixel (true)
+ sameSensorPixel = !(isDifferent(expected.getLineNumber(), result.getLineNumber(), delta) ||
+ isDifferent(expected.getPixelNumber(), result.getPixelNumber(), delta));
+
+ return sameSensorPixel;
+ }
+
+ /**
+ * Tell if two SensorPixel are the same, where each components are equal to within a positive delta.
+ * For more details see:
+ * org.junit.assert.assertEquals(String message, double expected, double actual, double delta)
+ * @param expected expected sensor pixel
+ * @param result actual sensor pixel
+ * @param delta delta within two values are consider equal
+ * @return true if the two SensorPixel are the same, false otherwise
+ */
+ static public Boolean sameGeodeticPoints(GeodeticPoint expected, GeodeticPoint result, double delta) {
+
+ Boolean sameGeodeticPoint = false;
+
+ // To have same GeodeticPoint (true)
+ sameGeodeticPoint = !(isDifferent(expected.getLatitude(), result.getLatitude(), delta) ||
+ isDifferent(expected.getLongitude(), result.getLongitude(), delta) ||
+ isDifferent(expected.getAltitude(), result.getAltitude(), delta));
+
+ return sameGeodeticPoint;
+ }
+
+
+ /** Return true if two double values are different within a positive delta.
+ * @param val1 first value to compare
+ * @param val2 second value to compare
+ * @param delta delta within the two values are consider equal
+ * @return true is different, false if equal within the positive delta
+ */
+ static private boolean isDifferent(double val1, double val2, double delta) {
+
+ if (Double.compare(val1, val2) == 0) {
+ return false;
+ }
+ if ((FastMath.abs(val1 - val2) <= delta)) {
+ return false;
+ }
+ return true;
+ }
+
+
}
diff --git a/src/test/java/org/orekit/rugged/adjustment/AdjustmentContextTest.java b/src/test/java/org/orekit/rugged/adjustment/AdjustmentContextTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..aed3c818e5294399abedbf40e083359da72b2fc8
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/AdjustmentContextTest.java
@@ -0,0 +1,198 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.adjustment;
+
+import java.lang.reflect.Field;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer.Optimum;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorMapping;
+import org.orekit.rugged.adjustment.util.InitInterRefiningTest;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
+import org.orekit.rugged.linesensor.SensorPixel;
+
+public class AdjustmentContextTest {
+
+ @Before
+ public void setUp() {
+
+ try {
+ // One must set a context for the adjustment ... Here we choose an inter sensors optimization problem
+ InitInterRefiningTest refiningTest = new InitInterRefiningTest();
+ refiningTest.initRefiningTest();
+
+ ruggedList = refiningTest.getRuggedList();
+
+ int lineSampling = 1000;
+ int pixelSampling = 1000;
+
+ double earthConstraintWeight = 0.1;
+
+ measurements = refiningTest.generateNoisyPoints(lineSampling, pixelSampling, earthConstraintWeight, false);
+
+ } catch (RuggedException re) {
+ Assert.fail(re.getLocalizedMessage());
+ }
+ }
+
+ @Test
+ public void testAdjustmentContext() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ AdjustmentContext adjustmentContext = new AdjustmentContext(ruggedList, measurements);
+
+ // Check if the default OptimizerId is the expected one (use reflectivity)
+ Field optimizerId = adjustmentContext.getClass().getDeclaredField("optimizerID");
+ optimizerId.setAccessible(true);
+ OptimizerId defaultOptimizerId = (OptimizerId) optimizerId.get(adjustmentContext);
+ Assert.assertTrue((defaultOptimizerId == OptimizerId.GAUSS_NEWTON_QR));
+
+ // Check if the change of the default OptimizerId is correct
+ adjustmentContext.setOptimizer(OptimizerId.GAUSS_NEWTON_LU);
+ OptimizerId modifiedOptimizerId = (OptimizerId) optimizerId.get(adjustmentContext);
+ Assert.assertTrue((modifiedOptimizerId == OptimizerId.GAUSS_NEWTON_LU));
+
+ // Check if the change of the default OptimizerId is correct
+ adjustmentContext.setOptimizer(OptimizerId.LEVENBERG_MARQUADT);
+ modifiedOptimizerId = (OptimizerId) optimizerId.get(adjustmentContext);
+ Assert.assertTrue((modifiedOptimizerId == OptimizerId.LEVENBERG_MARQUADT));
+
+
+ }
+
+ @Test
+ public void testEstimateFreeParameters() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ AdjustmentContext adjustmentContext = new AdjustmentContext(ruggedList, measurements);
+
+ for (OptimizerId optimizer : OptimizerId.values()) {
+
+ // Set the optimizer
+ adjustmentContext.setOptimizer(optimizer);
+
+ List<String> ruggedNameList = new ArrayList<String>();
+ for(Rugged rugged : ruggedList) {
+ ruggedNameList.add(rugged.getName());
+ }
+ final int maxIterations = 120;
+ final double convergenceThreshold = 1.e-7;
+
+ Optimum optimum = adjustmentContext.estimateFreeParameters(ruggedNameList, maxIterations, convergenceThreshold);
+
+ Field optimizerId = adjustmentContext.getClass().getDeclaredField("optimizerID");
+ optimizerId.setAccessible(true);
+ OptimizerId usedOptimizerId = (OptimizerId) optimizerId.get(adjustmentContext);
+
+ if (usedOptimizerId == OptimizerId.GAUSS_NEWTON_QR || usedOptimizerId == OptimizerId.GAUSS_NEWTON_LU) {
+ // For Gauss Newton, the number of evaluations is equal to the number of iterations
+ Assert.assertTrue(optimum.getEvaluations() == optimum.getIterations());
+ } else if (usedOptimizerId == OptimizerId.LEVENBERG_MARQUADT) {
+ // For Levenberg Marquadt, the number of evaluations is slightly greater than the number of iterations
+ Assert.assertTrue(optimum.getEvaluations() >= optimum.getIterations());
+ }
+
+ } // loop on OptimizerId
+ }
+
+ @Test
+ public void testInvalidRuggedName() {
+ try {
+
+ AdjustmentContext adjustmentContext = new AdjustmentContext(ruggedList, measurements);
+
+ List<String> ruggedNameList = new ArrayList<String>();
+ // the list must not have a null value
+ Iterator<Rugged> it = ruggedList.iterator();
+ while (it.hasNext()) {
+ ruggedNameList.add(null);
+ it.next();
+ }
+ final int maxIterations = 1;
+ final double convergenceThreshold = 1.e-7;
+
+ adjustmentContext.estimateFreeParameters(ruggedNameList, maxIterations, convergenceThreshold);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.INVALID_RUGGED_NAME,re.getSpecifier());
+ }
+ }
+
+ @Test
+ public void testUnsupportedRefiningContext() {
+ try {
+
+ AdjustmentContext adjustmentContext = new AdjustmentContext(ruggedList, measurements);
+
+ List<String> ruggedNameList = new ArrayList<String>();
+ // Add too many rugged name: the list must have 1 or 2 items
+ for(Rugged rugged : ruggedList) {
+ ruggedNameList.add(rugged.getName());
+ ruggedNameList.add(rugged.getName());
+ ruggedNameList.add(rugged.getName());
+ }
+ final int maxIterations = 1;
+ final double convergenceThreshold = 1.e-7;
+
+ adjustmentContext.estimateFreeParameters(ruggedNameList, maxIterations, convergenceThreshold);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.UNSUPPORTED_REFINING_CONTEXT,re.getSpecifier());
+ }
+ }
+
+ @Test
+ public void testSensorMapping() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ String sensorGiven = "lineSensor";
+ String ruggedGiven = "Rugged";
+ SensorMapping<SensorPixel> simpleMapping = new SensorMapping<SensorPixel>(sensorGiven) ;
+
+ Field ruggedField = simpleMapping.getClass().getDeclaredField("ruggedName");
+ ruggedField.setAccessible(true);
+ String ruggedRead = (String) ruggedField.get(simpleMapping);
+
+ Field sensorField = simpleMapping.getClass().getDeclaredField("sensorName");
+ sensorField.setAccessible(true);
+ String sensorRead = (String) sensorField.get(simpleMapping);
+
+ Assert.assertTrue(ruggedGiven.equals(ruggedRead));
+ Assert.assertTrue(sensorGiven.equals(sensorRead));
+ }
+
+ @After
+ public void tearDown() {
+ measurements = null;
+ ruggedList = null;
+ }
+
+ private Observables measurements;
+ private List<Rugged> ruggedList;
+
+}
diff --git a/src/test/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilderTest.java b/src/test/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..be7ad216ab106c087b5f667347871894ea5b57a0
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/GroundOptimizationProblemBuilderTest.java
@@ -0,0 +1,200 @@
+package org.orekit.rugged.adjustment;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer.Optimum;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.rugged.TestUtils;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
+import org.orekit.rugged.adjustment.util.InitGroundRefiningTest;
+import org.orekit.rugged.adjustment.util.RefiningParametersDriver;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.SensorPixel;
+
+public class GroundOptimizationProblemBuilderTest {
+
+ @Before
+ public void setUp() {
+
+ try {
+ refiningTest = new InitGroundRefiningTest();
+ refiningTest.initGroundRefiningTest();
+
+ rugged = refiningTest.getRugged();
+ // get the only line sensor
+ LineSensor sensor = rugged.getLineSensors().iterator().next();
+ sensorName = sensor.getName();
+
+ measurements = refiningTest.generateNoisyPoints(lineSampling, pixelSampling, false);
+ numberOfParameters = refiningTest.getParameterToAdjust();
+
+ } catch (RuggedException re) {
+ Assert.fail(re.getLocalizedMessage());
+ }
+ }
+
+ @Test
+ public void testEstimateFreeParameters() {
+
+ AdjustmentContext adjustmentContext = new AdjustmentContext(Collections.singletonList(rugged), measurements);
+ final int maxIterations = 50;
+ final double convergenceThreshold = 1.e-11;
+ Optimum optimum = adjustmentContext.estimateFreeParameters(Collections.singletonList(rugged.getName()), maxIterations, convergenceThreshold);
+
+ Assert.assertTrue(optimum.getIterations() < maxIterations);
+
+ // The default optimizer is a Gauss Newton.
+ // For Gauss Newton, the number of evaluations is equal to the number of iterations
+ Assert.assertTrue(optimum.getEvaluations() == optimum.getIterations());
+
+ final double expectedMaxValue = 39200.0;
+ Assert.assertEquals(expectedMaxValue, optimum.getResiduals().getMaxValue(), 1.0e-6);
+
+ final double expectedRMS = 5067.112098;
+ Assert.assertEquals(expectedRMS, optimum.getRMS(), 1.0e-6);
+
+ final double expectedCost = 286639.1460351976;
+ Assert.assertEquals(expectedCost, optimum.getCost(), 1.0e-6);
+
+ Assert.assertTrue(numberOfParameters == optimum.getPoint().getDimension());
+
+ final int sensorToGroundMappingSize = 1600;
+ Collection<SensorToGroundMapping> ssm = measurements.getGroundMappings();
+ Iterator<SensorToGroundMapping> it = ssm.iterator();
+ while (it.hasNext()) {
+ SensorToGroundMapping ssmit = it.next();
+ Assert.assertTrue(sensorToGroundMappingSize == ssmit.getMapping().size());
+ }
+ Assert.assertTrue(sensorToGroundMappingSize*2 == optimum.getResiduals().getDimension());
+ }
+
+ @Test
+ public void testNoParametersSelected() {
+ try {
+ RefiningParametersDriver.unselectRoll(rugged, sensorName);
+ RefiningParametersDriver.unselectPitch(rugged, sensorName);
+
+ AdjustmentContext adjustmentContext = new AdjustmentContext(Collections.singletonList(rugged), measurements);
+ final int maxIterations = 50;
+ final double convergenceThreshold = 1.e-11;
+
+ adjustmentContext.estimateFreeParameters(Collections.singletonList(rugged.getName()), maxIterations, convergenceThreshold);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.NO_PARAMETERS_SELECTED,re.getSpecifier());
+ }
+ }
+
+ @Test
+ public void testNoReferenceMapping() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ try {
+ final int maxIterations = 50;
+ final double convergenceThreshold = 1.e-11;
+
+ final List<LineSensor> selectedSensors = new ArrayList<LineSensor>();
+ selectedSensors.addAll(rugged.getLineSensors());
+
+ final GroundOptimizationProblemBuilder groundOptimizationProblem =
+ new GroundOptimizationProblemBuilder(selectedSensors, measurements, rugged);
+
+ Field sensorToGroundMapping = groundOptimizationProblem.getClass().getDeclaredField("sensorToGroundMappings");
+ sensorToGroundMapping.setAccessible(true);
+ sensorToGroundMapping.set(groundOptimizationProblem,new ArrayList<SensorToGroundMapping>());
+
+ groundOptimizationProblem.build(maxIterations, convergenceThreshold);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.NO_REFERENCE_MAPPINGS,re.getSpecifier());
+ }
+ }
+
+ @Test
+ public void testDefaultRuggedName(){
+
+ // Get the measurements as computed in other tests
+ Collection<SensorToGroundMapping> sensorToGroundMapping = measurements.getGroundMappings();
+ int nbModels = measurements.getNbModels();
+
+ // Recompute the measurements in another way ... but that must be the same after all
+ Observables measurementsNoName = refiningTest.generateNoisyPoints(lineSampling, pixelSampling, true);
+ Collection<SensorToGroundMapping> sensorToGroundMappingNoName = measurementsNoName.getGroundMappings();
+ int nbModelsWithWeight = measurementsNoName.getNbModels();
+
+ // Compare the two collections of measurements
+ Assert.assertEquals(nbModels, nbModelsWithWeight);
+
+ Assert.assertEquals(sensorToGroundMapping.size(), sensorToGroundMappingNoName.size());
+
+ // There is only one item
+ SensorToGroundMapping arraySensorToGroundMapping = (SensorToGroundMapping) sensorToGroundMapping.toArray()[0];
+ SensorToGroundMapping arraySensorToGroundMappingNoName = (SensorToGroundMapping) sensorToGroundMappingNoName.toArray()[0];
+
+
+ // Check if the two set are the same
+ Set<Entry<SensorPixel, GeodeticPoint>> mapping = arraySensorToGroundMapping.getMapping();
+ Set<Entry<SensorPixel, GeodeticPoint>> mappingNoName = arraySensorToGroundMappingNoName.getMapping();
+
+ Iterator<Entry<SensorPixel, GeodeticPoint>> itMapping = mapping.iterator();
+ while(itMapping.hasNext()) {
+ Entry<SensorPixel, GeodeticPoint> current = itMapping.next();
+ SensorPixel key = current.getKey();
+ GeodeticPoint value = current.getValue();
+
+ // Will search in mappingNoName if we can find the (key,value) found in mapping
+ Boolean found = false;
+ Iterator<Entry<SensorPixel, GeodeticPoint>> itMappingNoName = mappingNoName.iterator();
+ while(itMappingNoName.hasNext()) {
+ Entry<SensorPixel, GeodeticPoint> currentNoName = itMappingNoName.next();
+ SensorPixel keyNoName = currentNoName.getKey();
+ GeodeticPoint valueNoName = currentNoName.getValue();
+
+ // Comparison of each SensorPixel (for the key part and the value part)
+ if (TestUtils.sameSensorPixels(key, keyNoName, 1.e-3) &&
+ TestUtils.sameGeodeticPoints(value, valueNoName, 1.e-3)) {
+ // we found a match ...
+ found = true;
+ }
+ } // end iteration on mappingNoName
+
+ if (!found) { // the current (key,value) of the mapping was not found in the mappingNoName
+ Assert.assertTrue(found);
+ }
+ } // end on iteration on mapping
+
+ Assert.assertEquals(arraySensorToGroundMapping.getRuggedName(),arraySensorToGroundMappingNoName.getRuggedName());
+ Assert.assertEquals(arraySensorToGroundMapping.getSensorName(),arraySensorToGroundMappingNoName.getSensorName());;
+ }
+
+
+ @After
+ public void tearDown() {
+ measurements = null;
+ }
+
+ private InitGroundRefiningTest refiningTest;
+ private Observables measurements;
+ private Rugged rugged;
+ private String sensorName;
+ private int numberOfParameters;
+
+ private final int lineSampling = 1000;
+ private final int pixelSampling = 1000;
+}
diff --git a/src/test/java/org/orekit/rugged/adjustment/InterSensorOptimizationProblemBuilderTest.java b/src/test/java/org/orekit/rugged/adjustment/InterSensorOptimizationProblemBuilderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..e6f9d0e4fd6419a359c07efa01670428b5a32516
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/InterSensorOptimizationProblemBuilderTest.java
@@ -0,0 +1,349 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.adjustment;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer.Optimum;
+import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresProblem;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.orekit.rugged.TestUtils;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
+import org.orekit.rugged.adjustment.util.InitInterRefiningTest;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.SensorPixel;
+
+public class InterSensorOptimizationProblemBuilderTest {
+
+ @Before
+ public void setUp() {
+
+ try {
+ refiningTest = new InitInterRefiningTest();
+ refiningTest.initRefiningTest();
+
+ ruggedList = refiningTest.getRuggedList();
+
+ earthConstraintWeight = 0.1;
+
+ measurements = refiningTest.generateNoisyPoints(lineSampling, pixelSampling, earthConstraintWeight, false);
+ numberOfParameters = refiningTest.getParameterToAdjust();
+
+ } catch (RuggedException re) {
+ Assert.fail(re.getLocalizedMessage());
+ }
+ }
+
+ @Test
+ public void testEstimateFreeParameters() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ AdjustmentContext adjustmentContext = new AdjustmentContext(ruggedList, measurements);
+
+ List<String> ruggedNameList = new ArrayList<String>();
+ for(Rugged rugged : ruggedList) {
+ ruggedNameList.add(rugged.getName());
+ }
+ final int maxIterations = 100;
+ final double convergenceThreshold = 1.e-7;
+
+ Optimum optimum = adjustmentContext.estimateFreeParameters(ruggedNameList, maxIterations, convergenceThreshold);
+
+ Assert.assertTrue(optimum.getIterations() < maxIterations);
+
+ // The default optimizer is a Gauss Newton.
+ // For Gauss Newton, the number of evaluations is equal to the number of iterations
+ Assert.assertTrue(optimum.getEvaluations() == optimum.getIterations());
+
+ final double expectedMaxValue = 1.924769e-03;
+ Assert.assertEquals(expectedMaxValue, optimum.getResiduals().getMaxValue(), 1.0e-6);
+
+ final double expectedRMS = 0.069302;
+ Assert.assertEquals(expectedRMS, optimum.getRMS(), 1.0e-6);
+
+ final double expectedCost = 3.597082e+00;
+ Assert.assertEquals(expectedCost, optimum.getCost(), 1.0e-6);
+
+ Assert.assertTrue(numberOfParameters == optimum.getPoint().getDimension());
+
+ final int sensorToSensorMappingSize = 1347;
+ Collection<SensorToSensorMapping> ssm = measurements.getInterMappings();
+ Iterator<SensorToSensorMapping> it = ssm.iterator();
+ while (it.hasNext()) {
+ SensorToSensorMapping ssmit = it.next();
+ Assert.assertTrue(sensorToSensorMappingSize == ssmit.getMapping().size());
+ }
+ Assert.assertTrue(sensorToSensorMappingSize*2 == optimum.getResiduals().getDimension());
+
+ }
+
+ @Test
+ public void testEarthConstraintPostponed() {
+
+ // Get the measurements as computed in other tests
+ Collection<SensorToSensorMapping> sensorToSensorMapping = measurements.getInterMappings();
+ int nbModels = measurements.getNbModels();
+
+ // Recompute the measurements in another way ... but that must be the same after all
+ Observables measurementsPostponed = refiningTest.generateNoisyPoints(lineSampling, pixelSampling, earthConstraintWeight, true);
+ Collection<SensorToSensorMapping> sensorToSensorMappingPostponed = measurementsPostponed.getInterMappings();
+ int nbModelsPostponed = measurementsPostponed.getNbModels();
+
+ // Compare the two collections of measurements
+ Assert.assertEquals(nbModels, nbModelsPostponed);
+
+ Assert.assertEquals(sensorToSensorMapping.size(), sensorToSensorMappingPostponed.size());
+
+ // There is only one item
+ SensorToSensorMapping arraySensorToSensorMapping = (SensorToSensorMapping) sensorToSensorMapping.toArray()[0];
+ SensorToSensorMapping arraySensorToSensorMappingPostponed = (SensorToSensorMapping) sensorToSensorMappingPostponed.toArray()[0];
+
+ List<Double> listBody = arraySensorToSensorMapping.getBodyDistances();
+
+ // Convert List<Double> to double[]
+ double[] arrayBody = listBody.stream().mapToDouble(Double::doubleValue).toArray(); //via method reference
+ // Explanations:
+ // get the Stream<Double> from the list
+ // map each double instance to its primitive value, resulting in a DoubleStream
+ // call toArray() to get the array.
+ // Other method: double[] arrayBody = listBody.stream().mapToDouble(d -> d).toArray(); //identity function, Java unboxes automatically to get the double value
+
+ List<Double> listBodyPostponed = arraySensorToSensorMappingPostponed.getBodyDistances();
+ double[] arrayBodyPostponed = listBodyPostponed.stream().mapToDouble(Double::doubleValue).toArray();
+
+ Assert.assertEquals(listBody.size(), listBodyPostponed.size());
+ Assert.assertArrayEquals(arrayBody, arrayBodyPostponed, 1.e-3);
+
+ List<Double> listLos = arraySensorToSensorMapping.getLosDistances();
+ double[] arrayLos = listLos.stream().mapToDouble(Double::doubleValue).toArray();
+ List<Double> listLosPostponed = arraySensorToSensorMappingPostponed.getLosDistances();
+ double[] arrayLosPostponed = listLosPostponed.stream().mapToDouble(Double::doubleValue).toArray();
+
+ Assert.assertEquals(listLos.size(), listLosPostponed.size());
+ Assert.assertArrayEquals(arrayLos, arrayLosPostponed, 1.e-6);
+
+ // Check if the two set are the same
+ Set<Entry<SensorPixel, SensorPixel>> mapping = arraySensorToSensorMapping.getMapping();
+ Set<Entry<SensorPixel, SensorPixel>> mappingPostponed = arraySensorToSensorMappingPostponed.getMapping();
+
+ Iterator<Entry<SensorPixel, SensorPixel>> itMapping = mapping.iterator();
+ while(itMapping.hasNext()) {
+ Entry<SensorPixel, SensorPixel> current = itMapping.next();
+ SensorPixel key = current.getKey();
+ SensorPixel value = current.getValue();
+
+ // Will search in mappingPostponed if we can find the (key,value) found in mapping
+ Boolean found = false;
+ Iterator<Entry<SensorPixel, SensorPixel>> itMappingPost = mappingPostponed.iterator();
+ while(itMappingPost.hasNext()) {
+ Entry<SensorPixel, SensorPixel> currentPost = itMappingPost.next();
+ SensorPixel keyPost = currentPost.getKey();
+ SensorPixel valuePost = currentPost.getValue();
+
+ // Comparison of each SensorPixel (for the key part and the value part)
+ if (TestUtils.sameSensorPixels(key, keyPost, 1.e-3) &&
+ TestUtils.sameSensorPixels(value, valuePost, 1.e-3)) {
+ // we found a match ...
+ found = true;
+ }
+ } // end iteration on mappingPostponed
+
+ if (!found) { // the current (key,value) of the mapping was not found in the mappingPostponed
+ Assert.assertTrue(found);
+ }
+ } // end on iteration on mapping
+
+ Assert.assertEquals(arraySensorToSensorMapping.getRuggedNameA(),arraySensorToSensorMappingPostponed.getRuggedNameA());
+ Assert.assertEquals(arraySensorToSensorMapping.getRuggedNameB(),arraySensorToSensorMappingPostponed.getRuggedNameB());;
+ Assert.assertEquals(arraySensorToSensorMapping.getSensorNameA(),arraySensorToSensorMappingPostponed.getSensorNameA());;
+ Assert.assertEquals(arraySensorToSensorMapping.getSensorNameB(),arraySensorToSensorMappingPostponed.getSensorNameB());
+ }
+
+ @Test
+ public void testDefaultRuggedNames() {
+
+ // In that case there are no body distance set at construction
+
+ // Generate intermapping with simple constructor of SensorToSensorMapping with Earth Constraint Weight given at construction
+ Observables measurementsWithWeight = refiningTest.generateSimpleInterMapping(lineSampling, pixelSampling, earthConstraintWeight, false);
+ Collection<SensorToSensorMapping> sensorToSensorMappingWithWeight = measurementsWithWeight.getInterMappings();
+ int nbModelsWithWeight = measurementsWithWeight.getNbModels();
+
+ // Generate intermapping with simple constructor of SensorToSensorMapping with Earth Constraint Weight given after construction
+ Observables measurementsWithoutWeight = refiningTest.generateSimpleInterMapping(lineSampling, pixelSampling, earthConstraintWeight, true);
+ Collection<SensorToSensorMapping> sensorToSensorMappingPostponed = measurementsWithoutWeight.getInterMappings();
+ int nbModelsPostponed = measurementsWithoutWeight.getNbModels();
+
+ // Compare the two collections of measurements
+ Assert.assertEquals(nbModelsWithWeight, nbModelsPostponed);
+
+ Assert.assertEquals(sensorToSensorMappingWithWeight.size(), sensorToSensorMappingPostponed.size());
+
+ // There is only one item
+ SensorToSensorMapping arraySensorToSensorMappingWithWeight = (SensorToSensorMapping) sensorToSensorMappingWithWeight.toArray()[0];
+ SensorToSensorMapping arraySensorToSensorMappingPostponed = (SensorToSensorMapping) sensorToSensorMappingPostponed.toArray()[0];
+
+
+ List<Double> listLosWithWeight = arraySensorToSensorMappingWithWeight.getLosDistances();
+ double[] arrayLosWithWeight = listLosWithWeight.stream().mapToDouble(Double::doubleValue).toArray();
+ List<Double> listLosPostponed = arraySensorToSensorMappingPostponed.getLosDistances();
+ double[] arrayLosPostponed = listLosPostponed.stream().mapToDouble(Double::doubleValue).toArray();
+
+ Assert.assertEquals(listLosWithWeight.size(), listLosPostponed.size());
+ Assert.assertArrayEquals(arrayLosWithWeight, arrayLosPostponed, 1.e-6);
+
+ // Check if the two set are the same
+ Set<Entry<SensorPixel, SensorPixel>> mappingWithWeight = arraySensorToSensorMappingWithWeight.getMapping();
+ Set<Entry<SensorPixel, SensorPixel>> mappingPostponed = arraySensorToSensorMappingPostponed.getMapping();
+
+ Iterator<Entry<SensorPixel, SensorPixel>> itMapping = mappingWithWeight.iterator();
+ while(itMapping.hasNext()) {
+ Entry<SensorPixel, SensorPixel> current = itMapping.next();
+ SensorPixel key = current.getKey();
+ SensorPixel value = current.getValue();
+
+ // Will search in mappingPostponed if we can find the (key,value) found in mapping
+ Boolean found = false;
+ Iterator<Entry<SensorPixel, SensorPixel>> itMappingPost = mappingPostponed.iterator();
+ while(itMappingPost.hasNext()) {
+ Entry<SensorPixel, SensorPixel> currentPost = itMappingPost.next();
+ SensorPixel keyPost = currentPost.getKey();
+ SensorPixel valuePost = currentPost.getValue();
+
+ // Comparison of each SensorPixel (for the key part and the value part)
+ if (TestUtils.sameSensorPixels(key, keyPost, 1.e-3) &&
+ TestUtils.sameSensorPixels(value, valuePost, 1.e-3)) {
+ // we found a match ...
+ found = true;
+ }
+ } // end iteration on mappingPostponed
+
+ if (!found) { // the current (key,value) of the mapping was not found in the mappingPostponed
+ Assert.assertTrue(found);
+ }
+ } // end on iteration on mapping
+
+ Assert.assertEquals(arraySensorToSensorMappingWithWeight.getRuggedNameA(),arraySensorToSensorMappingPostponed.getRuggedNameA());
+ Assert.assertEquals(arraySensorToSensorMappingWithWeight.getRuggedNameB(),arraySensorToSensorMappingPostponed.getRuggedNameB());;
+ Assert.assertEquals(arraySensorToSensorMappingWithWeight.getSensorNameA(),arraySensorToSensorMappingPostponed.getSensorNameA());;
+ Assert.assertEquals(arraySensorToSensorMappingWithWeight.getSensorNameB(),arraySensorToSensorMappingPostponed.getSensorNameB());
+ }
+
+ @Test
+ public void testNoReferenceMapping() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ try {
+ final int maxIterations = 120;
+ final double convergenceThreshold = 1.e-7;
+
+ final List<LineSensor> selectedSensors = new ArrayList<LineSensor>();
+ for (Rugged rugged : ruggedList) {
+ selectedSensors.addAll(rugged.getLineSensors());
+ }
+ final InterSensorsOptimizationProblemBuilder interSensorsOptimizationProblem =
+ new InterSensorsOptimizationProblemBuilder(selectedSensors, measurements, ruggedList);
+
+ Field sensorToSensorMapping = interSensorsOptimizationProblem.getClass().getDeclaredField("sensorToSensorMappings");
+ sensorToSensorMapping.setAccessible(true);
+ sensorToSensorMapping.set(interSensorsOptimizationProblem,new ArrayList<SensorToSensorMapping>());
+
+ interSensorsOptimizationProblem.build(maxIterations, convergenceThreshold);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.NO_REFERENCE_MAPPINGS,re.getSpecifier());
+ }
+ }
+
+ @Test
+ public void testInvalidRuggedNames() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ final int maxIterations = 120;
+ final double convergenceThreshold = 1.e-7;
+
+ final List<LineSensor> selectedSensors = new ArrayList<LineSensor>();
+ for (Rugged rugged : ruggedList) {
+ selectedSensors.addAll(rugged.getLineSensors());
+ }
+ final InterSensorsOptimizationProblemBuilder interSensorsOptimizationProblem =
+ new InterSensorsOptimizationProblemBuilder(selectedSensors, measurements, ruggedList);
+
+ Field ruggedMapField = interSensorsOptimizationProblem.getClass().getDeclaredField("ruggedMap");
+ ruggedMapField.setAccessible(true);
+ @SuppressWarnings("unchecked")
+ Map<String,Rugged> ruggedMap = (Map<String,Rugged>) ruggedMapField.get(interSensorsOptimizationProblem);
+
+ // Set first RuggedB to null to get the right exception ...
+ try {
+ ruggedMap.put("RuggedB",null);
+
+ ruggedMapField.set(interSensorsOptimizationProblem,ruggedMap);
+
+ final LeastSquareAdjuster adjuster = new LeastSquareAdjuster(OptimizerId.GAUSS_NEWTON_QR);
+ LeastSquaresProblem theProblem = interSensorsOptimizationProblem.build(maxIterations, convergenceThreshold);
+ adjuster.optimize(theProblem);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.INVALID_RUGGED_NAME,re.getSpecifier());
+ }
+
+ // Then set RuggedA to null to get the right exception ...
+ try {
+ ruggedMap.put("RuggedA",null);
+
+ ruggedMapField.set(interSensorsOptimizationProblem,ruggedMap);
+
+ final LeastSquareAdjuster adjuster = new LeastSquareAdjuster(OptimizerId.GAUSS_NEWTON_QR);
+ LeastSquaresProblem theProblem = interSensorsOptimizationProblem.build(maxIterations, convergenceThreshold);
+ adjuster.optimize(theProblem);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.INVALID_RUGGED_NAME,re.getSpecifier());
+ }
+ }
+
+
+ @After
+ public void tearDown() {
+ measurements = null;
+ ruggedList = null;
+ }
+
+ private InitInterRefiningTest refiningTest;
+ private Observables measurements;
+ private List<Rugged> ruggedList;
+ private int numberOfParameters;
+ private double earthConstraintWeight;
+
+ private final int lineSampling = 1000;
+ private final int pixelSampling = 1000;
+}
diff --git a/src/test/java/org/orekit/rugged/adjustment/LeastSquareAdjusterTest.java b/src/test/java/org/orekit/rugged/adjustment/LeastSquareAdjusterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f2cc09745719868452727f75e799d8e8d7eda07b
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/LeastSquareAdjusterTest.java
@@ -0,0 +1,27 @@
+package org.orekit.rugged.adjustment;
+
+import org.junit.Assert;
+
+import java.lang.reflect.Field;
+
+import org.junit.Test;
+
+public class LeastSquareAdjusterTest {
+
+ @Test
+ public void testLeastSquareAdjuster() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+
+ final LeastSquareAdjuster adjusterWithOptimizer = new LeastSquareAdjuster(OptimizerId.GAUSS_NEWTON_QR);
+ final LeastSquareAdjuster adjusterWithDefaultOptimizer = new LeastSquareAdjuster();
+
+ Field optimizerIdWithOptimizer = adjusterWithOptimizer.getClass().getDeclaredField("optimizerID");
+ optimizerIdWithOptimizer.setAccessible(true);
+ OptimizerId getOptimizerIdWithOptimizer = (OptimizerId) optimizerIdWithOptimizer.get(adjusterWithOptimizer);
+
+ Field optimizerIdWithDefaultOptimizer = adjusterWithDefaultOptimizer.getClass().getDeclaredField("optimizerID");
+ optimizerIdWithDefaultOptimizer.setAccessible(true);
+ OptimizerId getOptimizerIdWithDefaultOptimizer = (OptimizerId) optimizerIdWithDefaultOptimizer.get(adjusterWithDefaultOptimizer);
+
+ Assert.assertTrue(getOptimizerIdWithDefaultOptimizer == getOptimizerIdWithOptimizer);
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java b/src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ce0739a6403b752c939c8f6bb10f313c3b39751d
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/util/InitGroundRefiningTest.java
@@ -0,0 +1,256 @@
+package org.orekit.rugged.adjustment.util;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.random.GaussianRandomGenerator;
+import org.hipparchus.random.UncorrelatedRandomVectorGenerator;
+import org.hipparchus.random.Well19937a;
+import org.hipparchus.util.FastMath;
+import org.junit.Assert;
+import org.orekit.bodies.BodyShape;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DirectoryCrawler;
+import org.orekit.errors.OrekitException;
+import org.orekit.orbits.Orbit;
+import org.orekit.rugged.TestUtils;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
+import org.orekit.rugged.api.AlgorithmId;
+import org.orekit.rugged.api.BodyRotatingFrameId;
+import org.orekit.rugged.api.EllipsoidId;
+import org.orekit.rugged.api.InertialFrameId;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.api.RuggedBuilder;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.SensorPixel;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.utils.AngularDerivativesFilter;
+import org.orekit.utils.CartesianDerivativesFilter;
+import org.orekit.utils.Constants;
+import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.utils.TimeStampedPVCoordinates;
+
+
+/** Initialization for ground refining (Ground Control Points GCP study) Junit tests.
+ * @author Guylaine Prat
+ */
+public class InitGroundRefiningTest {
+
+ /** Pleiades viewing model */
+ private PleiadesViewingModel pleiadesViewingModel;
+
+ /** Line sensor */
+ private LineSensor lineSensor;
+
+ /** Rugged's instance */
+ private Rugged rugged;
+
+ /** Number of parameters to adjust */
+ private int parameterToAdjust;
+
+ // Part of the name of parameter drivers
+ static final String rollSuffix = "_roll";
+ static final String pitchSuffix = "_pitch";
+ static final String factorName = "factor";
+
+ // Default values for disruption to apply to roll (deg), pitch (deg) and factor
+ static final double defaultRollDisruption = 0.004;
+ static final double defaultPitchDisruption = 0.0008;
+ static final double defaultFactorDisruption = 1.000000001;
+
+ /**
+ * Initialize ground refining tests with default values for disruptions on sensors characteristics
+ */
+ public void initGroundRefiningTest() {
+
+ initGroundRefiningTest(defaultRollDisruption, defaultPitchDisruption, defaultFactorDisruption);
+ }
+
+ /** Initialize ground refining tests with disruption on sensors characteristics
+ * @param rollDisruption disruption to apply to roll angle for sensor (deg)
+ * @param pitchDisruption disruption to apply to pitch angle for sensor (deg)
+ * @param factorDisruption disruption to apply to homothety factor for sensor
+ */
+ public void initGroundRefiningTest(double rollDisruption, double pitchDisruption, double factorDisruption) {
+ try {
+
+ String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+
+ // Initialize refining context
+ // ---------------------------
+ final String sensorName = "line";
+ final double incidenceAngle = -5.0;
+ final String date = "2016-01-01T11:59:50.0";
+ this.pleiadesViewingModel = new PleiadesViewingModel(sensorName, incidenceAngle, date);
+
+
+ PleiadesOrbitModel orbitmodel = new PleiadesOrbitModel();
+
+ // Sensor's definition: creation of Pleiades viewing model
+ // --------------------------------------------------------
+
+ // Create Pleiades Viewing Model
+ final AbsoluteDate minDate = pleiadesViewingModel.getMinDate();
+ final AbsoluteDate maxDate = pleiadesViewingModel.getMaxDate();
+ final AbsoluteDate refDate = pleiadesViewingModel.getDatationReference();
+ this.lineSensor = pleiadesViewingModel.getLineSensor();
+
+ // ----Satellite position, velocity and attitude: create orbit model
+ BodyShape earth = TestUtils.createEarth();
+ Orbit orbit = orbitmodel.createOrbit(Constants.EIGEN5C_EARTH_MU, refDate);
+
+ // ----If no LOF Transform Attitude Provider is Nadir Pointing Yaw Compensation
+ final double [] rollPoly = {0.0,0.0,0.0};
+ final double[] pitchPoly = {0.025,0.0};
+ final double[] yawPoly = {0.0,0.0,0.0};
+ orbitmodel.setLOFTransform(rollPoly, pitchPoly, yawPoly, minDate);
+
+ // ----Satellite attitude
+ List<TimeStampedAngularCoordinates> satelliteQList = orbitmodel.orbitToQ(orbit, earth, minDate.shiftedBy(-0.0), maxDate.shiftedBy(+0.0), 0.25);
+ final int nbQPoints = 2;
+
+ // ----Position and velocities
+ List<TimeStampedPVCoordinates> satellitePVListA = orbitmodel.orbitToPV(orbit, earth, minDate.shiftedBy(-0.0), maxDate.shiftedBy(+0.0), 0.25);
+ final int nbPVPoints = 8;
+
+ // Rugged initialization
+ // ---------------------
+ RuggedBuilder ruggedBuilder = new RuggedBuilder();
+
+ ruggedBuilder.addLineSensor(lineSensor);
+ ruggedBuilder.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+ ruggedBuilder.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
+ ruggedBuilder.setTimeSpan(minDate,maxDate, 0.001, 5.0);
+ ruggedBuilder.setTrajectory(InertialFrameId.EME2000, satellitePVListA, nbPVPoints,
+ CartesianDerivativesFilter.USE_PV, satelliteQList,
+ nbQPoints, AngularDerivativesFilter.USE_R);
+ ruggedBuilder.setLightTimeCorrection(false);
+ ruggedBuilder.setAberrationOfLightCorrection(false);
+
+ ruggedBuilder.setName("Rugged");
+
+ this.rugged = ruggedBuilder.build();
+
+
+ // Select parameters to adjust
+ // ---------------------------
+ RefiningParametersDriver.setSelectedRoll(rugged, sensorName);
+ RefiningParametersDriver.setSelectedPitch(rugged, sensorName);
+
+ this.parameterToAdjust = 2;
+
+ // Initialize disruptions:
+ // -----------------------
+ // introduce rotations around instrument axes (roll and pitch angles, scale factor)
+
+ // apply disruptions on physical model
+ RefiningParametersDriver.applyDisruptionsRoll(rugged, sensorName, FastMath.toRadians(rollDisruption));
+ RefiningParametersDriver.applyDisruptionsPitch(rugged, sensorName, FastMath.toRadians(pitchDisruption));
+ RefiningParametersDriver.applyDisruptionsFactor(rugged, sensorName, factorDisruption);
+
+
+ } catch (OrekitException oe) {
+ Assert.fail(oe.getLocalizedMessage());
+ } catch (URISyntaxException use) {
+ Assert.fail(use.getLocalizedMessage());
+ }
+ }
+
+ /**
+ * Get the Rugged instance
+ * @return rugged instance
+ */
+ public Rugged getRugged(){
+
+ return this.rugged;
+ }
+
+ /** Generate noisy measurements (sensor to ground mapping)
+ * @param lineSampling line sampling
+ * @param pixelSampling pixel sampling
+ * @param flag to tell if the Rugged name used is the default one (true) or not (false)
+ */
+ public Observables generateNoisyPoints(final int lineSampling, final int pixelSampling, boolean defaultRuggedName) {
+
+ // Generate reference mapping
+ SensorToGroundMapping groundMapping;
+ if (!defaultRuggedName) {
+ groundMapping = new SensorToGroundMapping(rugged.getName(), lineSensor.getName());
+ } else {
+ // The rugged name used in this test is the same as the dafult one in SensorToGroundMapping
+ groundMapping = new SensorToGroundMapping(lineSensor.getName());
+ }
+
+ // Observable which contains sensor to ground mapping (one model)
+ Observables observable = new Observables(1);
+
+ // Estimate latitude and longitude errors (rad)
+ final int pixelMiddle= lineSensor.getNbPixels() / 2;
+ final int lineMiddle = (int) FastMath.floor(pixelMiddle);
+
+ final AbsoluteDate dateMiddle = lineSensor.getDate(lineMiddle);
+ final GeodeticPoint gp_pix0 = rugged.directLocation(dateMiddle, lineSensor.getPosition(), lineSensor.getLOS(dateMiddle, pixelMiddle));
+
+ final AbsoluteDate date1 = lineSensor.getDate(lineMiddle + 1);
+ final GeodeticPoint gp_pix1 = rugged.directLocation(date1, lineSensor.getPosition(), lineSensor.getLOS(date1, pixelMiddle + 1));
+
+ final double latitudeErr = FastMath.abs(gp_pix0.getLatitude() - gp_pix1.getLatitude());
+ final double longitudeErr = FastMath.abs(gp_pix0.getLongitude() - gp_pix1.getLongitude());
+
+ // Generation noisy measurements
+ // distribution: gaussian(0), vector dimension: 3 (for latitude, longitude and altitude)
+ // Mean latitude, longitude and altitude
+ final double[] mean = {5.0,5.0,5.0};
+ // Standard deviation latitude, longitude and altitude
+ final double[] std = {0.1,0.1,0.1};
+
+ final double latErrorMean = mean[0] * latitudeErr;
+ final double lonErrorMean = mean[1] * longitudeErr;
+ final double latErrorStd = std[0] * latitudeErr;
+ final double lonErrorStd = std[1] * longitudeErr;
+
+ // Gaussian random generator
+ // Build a null mean random uncorrelated vector generator with standard deviation corresponding to the estimated error on ground
+ final double meanGenerator[] = {latErrorMean, lonErrorMean, mean[2]};
+ final double stdGenerator[] = {latErrorStd, lonErrorStd, std[2]};
+
+ // seed has been fixed for tests purpose
+ final GaussianRandomGenerator rng = new GaussianRandomGenerator(new Well19937a(0xefac03d9be4d24b9l));
+ final UncorrelatedRandomVectorGenerator rvg = new UncorrelatedRandomVectorGenerator(meanGenerator, stdGenerator, rng);
+
+ for (double line = 0; line < pleiadesViewingModel.getDimension(); line += lineSampling) {
+
+ final AbsoluteDate date = lineSensor.getDate(line);
+ for (int pixel = 0; pixel < lineSensor.getNbPixels(); pixel += pixelSampling) {
+
+ // Components of generated vector follow (independent) Gaussian distribution
+ final Vector3D vecRandom = new Vector3D(rvg.nextVector());
+
+ final GeodeticPoint gp2 = rugged.directLocation(date, lineSensor.getPosition(),
+ lineSensor.getLOS(date, pixel));
+
+ final GeodeticPoint gpNoisy = new GeodeticPoint(gp2.getLatitude() + vecRandom.getX(),
+ gp2.getLongitude() + vecRandom.getY(),
+ gp2.getAltitude() + vecRandom.getZ());
+
+ groundMapping.addMapping(new SensorPixel(line, pixel), gpNoisy);
+ }
+ }
+
+ observable.addGroundMapping(groundMapping);
+ return observable;
+ }
+
+ /** Get the number of parameters to adjust
+ * @return number of parameters to adjust
+ */
+ public int getParameterToAdjust() {
+ return parameterToAdjust;
+ }
+
+}
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java b/src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ecb5679fbd4889df6b4c5a5388bdae216bca04f5
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/util/InitInterRefiningTest.java
@@ -0,0 +1,543 @@
+package org.orekit.rugged.adjustment.util;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.random.GaussianRandomGenerator;
+import org.hipparchus.random.UncorrelatedRandomVectorGenerator;
+import org.hipparchus.random.Well19937a;
+import org.hipparchus.util.FastMath;
+import org.junit.After;
+import org.junit.Assert;
+import org.orekit.bodies.BodyShape;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DirectoryCrawler;
+import org.orekit.errors.OrekitException;
+import org.orekit.orbits.Orbit;
+import org.orekit.rugged.TestUtils;
+import org.orekit.rugged.adjustment.InterSensorsOptimizationProblemBuilder;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
+import org.orekit.rugged.api.AlgorithmId;
+import org.orekit.rugged.api.BodyRotatingFrameId;
+import org.orekit.rugged.api.EllipsoidId;
+import org.orekit.rugged.api.InertialFrameId;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.api.RuggedBuilder;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.SensorPixel;
+import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.rugged.utils.SpacecraftToObservedBody;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.utils.AngularDerivativesFilter;
+import org.orekit.utils.CartesianDerivativesFilter;
+import org.orekit.utils.Constants;
+import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.utils.TimeStampedPVCoordinates;
+
+
+
+
+/** Initialization for inter sensor refining Junit tests.
+ * @author Guylaine Prat
+ */
+public class InitInterRefiningTest {
+
+ /** Pleiades viewing model A */
+ private PleiadesViewingModel pleiadesViewingModelA;
+
+ /** Pleiades viewing model B */
+ private PleiadesViewingModel pleiadesViewingModelB;
+
+ /** Line sensor A */
+ private LineSensor lineSensorA;
+
+ /** Line sensor B */
+ private LineSensor lineSensorB;
+
+ /** RuggedA's instance */
+ private Rugged ruggedA;
+
+ /** RuggedB's instance */
+ private Rugged ruggedB;
+
+ /** Number of parameters to adjust */
+ private int parameterToAdjust;
+
+ // Part of the name of parameter drivers
+ static final String rollSuffix = "_roll";
+ static final String pitchSuffix = "_pitch";
+ static final String factorName = "factor";
+
+ // Default values for disruption to apply to roll (deg), pitch (deg) and factor
+ static final double defaultRollDisruptionA = 0.004;
+ static final double defaultPitchDisruptionA = 0.0008;
+ static final double defaultFactorDisruptionA = 1.000000001;
+ static final double defaultRollDisruptionB = -0.004;
+ static final double defaultPitchDisruptionB = 0.0008;
+
+ /**
+ * Initialize refining tests with default values for disruptions on sensors characteristics
+ */
+ public void initRefiningTest() {
+
+ initRefiningTest(defaultRollDisruptionA, defaultPitchDisruptionA, defaultFactorDisruptionA,
+ defaultRollDisruptionB, defaultPitchDisruptionB);
+ }
+
+ /** Initialize refining tests with disruption on sensors characteristics
+ * @param rollDisruptionA disruption to apply to roll angle for sensor A (deg)
+ * @param pitchDisruptionA disruption to apply to pitch angle for sensor A (deg)
+ * @param factorDisruptionA disruption to apply to homothety factor for sensor A
+ * @param rollDisruptionB disruption to apply to roll angle for sensor B (deg)
+ * @param pitchDisruptionB disruption to apply to pitch angle for sensor B (deg)
+ */
+ public void initRefiningTest(double rollDisruptionA, double pitchDisruptionA, double factorDisruptionA,
+ double rollDisruptionB, double pitchDisruptionB) {
+ try {
+
+ String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+
+ // Initialize refining context
+ // ---------------------------
+ final String sensorNameA = "SensorA";
+ final double incidenceAngleA = -5.0;
+ final String dateA = "2016-01-01T11:59:50.0";
+ this.pleiadesViewingModelA = new PleiadesViewingModel(sensorNameA, incidenceAngleA, dateA);
+
+ final String sensorNameB = "SensorB";
+ final double incidenceAngleB = 0.0;
+ final String dateB = "2016-01-01T12:02:50.0";
+ this.pleiadesViewingModelB = new PleiadesViewingModel(sensorNameB, incidenceAngleB, dateB);
+
+ PleiadesOrbitModel orbitmodelA = new PleiadesOrbitModel();
+ PleiadesOrbitModel orbitmodelB = new PleiadesOrbitModel();
+
+ // Sensors's definition: creation of 2 Pleiades viewing models
+ // -----------------------------------------------------------
+
+ // 1/- Create First Pleiades Viewing Model A
+ final AbsoluteDate minDateA = pleiadesViewingModelA.getMinDate();
+ final AbsoluteDate maxDateA = pleiadesViewingModelA.getMaxDate();
+ final AbsoluteDate refDateA = pleiadesViewingModelA.getDatationReference();
+ this.lineSensorA = pleiadesViewingModelA.getLineSensor();
+
+ // ----Satellite position, velocity and attitude: create orbit model A
+ BodyShape earthA = TestUtils.createEarth();
+ Orbit orbitA = orbitmodelA.createOrbit(Constants.EIGEN5C_EARTH_MU, refDateA);
+
+ // ----If no LOF Transform Attitude Provider is Nadir Pointing Yaw Compensation
+ final double [] rollPoly = {0.0,0.0,0.0};
+ final double[] pitchPoly = {0.025,0.0};
+ final double[] yawPoly = {0.0,0.0,0.0};
+ orbitmodelA.setLOFTransform(rollPoly, pitchPoly, yawPoly, minDateA);
+
+ // ----Satellite attitude
+ List<TimeStampedAngularCoordinates> satelliteQListA = orbitmodelA.orbitToQ(orbitA, earthA, minDateA.shiftedBy(-0.0), maxDateA.shiftedBy(+0.0), 0.25);
+ final int nbQPoints = 2;
+
+ // ----Position and velocities
+ List<TimeStampedPVCoordinates> satellitePVListA = orbitmodelA.orbitToPV(orbitA, earthA, minDateA.shiftedBy(-0.0), maxDateA.shiftedBy(+0.0), 0.25);
+ final int nbPVPoints = 8;
+
+ // Rugged A initialization
+ // ---------------------
+ RuggedBuilder ruggedBuilderA = new RuggedBuilder();
+
+ ruggedBuilderA.addLineSensor(lineSensorA);
+ ruggedBuilderA.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+ ruggedBuilderA.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
+ ruggedBuilderA.setTimeSpan(minDateA,maxDateA, 0.001, 5.0);
+ ruggedBuilderA.setTrajectory(InertialFrameId.EME2000, satellitePVListA, nbPVPoints,
+ CartesianDerivativesFilter.USE_PV, satelliteQListA,
+ nbQPoints, AngularDerivativesFilter.USE_R);
+ ruggedBuilderA.setLightTimeCorrection(false);
+ ruggedBuilderA.setAberrationOfLightCorrection(false);
+
+ ruggedBuilderA.setName("RuggedA");
+
+ this.ruggedA = ruggedBuilderA.build();
+
+
+ // 2/- Create Second Pleiades Viewing Model
+ final AbsoluteDate minDateB = pleiadesViewingModelB.getMinDate();
+ final AbsoluteDate maxDateB = pleiadesViewingModelB.getMaxDate();
+ final AbsoluteDate refDateB = pleiadesViewingModelB.getDatationReference();
+ this.lineSensorB = pleiadesViewingModelB.getLineSensor();
+
+ // ----Satellite position, velocity and attitude: create orbit model B
+ BodyShape earthB = TestUtils.createEarth();
+ Orbit orbitB = orbitmodelB.createOrbit(Constants.EIGEN5C_EARTH_MU, refDateB);
+
+ // ----Satellite attitude
+ List<TimeStampedAngularCoordinates> satelliteQListB = orbitmodelB.orbitToQ(orbitB, earthB, minDateB.shiftedBy(-0.0), maxDateB.shiftedBy(+0.0), 0.25);
+
+ // ----Position and velocities
+ List<TimeStampedPVCoordinates> satellitePVListB = orbitmodelB.orbitToPV(orbitB, earthB, minDateB.shiftedBy(-0.0), maxDateB.shiftedBy(+0.0), 0.25);
+
+ // Rugged B initialization
+ // ---------------------
+ RuggedBuilder ruggedBuilderB = new RuggedBuilder();
+
+ ruggedBuilderB.addLineSensor(lineSensorB);
+ ruggedBuilderB.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
+ ruggedBuilderB.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
+ ruggedBuilderB.setTimeSpan(minDateB,maxDateB, 0.001, 5.0);
+ ruggedBuilderB.setTrajectory(InertialFrameId.EME2000, satellitePVListB, nbPVPoints,
+ CartesianDerivativesFilter.USE_PV, satelliteQListB,
+ nbQPoints, AngularDerivativesFilter.USE_R);
+ ruggedBuilderB.setLightTimeCorrection(false);
+ ruggedBuilderB.setAberrationOfLightCorrection(false);
+
+ ruggedBuilderB.setName("RuggedB");
+
+ this.ruggedB = ruggedBuilderB.build();
+
+
+ // Select parameters to adjust
+ // ---------------------------
+ RefiningParametersDriver.setSelectedRoll(ruggedA, sensorNameA);
+ RefiningParametersDriver.setSelectedPitch(ruggedA, sensorNameA);
+
+ RefiningParametersDriver.setSelectedRoll(ruggedB, sensorNameB);
+ RefiningParametersDriver.setSelectedPitch(ruggedB, sensorNameB);
+
+ this.parameterToAdjust = 4;
+
+ // Initialize disruptions:
+ // -----------------------
+ // introduce rotations around instrument axes (roll and pitch angles, scale factor)
+
+ // apply disruptions on physical model (acquisition A)
+ RefiningParametersDriver.applyDisruptionsRoll(ruggedA, sensorNameA, FastMath.toRadians(rollDisruptionA));
+ RefiningParametersDriver.applyDisruptionsPitch(ruggedA, sensorNameA, FastMath.toRadians(pitchDisruptionA));
+ RefiningParametersDriver.applyDisruptionsFactor(ruggedA, sensorNameA, factorDisruptionA);
+
+ // apply disruptions on physical model (acquisition B)
+ RefiningParametersDriver.applyDisruptionsRoll(ruggedB, sensorNameB, FastMath.toRadians(rollDisruptionB));
+ RefiningParametersDriver.applyDisruptionsPitch(ruggedB, sensorNameB, FastMath.toRadians(pitchDisruptionB));
+
+
+ } catch (OrekitException oe) {
+ Assert.fail(oe.getLocalizedMessage());
+ } catch (URISyntaxException use) {
+ Assert.fail(use.getLocalizedMessage());
+ }
+ }
+
+ /**
+ * Get the list of Rugged instances
+ * @return rugged instances as list
+ */
+ public List<Rugged> getRuggedList(){
+
+ List<Rugged> ruggedList = Arrays.asList(ruggedA, ruggedB);
+ return ruggedList;
+ }
+
+
+ /** Compute the distances between LOS of two real pixels (one from sensor A and one from sensor B)
+ * @param realPixelA real pixel from sensor A
+ * @param realPixelB real pixel from sensor B
+ * @return the distances of two real pixels computed between LOS and to the ground
+ */
+ public double[] computeDistancesBetweenLOS(final SensorPixel realPixelA, final SensorPixel realPixelB) {
+
+ final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
+
+ final AbsoluteDate realDateA = lineSensorA.getDate(realPixelA.getLineNumber());
+ final AbsoluteDate realDateB = lineSensorB.getDate(realPixelB.getLineNumber());
+
+ final double[] distanceLOSB = ruggedB.distanceBetweenLOS(
+ lineSensorA, realDateA, realPixelA.getPixelNumber(),
+ scToBodyA,
+ lineSensorB, realDateB, realPixelB.getPixelNumber());
+
+ return distanceLOSB;
+ }
+
+ /** Compute the distances with derivatives between LOS of two real pixels (one from sensor A and one from sensor B)
+ * @param realPixelA real pixel from sensor A
+ * @param realPixelB real pixel from sensor B
+ * @return the distances of two real pixels computed between LOS and to the ground
+ */
+ public DerivativeStructure[] computeDistancesBetweenLOSDerivatives(final SensorPixel realPixelA, final SensorPixel realPixelB,
+ double losDistance, double earthDistance)
+ throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+
+ final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
+
+ final AbsoluteDate realDateA = lineSensorA.getDate(realPixelA.getLineNumber());
+ final AbsoluteDate realDateB = lineSensorB.getDate(realPixelB.getLineNumber());
+
+ final List<LineSensor> sensors = new ArrayList<LineSensor>();
+ sensors.addAll(ruggedA.getLineSensors());
+ sensors.addAll(ruggedB.getLineSensors());
+
+ final List<Rugged> ruggedList = new ArrayList<Rugged>();
+ ruggedList.add(ruggedA);
+ ruggedList.add(ruggedB);
+
+ // prepare generator
+ final Observables measurements = new Observables(2);
+ SensorToSensorMapping interMapping = new SensorToSensorMapping(lineSensorA.getName(), ruggedA.getName(), lineSensorB.getName(), ruggedB.getName());
+ interMapping.addMapping(realPixelA, realPixelB, losDistance, earthDistance);
+ measurements.addInterMapping(interMapping);
+
+
+ InterSensorsOptimizationProblemBuilder optimizationPbBuilder = new InterSensorsOptimizationProblemBuilder(sensors, measurements, ruggedList);
+ java.lang.reflect.Method createGenerator = InterSensorsOptimizationProblemBuilder.class.getSuperclass().getDeclaredMethod("createGenerator", List.class);
+ createGenerator.setAccessible(true);
+
+ List<LineSensor> listLineSensor = new ArrayList<LineSensor>();
+ listLineSensor.addAll(ruggedA.getLineSensors());
+ listLineSensor.addAll(ruggedB.getLineSensors());
+
+ DSGenerator generator = (DSGenerator) createGenerator.invoke(optimizationPbBuilder, listLineSensor);
+
+ final DerivativeStructure[] distanceLOSwithDS = ruggedB.distanceBetweenLOSderivatives(
+ lineSensorA, realDateA, realPixelA.getPixelNumber(),
+ scToBodyA,
+ lineSensorB, realDateB, realPixelB.getPixelNumber(),
+ generator);
+
+ return distanceLOSwithDS;
+ }
+
+ /** Generate noisy measurements (sensor to sensor mapping)
+ * @param lineSampling line sampling
+ * @param pixelSampling pixel sampling
+ * @param earthConstraintWeight the earth constrint weight
+ * @param earthConstraintPostponed flag to tell if the earth constraint weight is set at construction (false) or after (true) - For JUnit coverage purpose
+ */
+ public Observables generateNoisyPoints(final int lineSampling, final int pixelSampling, final double earthConstraintWeight, final boolean earthConstraintPostponed) {
+
+ // Outliers control
+ final double outlierValue = 1.e+2;
+
+ // Generate measurements with constraints on Earth distance and outliers control
+
+ // Generate reference mapping, with Earth distance constraints.
+ // Weighting will be applied as follow :
+ // (1-earthConstraintWeight) for losDistance weighting
+ // earthConstraintWeight for earthDistance weighting
+ SensorToSensorMapping interMapping;
+ if (! earthConstraintPostponed) {
+ interMapping = new SensorToSensorMapping(lineSensorA.getName(), ruggedA.getName(),
+ lineSensorB.getName(), ruggedB.getName(),
+ earthConstraintWeight);
+ } else { // used for JUnit coverage purpose
+ interMapping = new SensorToSensorMapping(lineSensorA.getName(), ruggedA.getName(),
+ lineSensorB.getName(), ruggedB.getName());
+ // set the earthConstraintWeight after construction
+ interMapping.setBodyConstraintWeight(earthConstraintWeight);
+ }
+
+ // Observables which contains sensor to sensor mapping
+ Observables observables = new Observables(2);
+
+ // Generation noisy measurements
+ // distribution: gaussian(0), vector dimension: 2
+ final double meanA[] = { 5.0, 5.0 };
+ final double stdA[] = { 0.1, 0.1 };
+ final double meanB[] = { 0.0, 0.0 };
+ final double stdB[] = { 0.1, 0.1 };
+
+ // Seed has been fixed for tests purpose
+ final GaussianRandomGenerator rngA = new GaussianRandomGenerator(new Well19937a(0xefac03d9be4d24b9l));
+ final UncorrelatedRandomVectorGenerator rvgA = new UncorrelatedRandomVectorGenerator(meanA, stdA, rngA);
+
+ // Seed has been fixed for tests purpose
+ final GaussianRandomGenerator rngB = new GaussianRandomGenerator(new Well19937a(0xdf1c03d9be0b34b9l));
+ final UncorrelatedRandomVectorGenerator rvgB = new UncorrelatedRandomVectorGenerator(meanB, stdB, rngB);
+
+
+ // Search the sensor pixel seeing point
+ final int minLine = 0;
+ final int maxLine = pleiadesViewingModelB.getDimension() - 1;
+
+ final String sensorNameB = lineSensorB.getName();
+
+ for (double line = 0; line < pleiadesViewingModelA.getDimension(); line += lineSampling) {
+
+ final AbsoluteDate dateA = lineSensorA.getDate(line);
+
+ for (double pixelA = 0; pixelA < lineSensorA.getNbPixels(); pixelA += pixelSampling) {
+
+ final GeodeticPoint gpA = ruggedA.directLocation(dateA, lineSensorA.getPosition(),
+ lineSensorA.getLOS(dateA, pixelA));
+ final SensorPixel sensorPixelB = ruggedB.inverseLocation(sensorNameB, gpA, minLine, maxLine);
+
+ // We need to test if the sensor pixel is found in the prescribed lines
+ // otherwise the sensor pixel is null
+ if (sensorPixelB != null) {
+
+ final AbsoluteDate dateB = lineSensorB.getDate(sensorPixelB.getLineNumber());
+ final double pixelB = sensorPixelB.getPixelNumber();
+
+ // Get spacecraft to body transform of Rugged instance A
+ final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
+
+ final GeodeticPoint gpB = ruggedB.directLocation(dateB, lineSensorB.getPosition(),
+ lineSensorB.getLOS(dateB, pixelB));
+ final double geoDistance = computeDistanceInMeter(gpA, gpB);
+
+ // Create the inter mapping if distance is below outlier value
+ if (geoDistance < outlierValue) {
+
+ final double[] vecRandomA = rvgA.nextVector();
+ final double[] vecRandomB = rvgB.nextVector();
+
+ final SensorPixel realPixelA = new SensorPixel(line + vecRandomA[0], pixelA + vecRandomA[1]);
+ final SensorPixel realPixelB = new SensorPixel(sensorPixelB.getLineNumber() + vecRandomB[0],
+ sensorPixelB.getPixelNumber() + vecRandomB[1]);
+
+ final AbsoluteDate realDateA = lineSensorA.getDate(realPixelA.getLineNumber());
+ final AbsoluteDate realDateB = lineSensorB.getDate(realPixelB.getLineNumber());
+
+ final double[] distanceLOSB = ruggedB.distanceBetweenLOS(lineSensorA, realDateA, realPixelA.getPixelNumber(), scToBodyA,
+ lineSensorB, realDateB, realPixelB.getPixelNumber());
+ final Double losDistance = 0.0;
+ final Double earthDistance = distanceLOSB[1];
+
+ interMapping.addMapping(realPixelA, realPixelB, losDistance, earthDistance);
+
+ } // end test if geoDistance < outlierValue
+ } // end test if sensorPixelB != null
+
+ } // end loop on pixel of sensorA
+ } // end loop on line of sensorA
+
+ observables.addInterMapping(interMapping);
+ return observables;
+ }
+
+
+ /** Generate simple noisy measurements (sensor to sensor mapping)
+ * @param lineSampling line sampling
+ * @param pixelSampling pixel sampling
+ * @param earthConstraintWeight the earth constrint weight
+ * @param earthConstraintPostponed flag to tell if the earth constraint weight is set at construction (false) or after (true) - For JUnit coverage purpose
+ */
+ public Observables generateSimpleInterMapping(final int lineSampling, final int pixelSampling, final double earthConstraintWeight, final boolean earthConstraintPostponed) {
+
+ // Outliers control
+ final double outlierValue = 1.e+2;
+
+ // Generate measurements with constraints on Earth distance and outliers control
+
+ // Generate reference mapping, with Earth distance constraints.
+ // Weighting will be applied as follow :
+ // (1-earthConstraintWeight) for losDistance weighting
+ // earthConstraintWeight for earthDistance weighting
+ SensorToSensorMapping interMapping;
+ if (! earthConstraintPostponed) {
+ interMapping = new SensorToSensorMapping(lineSensorA.getName(), lineSensorB.getName(), earthConstraintWeight);
+ } else { // used for JUnit coverage purpose
+ interMapping = new SensorToSensorMapping(lineSensorA.getName(), lineSensorB.getName());
+ // set the earthConstraintWeight after construction
+ interMapping.setBodyConstraintWeight(earthConstraintWeight);
+ }
+
+ // Observables which contains sensor to sensor mapping
+ Observables observables = new Observables(2);
+
+ // Generation noisy measurements
+ // distribution: gaussian(0), vector dimension: 2
+ final double meanA[] = { 5.0, 5.0 };
+ final double stdA[] = { 0.1, 0.1 };
+ final double meanB[] = { 0.0, 0.0 };
+ final double stdB[] = { 0.1, 0.1 };
+
+ // Seed has been fixed for tests purpose
+ final GaussianRandomGenerator rngA = new GaussianRandomGenerator(new Well19937a(0xefac03d9be4d24b9l));
+ final UncorrelatedRandomVectorGenerator rvgA = new UncorrelatedRandomVectorGenerator(meanA, stdA, rngA);
+
+ // Seed has been fixed for tests purpose
+ final GaussianRandomGenerator rngB = new GaussianRandomGenerator(new Well19937a(0xdf1c03d9be0b34b9l));
+ final UncorrelatedRandomVectorGenerator rvgB = new UncorrelatedRandomVectorGenerator(meanB, stdB, rngB);
+
+
+ // Search the sensor pixel seeing point
+ final int minLine = 0;
+ final int maxLine = pleiadesViewingModelB.getDimension() - 1;
+
+ final String sensorNameB = lineSensorB.getName();
+
+ for (double line = 0; line < pleiadesViewingModelA.getDimension(); line += lineSampling) {
+
+ final AbsoluteDate dateA = lineSensorA.getDate(line);
+
+ for (double pixelA = 0; pixelA < lineSensorA.getNbPixels(); pixelA += pixelSampling) {
+
+ final GeodeticPoint gpA = ruggedA.directLocation(dateA, lineSensorA.getPosition(),
+ lineSensorA.getLOS(dateA, pixelA));
+ final SensorPixel sensorPixelB = ruggedB.inverseLocation(sensorNameB, gpA, minLine, maxLine);
+
+ // We need to test if the sensor pixel is found in the prescribed lines
+ // otherwise the sensor pixel is null
+ if (sensorPixelB != null) {
+
+ final AbsoluteDate dateB = lineSensorB.getDate(sensorPixelB.getLineNumber());
+ final double pixelB = sensorPixelB.getPixelNumber();
+
+ final GeodeticPoint gpB = ruggedB.directLocation(dateB, lineSensorB.getPosition(),
+ lineSensorB.getLOS(dateB, pixelB));
+ final double geoDistance = computeDistanceInMeter(gpA, gpB);
+
+ // Create the inter mapping if distance is below outlier value
+ if (geoDistance < outlierValue) {
+
+ final double[] vecRandomA = rvgA.nextVector();
+ final double[] vecRandomB = rvgB.nextVector();
+
+ final SensorPixel realPixelA = new SensorPixel(line + vecRandomA[0], pixelA + vecRandomA[1]);
+ final SensorPixel realPixelB = new SensorPixel(sensorPixelB.getLineNumber() + vecRandomB[0],
+ sensorPixelB.getPixelNumber() + vecRandomB[1]);
+ // dummy value for JUnit test purpose
+ final Double losDistance = FastMath.abs(vecRandomA[0]);
+
+ interMapping.addMapping(realPixelA, realPixelB, losDistance);
+
+ } // end test if geoDistance < outlierValue
+ } // end test if sensorPixelB != null
+
+ } // end loop on pixel of sensorA
+ } // end loop on line of sensorA
+
+ observables.addInterMapping(interMapping);
+ return observables;
+ }
+
+ /** Compute a geodetic distance in meters between two geodetic points.
+ * @param geoPoint1 first geodetic point (rad)
+ * @param geoPoint2 second geodetic point (rad)
+ * @return distance in meters
+ */
+ private static double computeDistanceInMeter(final GeodeticPoint geoPoint1, final GeodeticPoint geoPoint2) {
+
+ // get vectors on unit sphere from angular coordinates
+ final Vector3D p1 = new Vector3D(geoPoint1.getLatitude(), geoPoint1.getLongitude());
+ final Vector3D p2 = new Vector3D(geoPoint2.getLatitude(), geoPoint2.getLongitude());
+ return Constants.WGS84_EARTH_EQUATORIAL_RADIUS * Vector3D.angle(p1, p2);
+ }
+
+ /** Get the number of parameters to adjust
+ * @return number of parameters to adjust
+ */
+ public int getParameterToAdjust() {
+ return parameterToAdjust;
+ }
+
+ @After
+ public void tearDown() {
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/PleiadesOrbitModel.java b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesOrbitModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f76ebb808a0f108adb6a8eea66650655959c8e3
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesOrbitModel.java
@@ -0,0 +1,200 @@
+package org.orekit.rugged.adjustment.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.RotationConvention;
+import org.hipparchus.geometry.euclidean.threed.RotationOrder;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
+import org.orekit.attitudes.AttitudeProvider;
+import org.orekit.attitudes.LofOffset;
+import org.orekit.attitudes.NadirPointing;
+import org.orekit.attitudes.TabulatedLofOffset;
+import org.orekit.attitudes.YawCompensation;
+import org.orekit.bodies.BodyShape;
+import org.orekit.frames.Frame;
+import org.orekit.frames.FramesFactory;
+import org.orekit.frames.LOFType;
+import org.orekit.orbits.CircularOrbit;
+import org.orekit.orbits.Orbit;
+import org.orekit.orbits.PositionAngle;
+import org.orekit.propagation.Propagator;
+import org.orekit.propagation.analytical.KeplerianPropagator;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.utils.AngularDerivativesFilter;
+import org.orekit.utils.Constants;
+import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.utils.TimeStampedPVCoordinates;
+
+/**
+ * Class to compute Pleiades orbit for refining Junit tests.
+ */
+public class PleiadesOrbitModel {
+
+ /** Flag to change Attitude Law (by default Nadir Pointing Yaw Compensation). */
+ private boolean userDefinedLOFTransform;
+
+ /** User defined Roll law. */
+ private double[] lofTransformRollPoly;
+
+ /** User defined Pitch law. */
+ private double[] lofTransformPitchPoly;
+
+ /** User defined Yaw law. */
+ private double[] lofTransformYawPoly;
+
+ /** Reference date. */
+ private AbsoluteDate refDate;
+
+ /** Default constructor.
+ */
+ public PleiadesOrbitModel() {
+ userDefinedLOFTransform = false;
+ }
+
+ /** Create a circular orbit.
+ */
+ public Orbit createOrbit(final double mu, final AbsoluteDate date) {
+
+ // the following orbital parameters have been computed using
+ // Orekit tutorial about phasing, using the following configuration:
+ //
+ // orbit.date = 2012-01-01T00:00:00.000
+ // phasing.orbits.number = 143
+ // phasing.days.number = 10
+ // sun.synchronous.reference.latitude = 0
+ // sun.synchronous.reference.ascending = false
+ // sun.synchronous.mean.solar.time = 10:30:00
+ // gravity.field.degree = 12
+ // gravity.field.order = 12
+
+ final Frame eme2000 = FramesFactory.getEME2000();
+ return new CircularOrbit(694000.0 + Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
+ -4.029194321683225E-4,
+ 0.0013530362644647786,
+ FastMath.toRadians(98.2), // Pleiades inclination 98.2 deg
+ FastMath.toRadians(-86.47 + 180),
+ FastMath.toRadians(135.9 + 0.3),
+ PositionAngle.TRUE,
+ eme2000,
+ date,
+ mu);
+ }
+
+ /** Set the Local Orbital Frame characteristics.
+ */
+ public void setLOFTransform(final double[] rollPoly, final double[] pitchPoly,
+ final double[] yawPoly, final AbsoluteDate date) {
+
+ this.userDefinedLOFTransform = true;
+ lofTransformRollPoly = rollPoly.clone();
+ lofTransformPitchPoly = pitchPoly.clone();
+ lofTransformYawPoly = yawPoly.clone();
+ this.refDate = date;
+ }
+
+ /** Recompute the polynom coefficients with shift.
+ */
+ private double getPoly(final double[] poly, final double shift) {
+
+ double val = 0.0;
+ for (int coef = 0; coef < poly.length; coef++) {
+ val = val + poly[coef] * FastMath.pow(shift, coef);
+ }
+ return val;
+ }
+
+ /** Get the offset.
+ */
+ private Rotation getOffset(final BodyShape earth, final Orbit orbit, final double shift) {
+
+ final LOFType type = LOFType.VVLH;
+ final double roll = getPoly(lofTransformRollPoly, shift);
+ final double pitch = getPoly(lofTransformPitchPoly, shift);
+ final double yaw = getPoly(lofTransformYawPoly, shift);
+
+ final LofOffset law = new LofOffset(orbit.getFrame(), type, RotationOrder.XYZ,
+ roll, pitch, yaw);
+ final Rotation offsetAtt = law.
+ getAttitude(orbit, orbit.getDate().shiftedBy(shift), orbit.getFrame()).
+ getRotation();
+ final NadirPointing nadirPointing = new NadirPointing(orbit.getFrame(), earth);
+ final Rotation nadirAtt = nadirPointing.
+ getAttitude(orbit, orbit.getDate().getDate().shiftedBy(shift), orbit.getFrame()).
+ getRotation();
+ final Rotation offsetProper = offsetAtt.compose(nadirAtt.revert(), RotationConvention.VECTOR_OPERATOR);
+
+ return offsetProper;
+ }
+
+ /** Create the attitude provider.
+ */
+ public AttitudeProvider createAttitudeProvider(final BodyShape earth, final Orbit orbit) {
+
+ if (userDefinedLOFTransform) {
+ final LOFType type = LOFType.VVLH;
+
+ final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
+
+ for (double shift = -10.0; shift < +10.0; shift += 1e-2) {
+ list.add(new TimeStampedAngularCoordinates(refDate.shiftedBy(shift),
+ getOffset(earth, orbit, shift),
+ Vector3D.ZERO,
+ Vector3D.ZERO));
+ }
+
+ final TabulatedLofOffset tabulated = new TabulatedLofOffset(orbit.getFrame(), type, list,
+ 2, AngularDerivativesFilter.USE_R);
+
+ return tabulated;
+ } else {
+ return new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth));
+ }
+ }
+
+ /** Generate the orbit.
+ */
+ public List<TimeStampedPVCoordinates> orbitToPV(final Orbit orbit, final BodyShape earth,
+ final AbsoluteDate minDate, final AbsoluteDate maxDate,
+ final double step) {
+
+ final Propagator propagator = new KeplerianPropagator(orbit);
+
+ propagator.setAttitudeProvider(createAttitudeProvider(earth, orbit));
+
+ propagator.propagate(minDate);
+ final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
+ propagator.setMasterMode(step,
+ (currentState, isLast) ->
+ list.add(new TimeStampedPVCoordinates(currentState.getDate(),
+ currentState.getPVCoordinates().getPosition(),
+ currentState.getPVCoordinates().getVelocity(),
+ Vector3D.ZERO)));
+ propagator.propagate(maxDate);
+
+ return list;
+ }
+
+ /** Generate the attitude.
+ */
+ public List<TimeStampedAngularCoordinates> orbitToQ(final Orbit orbit, final BodyShape earth,
+ final AbsoluteDate minDate, final AbsoluteDate maxDate,
+ final double step) {
+
+ final Propagator propagator = new KeplerianPropagator(orbit);
+ propagator.setAttitudeProvider(createAttitudeProvider(earth, orbit));
+ propagator.propagate(minDate);
+ final List<TimeStampedAngularCoordinates> list = new ArrayList<>();
+ propagator.setMasterMode(step,
+ (currentState, isLast) ->
+ list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
+ currentState.getAttitude().getRotation(),
+ Vector3D.ZERO,
+ Vector3D.ZERO)));
+ propagator.propagate(maxDate);
+
+ return list;
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab7561bbae3607b0ea22e914270572a1cf90c3c7
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/util/PleiadesViewingModel.java
@@ -0,0 +1,141 @@
+package org.orekit.rugged.adjustment.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.RotationConvention;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
+import org.orekit.rugged.linesensor.LineDatation;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.LinearLineDatation;
+import org.orekit.rugged.los.FixedRotation;
+import org.orekit.rugged.los.FixedZHomothety;
+import org.orekit.rugged.los.LOSBuilder;
+import org.orekit.rugged.los.TimeDependentLOS;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.time.TimeScale;
+import org.orekit.time.TimeScalesFactory;
+
+/**
+ * Pleiades viewing model for refining Junit tests.
+ */
+public class PleiadesViewingModel {
+
+ /** Pleiades parameters. */
+ private static final double FOV = 1.65; // 20km - alt 694km
+ private static final int DIMENSION = 40000;
+ private static final double LINE_PERIOD = 1.e-4;
+
+ private double incidenceAngle;
+ private LineSensor lineSensor;
+ private String referenceDate;
+ private String sensorName;
+
+ /** PleiadesViewingModel constructor.
+ * @param sensorName sensor name
+ * @param incidenceAngle incidence angle
+ * @param referenceDate reference date
+ */
+ public PleiadesViewingModel(final String sensorName, final double incidenceAngle, final String referenceDate) {
+
+ this.sensorName = sensorName;
+ this.referenceDate = referenceDate;
+ this.incidenceAngle = incidenceAngle;
+ this.createLineSensor();
+ }
+
+ /** Create raw fixed Line Of sight
+ */
+ public LOSBuilder rawLOS(final Vector3D center, final Vector3D normal, final double halfAperture, final int n) {
+
+ final List<Vector3D> list = new ArrayList<Vector3D>(n);
+ for (int i = 0; i < n; ++i) {
+ final double alpha = (halfAperture * (2 * i + 1 - n)) / (n - 1);
+ list.add(new Rotation(normal, alpha, RotationConvention.VECTOR_OPERATOR).applyTo(center));
+ }
+
+ return new LOSBuilder(list);
+ }
+
+ /** Build a LOS provider
+ */
+ public TimeDependentLOS buildLOS() {
+
+ final LOSBuilder losBuilder = rawLOS(new Rotation(Vector3D.PLUS_I,
+ FastMath.toRadians(incidenceAngle),
+ RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
+ Vector3D.PLUS_I, FastMath.toRadians(FOV / 2), DIMENSION);
+
+ losBuilder.addTransform(new FixedRotation(sensorName + InitInterRefiningTest.rollSuffix, Vector3D.MINUS_I, 0.00));
+ losBuilder.addTransform(new FixedRotation(sensorName + InitInterRefiningTest.pitchSuffix, Vector3D.MINUS_J, 0.00));
+
+ // factor is a common parameters shared between all Pleiades models
+ losBuilder.addTransform(new FixedZHomothety(InitInterRefiningTest.factorName, 1.0));
+
+ return losBuilder.build();
+ }
+
+ /** Get the reference date.
+ */
+ public AbsoluteDate getDatationReference() {
+
+ // We use Orekit for handling time and dates, and Rugged for defining the datation model:
+ final TimeScale utc = TimeScalesFactory.getUTC();
+
+ return new AbsoluteDate(referenceDate, utc);
+ }
+
+ /** Get the min date.
+ */
+ public AbsoluteDate getMinDate() {
+ return lineSensor.getDate(0);
+ }
+
+ /** Get the max date.
+ */
+ public AbsoluteDate getMaxDate() {
+ return lineSensor.getDate(DIMENSION);
+ }
+
+ /** Get the line sensor.
+ */
+ public LineSensor getLineSensor() {
+ return lineSensor;
+ }
+
+ /** Get the sensor name.
+ */
+ public String getSensorName() {
+ return sensorName;
+ }
+
+ /** Get the number of lines of the sensor.
+ * @return the number of lines of the sensor
+ */
+ public int getDimension() {
+ return DIMENSION;
+ }
+
+ /** Create the line sensor.
+ */
+ private void createLineSensor() {
+
+ // Offset of the MSI from center of mass of satellite
+ // one line sensor
+ // los: swath in the (YZ) plane, looking at 50° roll, 2.6" per pixel
+ final Vector3D msiOffset = new Vector3D(0, 0, 0);
+
+ final TimeDependentLOS lineOfSight = buildLOS();
+
+ final double rate = 1. / LINE_PERIOD;
+ // linear datation model: at reference time we get the middle line, and the rate is one line every 1.5ms
+
+ final LineDatation lineDatation = new LinearLineDatation(getDatationReference(), DIMENSION / 2, rate);
+
+ lineSensor = new LineSensor(sensorName, lineDatation, msiOffset, lineOfSight);
+ }
+
+}
+
diff --git a/src/test/java/org/orekit/rugged/adjustment/util/RefiningParametersDriver.java b/src/test/java/org/orekit/rugged/adjustment/util/RefiningParametersDriver.java
new file mode 100644
index 0000000000000000000000000000000000000000..d4d89bb574c72ee0d5e5d4668c3d7cde973b8f0d
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/adjustment/util/RefiningParametersDriver.java
@@ -0,0 +1,131 @@
+package org.orekit.rugged.adjustment.util;
+
+import org.orekit.rugged.api.Rugged;
+import org.orekit.utils.ParameterDriver;
+
+
+/** Apply disruptions or select/unselect parameter to adjust for Refining JUnit tests.
+ * @author Guylaine Prat
+ */
+public class RefiningParametersDriver {
+
+ // Part of the name of parameter drivers
+ static final String rollSuffix = "_roll";
+ static final String pitchSuffix = "_pitch";
+ static final String factorName = "factor";
+
+ /** Apply disruptions on acquisition for roll angle
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ * @param rollValue rotation on roll value
+ */
+ public static void applyDisruptionsRoll(final Rugged rugged, final String sensorName, final double rollValue) {
+
+ rugged.
+ getLineSensor(sensorName).
+ getParametersDrivers().
+ filter(driver -> driver.getName().equals(sensorName + rollSuffix)).
+ findFirst().get().setValue(rollValue);
+ }
+
+ /** Apply disruptions on acquisition for pitch angle
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ * @param pitchValue rotation on pitch value
+ */
+ public static void applyDisruptionsPitch(final Rugged rugged, final String sensorName, final double pitchValue) {
+
+ rugged.
+ getLineSensor(sensorName).
+ getParametersDrivers().
+ filter(driver -> driver.getName().equals(sensorName + pitchSuffix)).
+ findFirst().get().setValue(pitchValue);
+ }
+
+ /** Apply disruptions on acquisition for scale factor
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ * @param factorValue scale factor
+ */
+ public static void applyDisruptionsFactor(final Rugged rugged, final String sensorName, final double factorValue) {
+
+ rugged.
+ getLineSensor(sensorName).
+ getParametersDrivers().
+ filter(driver -> driver.getName().equals(factorName)).
+ findFirst().get().setValue(factorValue);
+ }
+
+ /** Select roll angle to adjust
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ */
+ public static void setSelectedRoll(final Rugged rugged, final String sensorName) {
+
+ ParameterDriver rollDriver =
+ rugged.getLineSensor(sensorName).getParametersDrivers().
+ filter(driver -> driver.getName().equals(sensorName + rollSuffix)).findFirst().get();
+ rollDriver.setSelected(true);
+ }
+
+ /** Select pitch angle to adjust
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ */
+ public static void setSelectedPitch(final Rugged rugged, final String sensorName) {
+
+ ParameterDriver pitchDriver =
+ rugged.getLineSensor(sensorName).getParametersDrivers().
+ filter(driver -> driver.getName().equals(sensorName + pitchSuffix)).findFirst().get();
+ pitchDriver.setSelected(true);
+ }
+
+ /** Select scale factor to adjust
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ */
+ public static void setSelectedFactor(final Rugged rugged, final String sensorName) {
+
+ ParameterDriver factorDriver =
+ rugged.getLineSensor(sensorName).getParametersDrivers().
+ filter(driver -> driver.getName().equals(factorName)).findFirst().get();
+ factorDriver.setSelected(true);
+ }
+
+ /** Unselect roll angle to adjust (for test coverage purpose)
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ */
+ public static void unselectRoll(final Rugged rugged, final String sensorName) {
+
+ ParameterDriver rollDriver =
+ rugged.getLineSensor(sensorName).getParametersDrivers().
+ filter(driver -> driver.getName().equals(sensorName + rollSuffix)).findFirst().get();
+ rollDriver.setSelected(false);
+ }
+
+ /** Unselect pitch angle to adjust (for test coverage purpose)
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ */
+ public static void unselectPitch(final Rugged rugged, final String sensorName) {
+
+ ParameterDriver pitchDriver =
+ rugged.getLineSensor(sensorName).getParametersDrivers().
+ filter(driver -> driver.getName().equals(sensorName + pitchSuffix)).findFirst().get();
+ pitchDriver.setSelected(false);
+ }
+
+ /** Unselect factor angle to adjust (for test coverage purpose)
+ * @param rugged Rugged instance
+ * @param sensorName line sensor name
+ */
+ public static void unselectFactor(final Rugged rugged, final String sensorName) {
+
+ ParameterDriver factorDriver =
+ rugged.getLineSensor(sensorName).getParametersDrivers().
+ filter(driver -> driver.getName().equals(factorName)).findFirst().get();
+ factorDriver.setSelected(false);
+ }
+
+}
diff --git a/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java b/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
index 3329c05f491702268f1d60a0ea7c7166d27564dd..bce3be642ac73371c432a4c326badb470f0cd367 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,11 +17,6 @@
package org.orekit.rugged.api;
-import org.hipparchus.geometry.euclidean.threed.Rotation;
-import org.hipparchus.geometry.euclidean.threed.RotationConvention;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
-import org.hipparchus.util.FastMath;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
@@ -29,11 +24,17 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.StreamCorruptedException;
+import java.lang.reflect.Field;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.RotationConvention;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
+import org.hipparchus.util.FastMath;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -47,7 +48,6 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
-import org.orekit.errors.OrekitException;
import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
import org.orekit.forces.gravity.ThirdBodyAttraction;
import org.orekit.forces.gravity.potential.GravityFieldFactory;
@@ -74,6 +74,10 @@ import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.rugged.raster.RandomLandscapeUpdater;
import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
+import org.orekit.rugged.refraction.AtmosphericRefraction;
+import org.orekit.rugged.refraction.ConstantRefractionLayer;
+import org.orekit.rugged.refraction.MultiLayerModel;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScale;
import org.orekit.time.TimeScalesFactory;
@@ -92,7 +96,7 @@ public class RuggedBuilderTest {
@Test
public void testSetContextWithEphemerides()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -195,7 +199,36 @@ public class RuggedBuilderTest {
Assert.assertFalse(rugged.isAberrationOfLightCorrected());
Assert.assertFalse(builder.getLightTimeCorrection());
Assert.assertFalse(builder.getAberrationOfLightCorrection());
-
+
+ AtmosphericRefraction atmosphericRefraction = new MultiLayerModel(builder.getEllipsoid());
+ builder.setRefractionCorrection(atmosphericRefraction);
+ rugged = builder.build();
+
+ MultiLayerModel atmosphericRefractionFromBuilder = (MultiLayerModel) builder.getRefractionCorrection();
+ Field atmos = atmosphericRefractionFromBuilder.getClass().getDeclaredField("ellipsoid");
+ atmos.setAccessible(true);
+ ExtendedEllipsoid ellipsoidAtmos = (ExtendedEllipsoid) atmos.get(atmosphericRefractionFromBuilder);
+ Assert.assertEquals(builder.getEllipsoid().getEquatorialRadius(), ellipsoidAtmos.getEquatorialRadius(), 1.0e-9);
+ Assert.assertEquals(builder.getEllipsoid().getFlattening(), ellipsoidAtmos.getFlattening(), 1.0e-10);
+
+ Field layers = atmosphericRefractionFromBuilder.getClass().getDeclaredField("refractionLayers");
+ layers.setAccessible(true);
+ @SuppressWarnings("unchecked")
+ List<ConstantRefractionLayer> layersAtmos = (List<ConstantRefractionLayer>) layers.get(atmosphericRefractionFromBuilder);
+
+ Field layersExpected = atmosphericRefraction.getClass().getDeclaredField("refractionLayers");
+ layersExpected.setAccessible(true);
+ @SuppressWarnings("unchecked")
+ List<ConstantRefractionLayer> layersAtmosExpected = (List<ConstantRefractionLayer>) layersExpected.get(atmosphericRefraction);
+ Assert.assertEquals(layersAtmosExpected.size(), layersAtmos.size());
+
+ List<ConstantRefractionLayer> copyAtmosExpected = new ArrayList<ConstantRefractionLayer>(layersAtmosExpected);
+ List<ConstantRefractionLayer> copyAtmos = new ArrayList<ConstantRefractionLayer>(layersAtmos);
+
+ Assert.assertTrue(copyAtmosExpected.removeAll(layersAtmos) && copyAtmos.removeAll(layersAtmosExpected));
+ Assert.assertTrue(copyAtmosExpected.isEmpty() && copyAtmos.isEmpty());
+
+
Assert.assertEquals(AlgorithmId.DUVENHAGE, builder.getAlgorithm());
Assert.assertEquals(6378137.0, builder.getEllipsoid().getEquatorialRadius(), 1.0e-9);
Assert.assertEquals(1.0 / 298.257222101, builder.getEllipsoid().getFlattening(), 1.0e-10);
@@ -279,7 +312,7 @@ public class RuggedBuilderTest {
@Test
public void testSetContextWithPropagator()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -324,7 +357,7 @@ public class RuggedBuilderTest {
@Test
public void testOutOfTimeRange()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -426,7 +459,7 @@ public class RuggedBuilderTest {
@Test
public void testInterpolatorDump()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 200;
@@ -495,7 +528,7 @@ public class RuggedBuilderTest {
@Test
public void testInterpolatorCannotDump()
- throws RuggedException, OrekitException, URISyntaxException, IOException {
+ throws URISyntaxException, IOException {
int dimension = 200;
@@ -545,7 +578,7 @@ public class RuggedBuilderTest {
@Test
public void testInterpolatorDumpWrongFrame()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 200;
@@ -606,7 +639,7 @@ public class RuggedBuilderTest {
@Test
public void testInterpolatorNotADump()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -678,8 +711,7 @@ public class RuggedBuilderTest {
protected void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
ArrayList<TimeStampedPVCoordinates> satellitePVList,
String absDate,
- double px, double py, double pz, double vx, double vy, double vz)
- throws OrekitException {
+ double px, double py, double pz, double vx, double vy, double vz) {
AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
Vector3D position = new Vector3D(px, py, pz);
Vector3D velocity = new Vector3D(vx, vy, vz);
@@ -699,20 +731,17 @@ public class RuggedBuilderTest {
satelliteQList.add(pair);
}
- private BodyShape createEarth()
- throws OrekitException {
+ private BodyShape createEarth() {
return new OneAxisEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
FramesFactory.getITRF(IERSConventions.IERS_2010, true));
}
- private NormalizedSphericalHarmonicsProvider createGravityField()
- throws OrekitException {
+ private NormalizedSphericalHarmonicsProvider createGravityField() {
return GravityFieldFactory.getNormalizedProvider(12, 12);
}
- private Orbit createOrbit(double mu)
- throws OrekitException {
+ private Orbit createOrbit(double mu) {
// the following orbital parameters have been computed using
// Orekit tutorial about phasing, using the following configuration:
//
@@ -736,8 +765,7 @@ public class RuggedBuilderTest {
private Propagator createPropagator(BodyShape earth,
NormalizedSphericalHarmonicsProvider gravityField,
- Orbit orbit)
- throws OrekitException {
+ Orbit orbit) {
AttitudeProvider yawCompensation = new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth));
SpacecraftState state = new SpacecraftState(orbit,
@@ -792,9 +820,7 @@ public class RuggedBuilderTest {
private List<TimeStampedPVCoordinates> orbitToPV(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
- double step)
- throws OrekitException {
-
+ double step) {
Propagator propagator = new KeplerianPropagator(orbit);
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
@@ -813,8 +839,8 @@ public class RuggedBuilderTest {
private List<TimeStampedAngularCoordinates> orbitToQ(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
- double step)
- throws OrekitException {
+ double step) {
+
Propagator propagator = new KeplerianPropagator(orbit);
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
diff --git a/src/test/java/org/orekit/rugged/api/RuggedTest.java b/src/test/java/org/orekit/rugged/api/RuggedTest.java
index 9a634a9a13b03a6251561ebaa07d30392535a428..0b2b555a2f79efde76578bd2ac73e2e828fc98e1 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,6 +17,10 @@
package org.orekit.rugged.api;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
@@ -51,7 +55,6 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
import org.orekit.forces.gravity.potential.NormalizedSphericalHarmonicsProvider;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
@@ -59,9 +62,11 @@ import org.orekit.orbits.Orbit;
import org.orekit.propagation.Propagator;
import org.orekit.rugged.TestUtils;
import org.orekit.rugged.adjustment.GroundOptimizationProblemBuilder;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.util.InitInterRefiningTest;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
import org.orekit.rugged.errors.RuggedMessages;
+import org.orekit.rugged.intersection.IgnoreDEMAlgorithm;
import org.orekit.rugged.linesensor.LineDatation;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.LinearLineDatation;
@@ -72,9 +77,7 @@ import org.orekit.rugged.los.TimeDependentLOS;
import org.orekit.rugged.raster.RandomLandscapeUpdater;
import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
-import org.orekit.rugged.adjustment.measurements.Observables;
import org.orekit.rugged.utils.DSGenerator;
-import org.orekit.rugged.utils.RefiningTest;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScale;
import org.orekit.time.TimeScalesFactory;
@@ -97,7 +100,7 @@ public class RuggedTest {
@Ignore
@Test
public void testMayonVolcanoTiming()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
long t0 = System.currentTimeMillis();
int dimension = 2000;
@@ -122,7 +125,8 @@ public class RuggedTest {
// los: swath in the (YZ) plane, centered at +Z, ±10° aperture, 960 pixels
Vector3D position = new Vector3D(1.5, 0, -0.2);
TimeDependentLOS los = TestUtils.createLOSPerfectLine(Vector3D.PLUS_K, Vector3D.PLUS_I,
- FastMath.toRadians(10.0), dimension).build();
+ FastMath.toRadians(10.0), dimension).
+ build();
// linear datation model: at reference time we get line 1000, and the rate is one line every 1.5ms
LineDatation lineDatation = new LinearLineDatation(crossing, dimension / 2, 1.0 / 1.5e-3);
@@ -187,7 +191,7 @@ public class RuggedTest {
@Test
public void testLightTimeCorrection()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 400;
@@ -265,7 +269,7 @@ public class RuggedTest {
@Test
public void testAberrationOfLightCorrection()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 400;
@@ -318,12 +322,11 @@ public class RuggedTest {
Assert.assertTrue(Vector3D.distance(pWith, pWithout) > 20.0);
Assert.assertTrue(Vector3D.distance(pWith, pWithout) < 20.5);
}
-
}
-
+
@Test
public void testFlatBodyCorrection()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 200;
@@ -384,8 +387,8 @@ public class RuggedTest {
}
@Test
- public void testLocationsinglePoint()
- throws RuggedException, OrekitException, URISyntaxException {
+ public void testLocationSinglePoint()
+ throws URISyntaxException {
int dimension = 200;
@@ -443,7 +446,7 @@ public class RuggedTest {
@Test
public void testLocationsinglePointNoCorrections()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 200;
@@ -504,7 +507,7 @@ public class RuggedTest {
@Test
public void testBasicScan()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 200;
@@ -567,7 +570,7 @@ public class RuggedTest {
@Ignore
@Test
public void testInverseLocationTiming()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
long t0 = System.currentTimeMillis();
int dimension = 2000;
@@ -584,12 +587,12 @@ public class RuggedTest {
for (int i = 0; i < nbSensors; ++i) {
// one line sensor
// position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
- // los: swath in the (YZ) plane, looking roughly at 50° roll (sensor-dependent), 2.6" per pixel
+ // los: swath in the (YZ) plane, looking roughly at 50° roll (sensor-dependent), 5.2" per pixel
Vector3D position = new Vector3D(1.5, 0, -0.2);
TimeDependentLOS los = TestUtils.createLOSPerfectLine(new Rotation(Vector3D.PLUS_I,
FastMath.toRadians(50.0 - 0.001 * i),
RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
- Vector3D.PLUS_I, FastMath.toRadians(dimension * 2.6 / 3600.0), dimension).build();
+ Vector3D.PLUS_I, FastMath.toRadians((dimension/2.) * 5.2 / 3600.0), dimension).build();
// linear datation model: at reference time we get roughly middle line, and the rate is one line every 1.5ms
LineDatation lineDatation = new LinearLineDatation(crossing, i + dimension / 2, 1.0 / 1.5e-3);
@@ -677,7 +680,7 @@ public class RuggedTest {
@Test
public void testInverseLocation()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
checkInverseLocation(2000, false, false, 4.0e-7, 5.0e-6);
checkInverseLocation(2000, false, true, 1.0e-5, 2.0e-7);
checkInverseLocation(2000, true, false, 4.0e-7, 4.0e-7);
@@ -686,7 +689,7 @@ public class RuggedTest {
@Test
public void testDateLocation()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
checkDateLocation(2000, false, false, 7.0e-7);
checkDateLocation(2000, false, true, 2.0e-5);
checkDateLocation(2000, true, false, 8.0e-7);
@@ -695,14 +698,14 @@ public class RuggedTest {
@Test
public void testLineDatation()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
checkLineDatation(2000, 7.0e-7);
checkLineDatation(10000, 8.0e-7);
}
@Test
- public void testInverseLocNearLineEnd() throws OrekitException, RuggedException, URISyntaxException {
+ public void testInverseLocNearLineEnd() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -804,7 +807,7 @@ public class RuggedTest {
}
@Test
- public void testInverseLoc() throws OrekitException, RuggedException, URISyntaxException {
+ public void testInverseLoc() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -905,7 +908,7 @@ public class RuggedTest {
@Test
public void testInverseLocCurvedLine()
- throws RuggedException, URISyntaxException, OrekitException {
+ throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -917,10 +920,10 @@ public class RuggedTest {
// one line sensor
// position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
- // los: swath in the (YZ) plane, looking at nadir, 2.6" per pixel, 3" sagitta
+ // los: swath in the (YZ) plane, looking at nadir, 5.2" per pixel, 3" sagitta
Vector3D position = new Vector3D(1.5, 0, -0.2);
TimeDependentLOS los = TestUtils.createLOSCurvedLine(Vector3D.PLUS_K, Vector3D.PLUS_I,
- FastMath.toRadians(dimension * 2.6 / 3600.0),
+ FastMath.toRadians((dimension/2.) * 5.2 / 3600.0),
FastMath.toRadians(3.0 / 3600.0),
dimension);
@@ -961,7 +964,7 @@ public class RuggedTest {
private void checkInverseLocation(int dimension, boolean lightTimeCorrection, boolean aberrationOfLightCorrection,
double maxLineError, double maxPixelError)
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -972,13 +975,14 @@ public class RuggedTest {
// one line sensor
// position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
- // los: swath in the (YZ) plane, looking at 50° roll, 2.6" per pixel
+ // los: swath in the (YZ) plane, looking at 50° roll, 5.2" per pixel
Vector3D position = new Vector3D(1.5, 0, -0.2);
TimeDependentLOS los = TestUtils.createLOSPerfectLine(new Rotation(Vector3D.PLUS_I,
- FastMath.toRadians(50.0),
+ FastMath.toRadians(5.0),
RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
Vector3D.PLUS_I,
- FastMath.toRadians(dimension * 2.6 / 3600.0), dimension).build();
+ FastMath.toRadians((dimension/2.) * 5.2 / 3600.0), dimension).build();
+ // In fact the pixel size = 5.2" as we construct the LOS with the full line (dimension) instead of dimension/2
// linear datation model: at reference time we get the middle line, and the rate is one line every 1.5ms
LineDatation lineDatation = new LinearLineDatation(crossing, dimension / 2, 1.0 / 1.5e-3);
@@ -1017,6 +1021,7 @@ public class RuggedTest {
(1 - d) * gp[i].getLatitude() + d * gp[i + 1].getLatitude(),
(1 - d) * gp[i].getLongitude() + d * gp[i + 1].getLongitude(),
0, dimension);
+
Assert.assertEquals(referenceLine, sp.getLineNumber(), maxLineError);
Assert.assertEquals(p, sp.getPixelNumber(), maxPixelError);
}
@@ -1053,28 +1058,28 @@ public class RuggedTest {
@Test
public void testInverseLocationDerivativesWithoutCorrections()
- throws RuggedException, OrekitException {
+ {
doTestInverseLocationDerivatives(2000, false, false,
8.0e-9, 3.0e-10, 5.0e-12, 9.0e-8);
}
@Test
public void testInverseLocationDerivativesWithLightTimeCorrection()
- throws RuggedException, OrekitException {
+ {
doTestInverseLocationDerivatives(2000, true, false,
3.0e-9, 9.0e-9, 2.1e-12, 9.0e-8);
}
@Test
public void testInverseLocationDerivativesWithAberrationOfLightCorrection()
- throws RuggedException, OrekitException {
+ {
doTestInverseLocationDerivatives(2000, false, true,
4.2e-10, 3.0e-10, 3.4e-12, 7.0e-8);
}
@Test
public void testInverseLocationDerivativesWithAllCorrections()
- throws RuggedException, OrekitException {
+ {
doTestInverseLocationDerivatives(2000, true, true,
3.0e-10, 5.0e-10, 2.0e-12, 7.0e-8);
}
@@ -1087,8 +1092,6 @@ public class RuggedTest {
* @param pixelTolerance
* @param lineDerivativeRelativeTolerance
* @param pixelDerivativeRelativeTolerance
- * @throws RuggedException
- * @throws OrekitException
*/
private void doTestInverseLocationDerivatives(int dimension,
boolean lightTimeCorrection,
@@ -1097,7 +1100,7 @@ public class RuggedTest {
double pixelTolerance,
double lineDerivativeRelativeTolerance,
double pixelDerivativeRelativeTolerance)
- throws RuggedException, OrekitException {
+ {
try {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
@@ -1109,17 +1112,18 @@ public class RuggedTest {
// one line sensor
// position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
- // los: swath in the (YZ) plane, looking at 50° roll, 2.6" per pixel
+ // los: swath in the (YZ) plane, looking at 50° roll, 5.2" per pixel
Vector3D position = new Vector3D(1.5, 0, -0.2);
LOSBuilder losBuilder =
TestUtils.createLOSPerfectLine(new Rotation(Vector3D.PLUS_I,
FastMath.toRadians(50.0),
RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
Vector3D.PLUS_I,
- FastMath.toRadians(dimension * 2.6 / 3600.0), dimension);
+ FastMath.toRadians((dimension/2.) * 5.2 / 3600.0), dimension);
losBuilder.addTransform(new FixedRotation("roll", Vector3D.MINUS_I, 0.0));
losBuilder.addTransform(new FixedRotation("pitch", Vector3D.MINUS_J, 0.0));
TimeDependentLOS los = losBuilder.build();
+ // In fact the pixel size = 5.2" as we construct the LOS with the full line (dimension) instead of dimension/2
// linear datation model: at reference time we get the middle line, and the rate is one line every 1.5ms
LineDatation lineDatation = new LinearLineDatation(crossing, dimension / 2, 1.0 / 1.5e-3);
@@ -1165,7 +1169,7 @@ public class RuggedTest {
java.lang.reflect.Method getGenerator = GroundOptimizationProblemBuilder.class.getSuperclass().getDeclaredMethod("getGenerator");
getGenerator.setAccessible(true);
-
+
DSGenerator generator = (DSGenerator) getGenerator.invoke(optimizationPbBuilder);
double referenceLine = 0.87654 * dimension;
@@ -1193,60 +1197,36 @@ public class RuggedTest {
UnivariateDifferentiableFunction lineVSroll =
differentiator.differentiate((double roll) -> {
- try {
- rollDriver.setValue(roll);
- pitchDriver.setValue(0);
- return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getLineNumber();
- } catch (OrekitException e) {
- throw new OrekitExceptionWrapper(e);
- } catch (RuggedException e) {
- throw new RuggedExceptionWrapper(e);
- }
+ rollDriver.setValue(roll);
+ pitchDriver.setValue(0);
+ return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getLineNumber();
});
double dLdR = lineVSroll.value(factory.variable(0, 0.0)).getPartialDerivative(1);
Assert.assertEquals(dLdR, result[0].getPartialDerivative(1, 0), dLdR * lineDerivativeRelativeTolerance);
UnivariateDifferentiableFunction lineVSpitch =
differentiator.differentiate((double pitch) -> {
- try {
- rollDriver.setValue(0);
- pitchDriver.setValue(pitch);
- return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getLineNumber();
- } catch (OrekitException e) {
- throw new OrekitExceptionWrapper(e);
- } catch (RuggedException e) {
- throw new RuggedExceptionWrapper(e);
- }
+ rollDriver.setValue(0);
+ pitchDriver.setValue(pitch);
+ return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getLineNumber();
});
double dLdP = lineVSpitch.value(factory.variable(0, 0.0)).getPartialDerivative(1);
Assert.assertEquals(dLdP, result[0].getPartialDerivative(0, 1), dLdP * lineDerivativeRelativeTolerance);
UnivariateDifferentiableFunction pixelVSroll =
differentiator.differentiate((double roll) -> {
- try {
- rollDriver.setValue(roll);
- pitchDriver.setValue(0);
- return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getPixelNumber();
- } catch (OrekitException e) {
- throw new OrekitExceptionWrapper(e);
- } catch (RuggedException e) {
- throw new RuggedExceptionWrapper(e);
- }
+ rollDriver.setValue(roll);
+ pitchDriver.setValue(0);
+ return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getPixelNumber();
});
double dXdR = pixelVSroll.value(factory.variable(0, 0.0)).getPartialDerivative(1);
Assert.assertEquals(dXdR, result[1].getPartialDerivative(1, 0), dXdR * pixelDerivativeRelativeTolerance);
UnivariateDifferentiableFunction pixelVSpitch =
differentiator.differentiate((double pitch) -> {
- try {
- rollDriver.setValue(0);
- pitchDriver.setValue(pitch);
- return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getPixelNumber();
- } catch (OrekitException e) {
- throw new OrekitExceptionWrapper(e);
- } catch (RuggedException e) {
- throw new RuggedExceptionWrapper(e);
- }
+ rollDriver.setValue(0);
+ pitchDriver.setValue(pitch);
+ return rugged.inverseLocation("line", gp[referencePixel], 0, dimension).getPixelNumber();
});
double dXdP = pixelVSpitch.value(factory.variable(0, 0.0)).getPartialDerivative(1);
Assert.assertEquals(dXdP, result[1].getPartialDerivative(0, 1), dXdP * pixelDerivativeRelativeTolerance);
@@ -1254,7 +1234,7 @@ public class RuggedTest {
} catch (InvocationTargetException | NoSuchMethodException |
SecurityException | IllegalAccessException |
IllegalArgumentException | URISyntaxException |
- OrekitExceptionWrapper | RuggedExceptionWrapper e) {
+ OrekitException | RuggedException e) {
Assert.fail(e.getLocalizedMessage());
}
}
@@ -1262,7 +1242,7 @@ public class RuggedTest {
private void checkDateLocation(int dimension, boolean lightTimeCorrection, boolean aberrationOfLightCorrection,
double maxDateError)
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -1273,13 +1253,14 @@ public class RuggedTest {
// one line sensor
// position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
- // los: swath in the (YZ) plane, looking at 50° roll, 2.6" per pixel
+ // los: swath in the (YZ) plane, looking at 50° roll, 5.2" per pixel
Vector3D position = new Vector3D(1.5, 0, -0.2);
TimeDependentLOS los = TestUtils.createLOSPerfectLine(new Rotation(Vector3D.PLUS_I,
FastMath.toRadians(50.0),
RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
Vector3D.PLUS_I,
- FastMath.toRadians(dimension * 2.6 / 3600.0), dimension).build();
+ FastMath.toRadians((dimension/2.) * 5.2 / 3600.0), dimension).build();
+ // In fact the pixel size = 5.2" as we construct the LOS with the full line (dimension) instead of dimension/2
// linear datation model: at reference time we get line 100, and the rate is one line every 1.5ms
LineDatation lineDatation = new LinearLineDatation(crossing, dimension / 2, 1.0 / 1.5e-3);
@@ -1340,22 +1321,23 @@ public class RuggedTest {
}
private void checkLineDatation(int dimension, double maxLineError)
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
- String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
- AbsoluteDate crossing = new AbsoluteDate("2012-01-01T12:30:00.000", TimeScalesFactory.getUTC());
+ AbsoluteDate crossing = new AbsoluteDate("2012-01-01T12:30:00.000", TimeScalesFactory.getUTC());
- // one line sensor
+ // one line sensor
// position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
// los: swath in the (YZ) plane, looking at 50° roll, 2.6" per pixel
Vector3D position = new Vector3D(1.5, 0, -0.2);
TimeDependentLOS los = TestUtils.createLOSPerfectLine(new Rotation(Vector3D.PLUS_I,
FastMath.toRadians(50.0),
RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
- Vector3D.PLUS_I,
- FastMath.toRadians(dimension * 2.6 / 3600.0), dimension).build();
+ Vector3D.PLUS_I,
+ FastMath.toRadians(dimension * 2.6 / 3600.0), dimension).build();
+ // In fact the pixel size = 5.2" as we construct the LOS with the full line (dimension) instead of dimension/2
// linear datation model: at reference time we get the middle line, and the rate is one line every 1.5ms
LineDatation lineDatation = new LinearLineDatation(crossing, dimension / 2, 1.0 / 1.5e-3);
@@ -1372,55 +1354,43 @@ public class RuggedTest {
Assert.assertEquals(firstLine, recomputedFirstLine, maxLineError);
Assert.assertEquals(lastLine, recomputedLastLine, maxLineError);
}
-
+
@Test
- public void testDistanceBetweenLOS() throws RuggedException {
-
- // Disruption to apply to roll, pitch (deg) and factor
- final double rollValueA = 0.004;
- final double pitchValueA = 0.0008;
- final double factorValueA = 1.000000001;
- final double pitchValueB = -0.0008;
-
- RefiningTest refiningTest = new RefiningTest();
- refiningTest.InitRefiningTest(rollValueA, pitchValueA, factorValueA, pitchValueB);
+ public void testDistanceBetweenLOS() {
+ InitInterRefiningTest refiningTest = new InitInterRefiningTest();
+ refiningTest.initRefiningTest();
+
final SensorPixel realPixelA = new SensorPixel(2005.015883575199, 18004.968656395424);
final SensorPixel realPixelB = new SensorPixel(4798.487736488162, 13952.2195710654);
double[] distancesBetweenLOS = refiningTest.computeDistancesBetweenLOS(realPixelA, realPixelB);
- double expectedDistanceBetweenLOS = 1.4324023534834665;
- double expectedDistanceToTheGround = 6367488.110062852;
+ double expectedDistanceBetweenLOS = 3.88800245;
+ double expectedDistanceToTheGround = 6368020.559109;
- Assert.assertEquals(expectedDistanceBetweenLOS, distancesBetweenLOS[0], 1.e-10);
+ Assert.assertEquals(expectedDistanceBetweenLOS, distancesBetweenLOS[0], 1.e-8);
Assert.assertEquals(expectedDistanceToTheGround, distancesBetweenLOS[1], 1.e-5);
}
-
+
@Test
- public void testDistanceBetweenLOSDerivatives() throws RuggedException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ public void testDistanceBetweenLOSDerivatives() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
- // Disruption to apply to roll, pitch (deg) and factor
- final double rollValueA = 0.004;
- final double pitchValueA = 0.0008;
- final double factorValueA = 1.000000001;
- final double pitchValueB = -0.0008;
-
- RefiningTest refiningTest = new RefiningTest();
- refiningTest.InitRefiningTest(rollValueA, pitchValueA, factorValueA, pitchValueB);
+ InitInterRefiningTest refiningTest = new InitInterRefiningTest();
+ refiningTest.initRefiningTest();
final SensorPixel realPixelA = new SensorPixel(2005.015883575199, 18004.968656395424);
final SensorPixel realPixelB = new SensorPixel(4798.487736488162, 13952.2195710654);
// Expected distances between LOS and to the ground
- double expectedDistanceBetweenLOS = 1.4324023534834665;
- double expectedDistanceToTheGround = 6367488.110062852;
+ double expectedDistanceBetweenLOS = 3.88800245;
+ double expectedDistanceToTheGround = 6368020.559109;
// Expected derivatives for
// minimum distance between LOS
- double[] expectedDminDerivatives = {1.4324023534834665, 153938.2318141503, 679398.14124085, -12779.33148208561, -191388.29547926865, -669127.0811123198} ;
+ double[] expectedDminDerivatives = {3.88800245, -153874.01319097, -678866.03112033, 191294.06938169, 668600.16715270} ;
// minimum distance to the ground
- double[] expectedDcentralBodyDerivatives = {6367488.110062852, 7018752.447074092, -1578384.972353925, -589929.2355500134, -6850070.113251391, 1958371.974455633};
+ double[] expectedDcentralBodyDerivatives = {6368020.55910153, 7007767.46926062, -1577060.82402054, -6839286.39593802, 1956452.66636262};
DerivativeStructure[] distancesBetweenLOSwithDS = refiningTest.computeDistancesBetweenLOSDerivatives(realPixelA, realPixelB, expectedDistanceBetweenLOS, expectedDistanceToTheGround);
@@ -1429,22 +1399,120 @@ public class RuggedTest {
// Minimum distance to the ground
DerivativeStructure dCentralBody = distancesBetweenLOSwithDS[1];
- Assert.assertEquals(expectedDistanceBetweenLOS, dMin.getValue(), 1.e-10);
+ Assert.assertEquals(expectedDistanceBetweenLOS, dMin.getValue(), 1.e-8);
Assert.assertEquals(expectedDistanceToTheGround, dCentralBody.getValue() , 1.e-5);
for (int i = 0; i < dMin.getAllDerivatives().length; i++) {
- Assert.assertEquals(expectedDminDerivatives[i], dMin.getAllDerivatives()[i], 1.e-10);
+ Assert.assertEquals(expectedDminDerivatives[i], dMin.getAllDerivatives()[i], 1.e-8);
}
for (int i = 0; i < dCentralBody.getAllDerivatives().length; i++) {
- Assert.assertEquals(expectedDcentralBodyDerivatives[i], dCentralBody.getAllDerivatives()[i], 1.e-10);
+ Assert.assertEquals(expectedDcentralBodyDerivatives[i], dCentralBody.getAllDerivatives()[i], 1.e-8);
}
}
+ @Test
+ public void testForCoverage() throws URISyntaxException {
+
+ int dimension = 400;
+
+ String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ final BodyShape earth = TestUtils.createEarth();
+ final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
+
+ AbsoluteDate crossing = new AbsoluteDate("2012-01-07T11:21:15.000", TimeScalesFactory.getUTC());
+
+ // one line sensor
+ // position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
+ // los: swath in the (YZ) plane, centered at +Z, ±10° aperture, 960 pixels
+ Vector3D position = new Vector3D(1.5, 0, -0.2);
+ TimeDependentLOS los = TestUtils.createLOSPerfectLine(Vector3D.PLUS_K, Vector3D.PLUS_I,
+ FastMath.toRadians(10.0), dimension).build();
+
+ // linear datation model: at reference time we get line 200, and the rate is one line every 1.5ms
+ LineDatation lineDatation = new LinearLineDatation(crossing, dimension / 2, 1.0 / 1.5e-3);
+ int firstLine = 0;
+ int lastLine = dimension;
+ LineSensor lineSensor = new LineSensor("line", lineDatation, position, los);
+ AbsoluteDate minDate = lineSensor.getDate(firstLine);
+ AbsoluteDate maxDate = lineSensor.getDate(lastLine);
+
+ RuggedBuilder builder = new RuggedBuilder().
+ setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID).
+ setEllipsoid(EllipsoidId.IERS2003, BodyRotatingFrameId.ITRF).
+ setTimeSpan(minDate, maxDate, 0.001, 5.0).
+ setTrajectory(InertialFrameId.EME2000,
+ TestUtils.orbitToPV(orbit, earth, minDate.shiftedBy(-1.0), maxDate.shiftedBy(+1.0), 0.25),
+ 8, CartesianDerivativesFilter.USE_PV,
+ TestUtils.orbitToQ(orbit, earth, minDate.shiftedBy(-1.0), maxDate.shiftedBy(+1.0), 0.25),
+ 2, AngularDerivativesFilter.USE_R).
+ addLineSensor(lineSensor);
+
+ Rugged rugged = builder.build();
+
+
+ // Check builder
+ assertTrue(builder.getName().equalsIgnoreCase("Rugged"));
+
+ // Check a date in the range of minDate - maxDate
+ AbsoluteDate midddleDate = lineSensor.getDate((firstLine+lastLine)/2.);
+
+ assertTrue(rugged.isInRange(midddleDate));
+
+ // Get the algorithm
+ assertTrue(rugged.getAlgorithm().getClass().isInstance(new IgnoreDEMAlgorithm()));
+
+ // Change the min and max line in inverse location to update the SensorMeanPlaneCrossing when the planeCrossing is not null
+ int minLine = firstLine;
+ int maxLine = lastLine;
+ double line = (firstLine + lastLine)/2.;
+ double pixel = dimension/2.;
+ AbsoluteDate date = lineSensor.getDate(line);
+ Vector3D pixelLos = lineSensor.getLOS(date, pixel);
+ GeodeticPoint gp = rugged.directLocation(date, position, pixelLos);
+
+ SensorPixel sp = rugged.inverseLocation("line", gp, minLine, maxLine);
+ int minLineNew = minLine + 10;
+ int maxLineNew = maxLine - 10;
+ SensorPixel spChangeLines = rugged.inverseLocation("line", gp, minLineNew, maxLineNew);
+
+ assertEquals(sp.getPixelNumber(), spChangeLines.getPixelNumber(), 1.e-9);
+ assertEquals(sp.getLineNumber(), spChangeLines.getLineNumber(), 1.e-9);
+
+ // For computeInverseLocOnGridWithoutAtmosphere special cases
+ try {
+ java.lang.reflect.Method computeWithoutAtmosphere =
+ rugged.getClass().getDeclaredMethod("computeInverseLocOnGridWithoutAtmosphere",
+ GeodeticPoint[][].class,
+ Integer.TYPE, Integer.TYPE,
+ LineSensor.class, Integer.TYPE, Integer.TYPE);
+ computeWithoutAtmosphere.setAccessible(true);
+ final int nbPixelGrid = 2;
+ final int nbLineGrid = 2;
+ GeodeticPoint[][] groundGridWithAtmosphere = new GeodeticPoint[nbPixelGrid][nbLineGrid];
+ for (int i = 0; i < nbPixelGrid; i++) {
+ for (int j = 0; j < nbLineGrid; j++) {
+ groundGridWithAtmosphere[i][j] = null;
+ }
+ }
+
+ SensorPixel[][] spNull = (SensorPixel[][]) computeWithoutAtmosphere.invoke(rugged, groundGridWithAtmosphere, nbPixelGrid, nbLineGrid, lineSensor, minLine, maxLine);
+ for (int i = 0; i < nbPixelGrid; i++) {
+ for (int j = 0; j < nbLineGrid; j++) {
+ assertNull(spNull[i][j]);
+ }
+ }
+ } catch (NoSuchMethodException | SecurityException |
+ IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ Assert.fail(e.getLocalizedMessage());
+ }
+ }
+
@Before
- public void setUp() throws OrekitException, URISyntaxException {
+ public void setUp() throws URISyntaxException {
TestUtils.clearFactories();
}
}
diff --git a/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java b/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java
index d2c4dd1b021f8d05480f86b36dc496da62d6f3fd..a4b626afdf60bee541a3d1c59fe69af29c389fa6 100644
--- a/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java
+++ b/src/test/java/org/orekit/rugged/errors/DumpManagerTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -35,7 +35,6 @@ import org.orekit.bodies.BodyShape;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
-import org.orekit.errors.OrekitException;
import org.orekit.orbits.Orbit;
import org.orekit.rugged.TestUtils;
import org.orekit.rugged.api.AlgorithmId;
@@ -63,7 +62,7 @@ public class DumpManagerTest {
public TemporaryFolder tempFolder = new TemporaryFolder();
@Test
- public void testDump() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testDump() throws URISyntaxException, IOException {
File dump = tempFolder.newFile();
DumpManager.activate(dump);
@@ -146,7 +145,7 @@ public class DumpManagerTest {
}
public void variousRuggedCalls()
- throws RuggedException, OrekitException, URISyntaxException {
+ throws URISyntaxException {
int dimension = 200;
@@ -209,7 +208,7 @@ public class DumpManagerTest {
}
@Test
- public void testAlreadyActive() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testAlreadyActive() throws URISyntaxException, IOException {
DumpManager.activate(tempFolder.newFile());
try {
@@ -223,7 +222,7 @@ public class DumpManagerTest {
}
@Test
- public void testNotActive() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testNotActive() throws URISyntaxException, IOException {
try {
DumpManager.deactivate();
Assert.fail("an exception should have been thrown");
@@ -233,7 +232,7 @@ public class DumpManagerTest {
}
@Test
- public void testWriteError() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testWriteError() throws URISyntaxException, IOException {
try {
File dump = tempFolder.newFile();
dump.setReadOnly();
diff --git a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java
index dae89afafdda5056c77c504addee4ce205c9dfa2..6b75ff3c25d7e7899e6fa6d1e7039dac56508f67 100644
--- a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java
+++ b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,17 +17,31 @@
package org.orekit.rugged.errors;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
+import org.hipparchus.analysis.differentiation.DSFactory;
+import org.hipparchus.analysis.differentiation.DerivativeStructure;
+import org.hipparchus.geometry.euclidean.threed.FieldVector3D;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.junit.Assert;
import org.junit.Rule;
@@ -36,9 +50,13 @@ import org.junit.rules.TemporaryFolder;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
-import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.linesensor.SensorPixel;
+import org.orekit.rugged.refraction.MultiLayerModel;
+import org.orekit.rugged.utils.DSGenerator;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.time.TimeScalesFactory;
+import org.orekit.utils.ParameterDriver;
public class DumpReplayerTest {
@@ -46,7 +64,7 @@ public class DumpReplayerTest {
public TemporaryFolder tempFolder = new TemporaryFolder();
@Test
- public void testDirectLoc01() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testDirectLoc01() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -69,7 +87,7 @@ public class DumpReplayerTest {
}
@Test
- public void testDirectLoc02() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testDirectLoc02() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -92,7 +110,7 @@ public class DumpReplayerTest {
}
@Test
- public void testDirectLoc03() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testDirectLoc03() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -115,7 +133,7 @@ public class DumpReplayerTest {
}
@Test
- public void testDirectLoc04() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testDirectLoc04() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -146,7 +164,34 @@ public class DumpReplayerTest {
}
@Test
- public void testInverseLoc01() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testDirectLocNull() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // Create a dump file with NULL result for direct location
+ createDataForCreateRugged(bw);
+ bw.write("direct location: date 2012-01-01T12:29:30.85Z position 0.0e+00 0.0e+00 0.0e+00 " +
+ "los -2.2e-02 -9.1e-02 9.9e-01 lightTime false aberration false refraction false");
+ bw.newLine();
+ bw.write("direct location result: NULL");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+ DumpReplayer.Result[] results = replayer.execute(rugged);
+
+ assertTrue(results[0].getExpected() == null);
+ tempFile.delete();
+ }
+
+ @Test
+ public void testInverseLoc01() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -168,7 +213,7 @@ public class DumpReplayerTest {
}
@Test
- public void testInverseLoc02() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testInverseLoc02() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -190,7 +235,7 @@ public class DumpReplayerTest {
}
@Test
- public void testInverseLoc03() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testInverseLoc03() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -210,9 +255,33 @@ public class DumpReplayerTest {
}
}
-
+
@Test
- public void testCorruptedFiles() throws URISyntaxException, IOException, OrekitException, RuggedException {
+ public void testInverseLocNull() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // Create a dump file with NULL result for inverse location
+ createDataForInvLocResult(bw);
+ bw.write("inverse location result: NULL");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+ DumpReplayer.Result[] results = replayer.execute(rugged);
+
+ assertTrue(results[0].getExpected() == null);
+ tempFile.delete();
+ }
+
+ @Test
+ public void testCorruptedFiles() throws URISyntaxException, IOException {
String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
@@ -256,10 +325,393 @@ public class DumpReplayerTest {
Assert.assertEquals(i + 1, ((Integer) re.getParts()[0]).intValue());
Assert.assertEquals(corrupted, re.getParts()[1]);
}
+ corrupted.delete();
}
}
}
}
+ @Test
+ public void testDirectLocIssue376_01() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-Issue376-01.txt").toURI().getPath();
+
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(new File(dumpPath));
+ Rugged rugged = replayer.createRugged();
+ DumpReplayer.Result[] results = replayer.execute(rugged);
+
+ GeodeticPoint expectedGP = (GeodeticPoint) results[0].getExpected();
+ GeodeticPoint replayedGP = (GeodeticPoint) results[0].getReplayed();
+ double distance = Vector3D.distance(rugged.getEllipsoid().transform(expectedGP),
+ rugged.getEllipsoid().transform(replayedGP));
+ Assert.assertEquals(0.0, distance, 1.0e-8);
+ }
+
+ @Test
+ public void testDirectLocIssue376_02() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-Issue376-02.txt").toURI().getPath();
+
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(new File(dumpPath));
+ Rugged rugged = replayer.createRugged();
+ DumpReplayer.Result[] results = replayer.execute(rugged);
+
+ GeodeticPoint expectedGP = (GeodeticPoint) results[0].getExpected();
+ GeodeticPoint replayedGP = (GeodeticPoint) results[0].getReplayed();
+ double distance = Vector3D.distance(rugged.getEllipsoid().transform(expectedGP),
+ rugged.getEllipsoid().transform(replayedGP));
+ Assert.assertEquals(0.0, distance, 1.0e-8);
+ }
+
+ @Test
+ public void testDirectLocIssue376_03() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ String dumpPath = getClass().getClassLoader().getResource("replay/replay-direct-loc-Issue376-03.txt").toURI().getPath();
+
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(new File(dumpPath));
+ Rugged rugged = replayer.createRugged();
+ DumpReplayer.Result[] results = replayer.execute(rugged);
+
+ for (int i= 0; i < results.length; i++) {
+ GeodeticPoint expectedGP = (GeodeticPoint) results[i].getExpected();
+ GeodeticPoint replayedGP = (GeodeticPoint) results[i].getReplayed();
+ double distance = Vector3D.distance(rugged.getEllipsoid().transform(expectedGP),
+ rugged.getEllipsoid().transform(replayedGP));
+ Assert.assertEquals(0.0, distance, 5.0e-8);
+ }
+ }
+
+ @Test
+ public void testCreateRuggedWithAtmosphere() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // CreateRugged with atmospheric refraction
+ bw.write("direct location: date 2012-01-01T12:30:00.0Z position 1.5e+00 0.e+00 -2.e-01 "+
+ "los 0.e+00 -7.5e-01 6.5e-01 lightTime true aberration true refraction true");
+ bw.newLine();
+ createDataForCreateRugged(bw);
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+
+ assertTrue(rugged.getRefractionCorrection().getClass().isInstance(new MultiLayerModel(rugged.getEllipsoid())));
+ tempFile.delete();
+ }
+
+ @Test
+ public void testCreateRuggedNoDEMdata() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+
+ // CreateRugged with atmospheric refraction
+ bw.write("direct location: date 2012-01-01T12:30:00.0Z position 1.5e+00 0.e+00 -2.e-01 "+
+ "los 0.e+00 -7.5e-01 6.5e-01 lightTime true aberration true refraction false");
+ bw.newLine();
+ createDataForCreateRugged(bw);
+ bw.write("algorithm: DUVENHAGE");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(tempFile);
+ Rugged rugged = replayer.createRugged();
+
+ try {
+ replayer.execute(rugged);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ // as the execution stops in the TilesCache: one must reset the DumpManager state
+ DumpManager.endNicely();
+ Assert.assertEquals(RuggedMessages.NO_DEM_DATA, re.getSpecifier());
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testLineParserBadKey() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+ // this empty line to ensure coverage
+ bw.write("");
+ bw.newLine();
+ // LineParser.parse: case bad key
+ bw.write("dummy : dummy");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ try {
+ replayer.parse(tempFile);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.CANNOT_PARSE_LINE, re.getSpecifier());
+ Assert.assertEquals(2, ((Integer) re.getParts()[0]).intValue());
+ Assert.assertEquals(tempFile, re.getParts()[1]);
+ Assert.assertTrue(re.getParts()[2].toString().contains("dummy : dummy"));
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testLineParserEndColon() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+ // LineParser.parse: case colon at end of line
+ bw.write("direct location result:");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ try {
+ replayer.parse(tempFile);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.CANNOT_PARSE_LINE, re.getSpecifier());
+ Assert.assertEquals(1, ((Integer) re.getParts()[0]).intValue());
+ Assert.assertEquals(tempFile, re.getParts()[1]);
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testLineParserNoColon() throws URISyntaxException, IOException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ File tempFile = tempFolder.newFile();
+ try (FileOutputStream fos = new FileOutputStream(tempFile);
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+ BufferedWriter bw = new BufferedWriter(osw)) {
+ // LineParser.parse case no colon
+ bw.write("sensorName s0 nbPixels 200 position 1.5e+00 0.0e+00 -2.0e-01");
+ }
+ DumpReplayer replayer = new DumpReplayer();
+ try {
+ replayer.parse(tempFile);
+ Assert.fail("an exception should have been thrown");
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.CANNOT_PARSE_LINE, re.getSpecifier());
+ Assert.assertEquals(1, ((Integer) re.getParts()[0]).intValue());
+ Assert.assertEquals(tempFile, re.getParts()[1]);
+ }
+ tempFile.delete();
+ }
+
+ @Test
+ public void testParsedSensorGetDateGetLineCoverage() throws URISyntaxException, ClassNotFoundException, InstantiationException,
+ IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ // ParsedSensor inner class
+ Class<?> innerClass = Class.forName("org.orekit.rugged.errors.DumpReplayer$ParsedSensor");
+ Constructor<?>[] constructors = innerClass.getDeclaredConstructors();
+ constructors[0].setAccessible(true);
+ Object parsedSensor = constructors[0].newInstance("dummy");
+
+
+ Method getLine = innerClass.getDeclaredMethod("getLine", AbsoluteDate.class);
+ getLine.setAccessible(true);
+ Method getDate = innerClass.getDeclaredMethod("getDate", double.class);
+ getDate.setAccessible(true);
+ Method setDatation = innerClass.getDeclaredMethod("setDatation", double.class, AbsoluteDate.class);
+ setDatation.setAccessible(true);
+
+ // datation with only one data
+ AbsoluteDate date0 = new AbsoluteDate("2012-01-06T02:27:16.139", TimeScalesFactory.getUTC());
+ setDatation.invoke(parsedSensor, 100., date0);
+
+ AbsoluteDate date = date0.shiftedBy(5.);
+ double foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(100., foundLine, 1.e-15);
+
+ double line = 105.;
+ AbsoluteDate foundDate = (AbsoluteDate) getDate.invoke(parsedSensor, line);
+ assertEquals("2012-01-06T02:27:16.139",foundDate.toString(TimeScalesFactory.getUTC()));
+
+ // add datations data
+ AbsoluteDate date1 = date0.shiftedBy(10.);
+ AbsoluteDate date2 = date1.shiftedBy(10.);
+
+ setDatation.invoke(parsedSensor, 120., date1);
+ setDatation.invoke(parsedSensor, 150., date2);
+ foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(110., foundLine, 1.e-15);
+
+ date = date2.shiftedBy(5.);
+ foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(165., foundLine, 1.e-15);
+
+ date = date0.shiftedBy(-5.);
+ foundLine = (double) getLine.invoke(parsedSensor, date);
+ assertEquals(90., foundLine, 1.e-15);
+
+ }
+
+ @Test
+ public void testParsedSensorGetLOSCoverage() throws URISyntaxException, ClassNotFoundException, InstantiationException,
+ IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ // ParsedSensor inner class
+ Class<?> innerClass = Class.forName("org.orekit.rugged.errors.DumpReplayer$ParsedSensor");
+ Constructor<?>[] constructors = innerClass.getDeclaredConstructors();
+ constructors[0].setAccessible(true);
+ Object parsedSensor = constructors[0].newInstance("dummy");
+
+ AbsoluteDate date = new AbsoluteDate("2012-01-06T02:27:16.139", TimeScalesFactory.getUTC());
+
+ // ParsedSensor.getLOS RunTimeException
+ Method getLos = innerClass.getDeclaredMethod("getLOS", int.class, AbsoluteDate.class);
+ getLos.setAccessible(true);
+ try {
+ getLos.invoke(parsedSensor, 1, date);
+ Assert.fail("an exception should have been thrown");
+ } catch (InvocationTargetException ite) {
+ RuggedInternalError rie = (RuggedInternalError) ite.getTargetException();
+ assertEquals(RuggedMessages.INTERNAL_ERROR, rie.getSpecifier());
+ assertEquals("https://gitlab.orekit.org/orekit/rugged/issues", rie.getParts()[0]);
+ assertTrue(rie.getMessage(Locale.FRENCH).startsWith("erreur interne"));
+ }
+ }
+
+ @Test
+ public void testParsedSensorLOSCoverage() throws URISyntaxException, ClassNotFoundException, InstantiationException,
+ IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException, NoSuchMethodException, SecurityException {
+
+ String orekitPath = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(orekitPath)));
+
+ // ParsedSensor inner class
+ Class<?> innerClass = Class.forName("org.orekit.rugged.errors.DumpReplayer$ParsedSensor");
+ Constructor<?>[] constructors = innerClass.getDeclaredConstructors();
+ constructors[0].setAccessible(true);
+ Object parsedSensor = constructors[0].newInstance("dummy");
+
+ AbsoluteDate date0 = new AbsoluteDate("2012-01-06T02:27:16.139", TimeScalesFactory.getUTC());
+ AbsoluteDate date = date0.shiftedBy(5.);
+ AbsoluteDate date1 = date0.shiftedBy(10.);
+ AbsoluteDate date2 = date1.shiftedBy(10.);
+
+ // ParsedSensor.setLos
+ Method setLos = innerClass.getDeclaredMethod("setLOS", AbsoluteDate.class, int.class, Vector3D.class);
+ setLos.setAccessible(true);
+ setLos.invoke(parsedSensor, date, 1, new Vector3D(0, 0, 0));
+ setLos.invoke(parsedSensor, date1, 100, new Vector3D(1, 1, 1));
+ setLos.invoke(parsedSensor, date2, 200, new Vector3D(2, 2, 2));
+ setLos.invoke(parsedSensor, date2.shiftedBy(10.), 200, new Vector3D(3, 3, 3));
+
+ // ParsedSensor.getLOSDerivatives
+ // Needs some LOS to be set
+ Method getLOSDerivatives = innerClass.getDeclaredMethod("getLOSDerivatives", int.class, AbsoluteDate.class, DSGenerator.class);
+ getLOSDerivatives.setAccessible(true);
+
+ final DSFactory factory = new DSFactory(1, 1);
+ DSGenerator generator = new DSGenerator() {
+ @Override
+ public List<ParameterDriver> getSelected() {
+ return null;
+ }
+ @Override
+ public DerivativeStructure constant(final double value) {
+ return factory.constant(value);
+ }
+ @Override
+ public DerivativeStructure variable(final ParameterDriver driver) {
+ return null;
+ }
+ };
+ @SuppressWarnings("unchecked")
+ FieldVector3D<DerivativeStructure> fv= (FieldVector3D<DerivativeStructure>) getLOSDerivatives.invoke(parsedSensor, 1, date, generator);
+ assertEquals(0., fv.getX().getValue(), 1.e-15);
+ assertEquals(0., fv.getY().getValue(), 1.e-15);
+ assertEquals(0., fv.getZ().getValue(), 1.e-15);
+
+
+ // ParsedSensor.getParametersDrivers
+ Method getParametersDrivers = innerClass.getDeclaredMethod("getParametersDrivers");
+ getParametersDrivers.setAccessible(true);
+
+ getParametersDrivers.invoke(parsedSensor);
+ }
+
+ private void createDataForCreateRugged(BufferedWriter bw) throws IOException {
+
+ bw.write("ellipsoid: ae 6.378137e+06 f 3.35e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP");
+ bw.newLine();
+ bw.write("span: minDate 2012-01-01T12:29:00.85Z maxDate 2012-01-01T12:30:00.15Z " +
+ "tStep 1.e-03 tolerance 5.e+00 inertialFrame EME2000");
+ bw.newLine();
+ bw.write("transform: index 150 body r -8.0e-01 -3.4e-04 4.8e-04 -5.8e-01 Ω -8.7e-08 1.2e-09 -7.3e-05 " +
+ "ΩDot -1.6e-16 8.9e-17 1.9e-19 spacecraft p 1.3e+04 3.1e+03 -7.1e+06 v -3.1e+01 -8.0e+00 8.2e+00 " +
+ "a -9.3e-01 -8.3e+00 1.3e-03 r -6.8e-01 4.1e-01 -3.8e-01 4.6e-01 Ω -1.e-03 1.9e-04 1.6e-04 " +
+ "ΩDot -3.6e-07 2.0e-07 -1.2e-06");
+ bw.newLine();
+ }
+
+ private void createDataForInvLocResult(BufferedWriter bw) throws IOException {
+
+ bw.write("inverse location: sensorName s0 latitude 1.4e+00 longitude -8.8e-01 elevation 3.1e+01 minLine -23040 maxLine 39851 " +
+ "lightTime false aberration false refraction false");
+ bw.newLine();
+ bw.write("ellipsoid: ae 6.378e+06 f 3.35e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP");
+ bw.newLine();
+ bw.write("span: minDate 2015-07-07T18:38:55.0Z maxDate 2015-07-07T18:40:35.8Z tStep 1.e-01 tolerance 1.e+01 inertialFrame EME2000");
+ bw.newLine();
+ bw.write("transform: index 516 body r -2.2e-01 -7.3e-04 1.8e-04 -9.7e-01 Ω -1.1e-07 3.6e-09 -7.2e-05 " +
+ "ΩDot 0. 0. 0. spacecraft p -3.6e+02 -4.2e+02 -7.1e+06 v -7.4e+01 -3.4e+02 -1.8e-01 " +
+ "a 0. 0. 0. r -6.2e-02 7.4e-01 6.5e-01 4.1e-02 Ω 0. 0. 0. " +
+ "ΩDot 0. 0. 0.");
+ bw.newLine();
+ bw.write("sensor: sensorName s0 nbPixels 2552 position 0. 0. 0.");
+ bw.newLine();
+ bw.write("sensor mean plane: sensorName s0 minLine -23040 maxLine 39851 maxEval 50 accuracy 1.e-02 " +
+ "normal 9.e-01 -2.6e-02 1.8e-02 cachedResults 1 lineNumber 2.4e+04 date 2015-07-07T18:40:12.4Z " +
+ "target 5.8e+05 -7.1e+05 6.2e+06 targetDirection -1.5e-02 8.9e-02 9.9e-01 -2.0e-07 2.1e-08 -2.0e-07");
+ bw.newLine();
+ bw.write("sensor datation: sensorName s0 lineNumber 8.4e+03 date 2015-07-07T18:39:46.5Z");
+ bw.newLine();
+ bw.write("sensor rate: sensorName s0 lineNumber 2.4e+04 rate 6.3e+02");
+ bw.newLine();
+ }
}
diff --git a/src/test/java/org/orekit/rugged/errors/DumpTest.java b/src/test/java/org/orekit/rugged/errors/DumpTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a6d14929ec8524ac0a5df5b88dd6b2508c60ded8
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/errors/DumpTest.java
@@ -0,0 +1,158 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.errors;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DirectoryCrawler;
+import org.orekit.frames.Frame;
+import org.orekit.frames.FramesFactory;
+import org.orekit.frames.Transform;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.linesensor.SensorPixel;
+
+public class DumpTest {
+
+ @Rule
+ public TemporaryFolder tempFolder = new TemporaryFolder();
+
+ @Test
+ public void testGetKeyOrNameCoverage() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException {
+ File tempFile = tempFolder.newFile();
+ PrintWriter pw = new PrintWriter(tempFile, "UTF-8");
+ Dump dump = new Dump(pw);
+
+ Method getKeyOrName = dump.getClass().getDeclaredMethod("getKeyOrName", Frame.class);
+ getKeyOrName.setAccessible(true);
+
+ String dummyName = "dummy";
+ Frame frame = new Frame(FramesFactory.getEME2000(), Transform.IDENTITY, dummyName);
+
+ String foundName = (String) getKeyOrName.invoke(dump, frame);
+
+ assertTrue(foundName.equals(dummyName));
+ }
+
+ @Test
+ public void testInverseLocNull() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException {
+ File tempFile = tempFolder.newFile();
+ PrintWriter pw = new PrintWriter(tempFile, "UTF-8");
+ Dump dump = new Dump(pw);
+
+ Method dumpInverseLocationResult = dump.getClass().getDeclaredMethod("dumpInverseLocationResult", SensorPixel.class);
+ dumpInverseLocationResult.setAccessible(true);
+
+ SensorPixel px = null;
+ // just to ensure the test coverage
+ dumpInverseLocationResult.invoke(dump, px);
+
+ dump.deactivate();
+
+ // Check that the created file contains the line "inverse location result: NULL"
+ try (FileInputStream fis = new FileInputStream(tempFile);
+ InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(isr)) {
+ for (String line = br.readLine(); line != null; line = br.readLine()) {
+ final String trimmed = line.trim();
+ if (!(trimmed.length() == 0 || trimmed.startsWith("#"))) {
+ assertTrue(line.contains("inverse location result: NULL"));
+ }
+ }
+ }
+ }
+
+ @Test
+ public void testDirectLocNull() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException {
+ File tempFile = tempFolder.newFile();
+ PrintWriter pw = new PrintWriter(tempFile, "UTF-8");
+ Dump dump = new Dump(pw);
+
+ Method dumpDirectLocationResult = dump.getClass().getDeclaredMethod("dumpDirectLocationResult", GeodeticPoint.class);
+ dumpDirectLocationResult.setAccessible(true);
+
+ GeodeticPoint gp = null;
+ // just to ensure the coverage
+ dumpDirectLocationResult.invoke(dump, gp);
+ dump.deactivate();
+
+ // Check that the created file contains the line "inverse location result: NULL"
+ try (FileInputStream fis = new FileInputStream(tempFile);
+ InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(isr)) {
+ for (String line = br.readLine(); line != null; line = br.readLine()) {
+ final String trimmed = line.trim();
+ if (!(trimmed.length() == 0 || trimmed.startsWith("#"))) {
+ assertTrue(line.contains("direct location result: NULL"));
+ }
+ }
+ }
+ }
+
+ @Test
+ public void testSetMeanPlane() throws NoSuchMethodException, SecurityException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException, IOException, URISyntaxException {
+
+ 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-02.txt").toURI().getPath();
+
+ // Regenerate a dump in order to write the "sensor mean plane: sensorName xxx lineNumber xxx targetDirection xxx targetDirection xxx ...."
+ File dummyDump = tempFolder.newFile();
+ DumpManager.activate(dummyDump);
+
+ DumpReplayer replayer = new DumpReplayer();
+ replayer.parse(new File(dumpPath));
+ Rugged rugged = replayer.createRugged();
+ replayer.execute(rugged);
+
+ DumpManager.deactivate();
+
+ // Check that the created dump contains the line " lineNumber xxx targetDirection xxx targetDirection xxx ...."
+ try (FileInputStream fis = new FileInputStream(dummyDump);
+ InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
+ BufferedReader br = new BufferedReader(isr)) {
+ for (String line = br.readLine(); line != null; line = br.readLine()) {
+ final String trimmed = line.trim();
+ if (!(trimmed.length() == 0 || trimmed.startsWith("#"))) {
+ if (line.contains("lineNumber ")&& line.contains("targetDirection ")) {
+ assertTrue(line.split("targetDirection").length == 6);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java b/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java
index 5afc61f63150a19f857c6b5db61f3b2aa59da698..1a4025063a6aa4a172e8195e7d6fa56dba05b5d7 100644
--- a/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java
+++ b/src/test/java/org/orekit/rugged/errors/RuggedExceptionTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -63,10 +63,18 @@ public class RuggedExceptionTest {
@Test
public void testInternalError() {
RuggedException re = new RuggedException(RuggedMessages.DUPLICATED_PARAMETER_NAME, "dummy");
- RuntimeException rte = RuggedException.createInternalError(re);
- Assert.assertFalse(re.getLocalizedMessage().contains("rugged-developers@orekit.org"));
- Assert.assertTrue(rte.getLocalizedMessage().contains("rugged-developers@orekit.org"));
- Assert.assertTrue(rte.getMessage().contains("rugged-developers@orekit.org"));
+ RuntimeException rte = new RuggedInternalError(re);
+ Assert.assertFalse(re.getLocalizedMessage().contains("https://gitlab.orekit.org/orekit/rugged/issues"));
+ Assert.assertTrue(rte.getLocalizedMessage().contains("https://gitlab.orekit.org/orekit/rugged/issues"));
+ Assert.assertTrue(rte.getMessage().contains("https://gitlab.orekit.org/orekit/rugged/issues"));
}
+ @Deprecated
+ @Test
+ public void testCoverage() {
+ RuggedExceptionWrapper rew = new RuggedExceptionWrapper(new RuggedException(RuggedMessages.DUPLICATED_PARAMETER_NAME, "dummy"));
+ RuggedException re = rew.getException();
+ Assert.assertEquals(RuggedMessages.DUPLICATED_PARAMETER_NAME, re.getSpecifier());
+ Assert.assertEquals("dummy", re.getParts()[0]);
+ }
}
diff --git a/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java b/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java
index 9755c416a493521007cf6f6f4c2cb793cc4294bd..af285d19e697ed5a7933d9fd358c242608ed134e 100644
--- a/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java
+++ b/src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -30,7 +30,7 @@ public class RuggedMessagesTest {
private final String[] LANGUAGES_LIST = { "da", "de", "en", "es", "fr", "gl", "it", "no", "ro" } ;
@Test
public void testMessageNumber() {
- Assert.assertEquals(30, RuggedMessages.values().length);
+ Assert.assertEquals(33, RuggedMessages.values().length);
}
@Test
diff --git a/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
index 358458269b0acf2cb6bd276bd516becfc79b464a..b7741d2e56195829ff2ecaada0fc60d155f7c846 100644
--- a/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,13 +17,13 @@
package org.orekit.rugged.intersection;
+import java.io.File;
+import java.net.URISyntaxException;
+
import org.hipparchus.geometry.euclidean.threed.Line;
import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
-import java.io.File;
-import java.net.URISyntaxException;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -32,13 +32,10 @@ import org.orekit.attitudes.Attitude;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.FramesFactory;
import org.orekit.frames.Transform;
import org.orekit.orbits.CartesianOrbit;
import org.orekit.propagation.SpacecraftState;
-import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.intersection.duvenhage.MinMaxTreeTile;
import org.orekit.rugged.intersection.duvenhage.MinMaxTreeTileFactory;
import org.orekit.rugged.raster.CliffsElevationUpdater;
@@ -56,8 +53,7 @@ public abstract class AbstractAlgorithmTest {
protected abstract IntersectionAlgorithm createAlgorithm(TileUpdater updater, int maxCachedTiles);
@Test
- public void testMayonVolcanoOnSubTileCorner()
- throws RuggedException, OrekitException {
+ public void testMayonVolcanoOnSubTileCorner() {
setUpMayonVolcanoContext();
@@ -94,8 +90,7 @@ public abstract class AbstractAlgorithmTest {
}
@Test
- public void testMayonVolcanoWithinPixel()
- throws RuggedException, OrekitException {
+ public void testMayonVolcanoWithinPixel() {
setUpMayonVolcanoContext();
@@ -121,7 +116,7 @@ public abstract class AbstractAlgorithmTest {
@Test
public void testCliffsOfMoher()
- throws RuggedException, OrekitException {
+ {
setUpCliffsOfMoherContext();
@@ -135,6 +130,8 @@ public abstract class AbstractAlgorithmTest {
Vector3D groundP = earth.transform(groundGP);
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
+ Assert.assertEquals( 0.0, algorithm.getElevation(latitude, longitude - 2.0e-5), 1.0e-6);
+ Assert.assertEquals(120.0, algorithm.getElevation(latitude, longitude + 2.0e-5), 1.0e-6);
// preliminary check: the point has been chosen in the spacecraft (YZ) plane
Transform earthToSpacecraft = new Transform(state.getDate(),
@@ -154,8 +151,7 @@ public abstract class AbstractAlgorithmTest {
}
- protected void checkIntersection(Vector3D position, Vector3D los, GeodeticPoint intersection)
- throws RuggedException {
+ protected void checkIntersection(Vector3D position, Vector3D los, GeodeticPoint intersection) {
// check the point is on the line
Line line = new Line(position, new Vector3D(1, position, 1e6, los), 1.0e-12);
@@ -170,7 +166,7 @@ public abstract class AbstractAlgorithmTest {
}
protected void setUpMayonVolcanoContext()
- throws RuggedException, OrekitException {
+ {
// Mayon Volcano location according to Wikipedia: 13°15′24″N 123°41′6″E
GeodeticPoint summit =
@@ -218,7 +214,7 @@ public abstract class AbstractAlgorithmTest {
}
protected void setUpCliffsOfMoherContext()
- throws RuggedException, OrekitException {
+ {
// cliffs of Moher location according to Wikipedia: 52°56′10″N 9°28′15″ W
GeodeticPoint north = new GeodeticPoint(FastMath.toRadians(52.9984),
@@ -272,8 +268,8 @@ public abstract class AbstractAlgorithmTest {
}
@Before
- public void setUp()
- throws OrekitException, URISyntaxException {
+ public void setUp() throws URISyntaxException {
+
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
earth = new ExtendedEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
diff --git a/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
index 443927f729c1bdd85dfbb8bc4cf737e134b79beb..a5bfe3a1a3cf8abe812a013ab9798a7f7368c36f 100644
--- a/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java
index 976d44f739829029c83a152396a00158e7733b42..a9360c60fcd29b9cd8aef268bb98a6db60b7da66 100644
--- a/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/ConstantElevationAlgorithmTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,12 +17,12 @@
package org.orekit.rugged.intersection;
-import org.hipparchus.geometry.euclidean.threed.Rotation;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.util.FastMath;
import java.io.File;
import java.net.URISyntaxException;
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -30,11 +30,9 @@ import org.junit.Test;
import org.orekit.attitudes.Attitude;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.FramesFactory;
import org.orekit.orbits.CartesianOrbit;
import org.orekit.propagation.SpacecraftState;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.intersection.duvenhage.DuvenhageAlgorithm;
import org.orekit.rugged.raster.CheckedPatternElevationUpdater;
import org.orekit.rugged.raster.TileUpdater;
@@ -49,7 +47,7 @@ import org.orekit.utils.PVCoordinates;
public class ConstantElevationAlgorithmTest {
@Test
- public void testDuvenhageComparison() throws RuggedException {
+ public void testDuvenhageComparison() {
final Vector3D los = new Vector3D(-0.626242839, 0.0124194184, -0.7795291301);
IntersectionAlgorithm duvenhage = new DuvenhageAlgorithm(new CheckedPatternElevationUpdater(FastMath.toRadians(1.0),
256, 150.0, 150.0),
@@ -74,7 +72,7 @@ public class ConstantElevationAlgorithmTest {
}
@Test
- public void testIgnoreDEMComparison() throws RuggedException {
+ public void testIgnoreDEMComparison() {
final Vector3D los = new Vector3D(-0.626242839, 0.0124194184, -0.7795291301);
IntersectionAlgorithm ignore = new IgnoreDEMAlgorithm();
IntersectionAlgorithm constantElevation = new ConstantElevationAlgorithm(0.0);
@@ -94,11 +92,13 @@ public class ConstantElevationAlgorithmTest {
2 * FastMath.PI));
Assert.assertEquals(2 * FastMath.PI + gpConst.getLongitude(), shifted.getLongitude(), 1.0e-6);
+ // Simple test for test coverage purpose
+ double elevation0 = ignore.getElevation(gpRef.getLatitude(), gpConst.getLatitude());
+ Assert.assertEquals(elevation0, 0.0, 1.e-15);
}
@Before
- public void setUp()
- throws OrekitException, URISyntaxException {
+ public void setUp() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
earth = new ExtendedEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
diff --git a/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
index cf512a6c3468fefbf77ee8a86a9feca9a7bb37bb..9a23632c14f3fba5cffb2bb51c264f8a79c5b3c5 100644
--- a/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -45,7 +45,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
@Test
- public void testNumericalIssueAtTileExit() throws RuggedException, OrekitException {
+ public void testNumericalIssueAtTileExit() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
@@ -56,7 +56,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
@Test
- public void testCrossingBeforeLineSegmentStart() throws RuggedException, OrekitException {
+ public void testCrossingBeforeLineSegmentStart() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
Vector3D position = new Vector3D(-3787079.6453602533, 5856784.405679551, 1655869.0582939098);
@@ -67,7 +67,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
@Test
- public void testWrongPositionMissesGround() throws RuggedException, OrekitException {
+ public void testWrongPositionMissesGround() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
Vector3D position = new Vector3D(7.551889113912788E9, -3.173692685491814E10, 1.5727517321541348E9);
@@ -81,12 +81,12 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
@Test
- public void testInconsistentTileUpdater() throws RuggedException, OrekitException {
+ public void testInconsistentTileUpdater() {
final int n = 1201;
final double size = FastMath.toRadians(1.0);
updater = new TileUpdater() {
- public void updateTile(double latitude, double longitude, UpdatableTile tile)
- throws RuggedException {
+ public void updateTile(double latitude, double longitude, UpdatableTile tile) {
+
double step = size / (n - 1);
// this geometry is incorrect:
// the specified latitude/longitude belong to rows/columns [1, n-1]
@@ -112,7 +112,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
@Test
- public void testPureEastWestLOS() throws RuggedException, OrekitException {
+ public void testPureEastWestLOS() {
updater = new CheckedPatternElevationUpdater(FastMath.toRadians(1.0),1201, 41.0, 1563.0);
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
NormalizedGeodeticPoint gp =
@@ -123,7 +123,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
@Test
- public void testParallelLOS() throws RuggedException, OrekitException {
+ public void testParallelLOS() {
double size = 0.125;
int n = 129;
double elevation1 = 0.0;
@@ -192,8 +192,7 @@ public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
}
- private NormalizedGeodeticPoint findExit(IntersectionAlgorithm algorithm, Tile tile, Vector3D position, Vector3D los)
- throws RuggedException, OrekitException {
+ private NormalizedGeodeticPoint findExit(IntersectionAlgorithm algorithm, Tile tile, Vector3D position, Vector3D los) {
try {
Method findExit = DuvenhageAlgorithm.class.getDeclaredMethod("findExit",
diff --git a/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
index 77cf236a8bf6c5db6b40e8b9a1675303fb9bad3c..78b87a5278febd633fa0bcb9d7fc9a27ec933008 100644
--- a/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -19,17 +19,20 @@ package org.orekit.rugged.intersection.duvenhage;
import org.hipparchus.random.RandomGenerator;
import org.hipparchus.random.Well1024a;
import org.hipparchus.util.FastMath;
+
+import java.io.IOException;
import java.lang.reflect.Field;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
-import org.orekit.rugged.errors.RuggedException;
+import org.junit.rules.TemporaryFolder;
public class MinMaxTreeTileTest {
@Test
public void testSizeTall()
- throws RuggedException, SecurityException, NoSuchFieldException,
+ throws SecurityException, NoSuchFieldException,
IllegalArgumentException, IllegalAccessException {
MinMaxTreeTile tile = createTile(107, 19);
Assert.assertEquals(9, tile.getLevels());
@@ -68,7 +71,7 @@ public class MinMaxTreeTileTest {
@Test
public void testSizeFat()
- throws RuggedException, SecurityException, NoSuchFieldException,
+ throws SecurityException, NoSuchFieldException,
IllegalArgumentException, IllegalAccessException {
MinMaxTreeTile tile = createTile(4, 7);
Assert.assertEquals(4, tile.getLevels());
@@ -96,12 +99,12 @@ public class MinMaxTreeTileTest {
}
@Test
- public void testSinglePixel() throws RuggedException {
+ public void testSinglePixel() {
Assert.assertEquals(0, createTile(1, 1).getLevels());
}
@Test
- public void testMinMax() throws RuggedException {
+ public void testMinMax() {
for (int nbRows = 1; nbRows < 25; nbRows++) {
for (int nbColumns = 1; nbColumns < 25; nbColumns++) {
@@ -133,7 +136,7 @@ public class MinMaxTreeTileTest {
}
@Test
- public void testLocateMinMax() throws RuggedException {
+ public void testLocateMinMax() {
RandomGenerator random = new Well1024a(0xca9883209c6e740cl);
for (int nbRows = 1; nbRows < 25; nbRows++) {
for (int nbColumns = 1; nbColumns < 25; nbColumns++) {
@@ -167,7 +170,7 @@ public class MinMaxTreeTileTest {
}
@Test
- public void testIssue189() throws RuggedException {
+ public void testIssue189() {
MinMaxTreeTile tile = new MinMaxTreeTileFactory().createTile();
tile.setGeometry(1.0, 2.0, 0.1, 0.2, 2, 2);
tile.setElevation(0, 0, 1.0);
@@ -182,14 +185,14 @@ public class MinMaxTreeTileTest {
}
@Test
- public void testMergeLarge() throws RuggedException {
+ public void testMergeLarge() {
MinMaxTreeTile tile = createTile(1201, 1201);
Assert.assertEquals(21, tile.getLevels());
Assert.assertEquals( 7, tile.getMergeLevel(703, 97, 765, 59));
}
@Test
- public void testMergeLevel() throws RuggedException {
+ public void testMergeLevel() {
for (int nbRows = 1; nbRows < 20; nbRows++) {
for (int nbColumns = 1; nbColumns < 20; nbColumns++) {
@@ -236,7 +239,7 @@ public class MinMaxTreeTileTest {
}
@Test
- public void testSubTilesLimits() throws RuggedException {
+ public void testSubTilesLimits() {
for (int nbRows = 1; nbRows < 25; nbRows++) {
for (int nbColumns = 1; nbColumns < 25; nbColumns++) {
@@ -265,6 +268,17 @@ public class MinMaxTreeTileTest {
}
}
+ @Test
+ public void testForCoverage() throws IOException {
+
+ org.orekit.rugged.errors.DumpManager.activate(tempFolder.newFile());
+
+ MinMaxTreeTile tile = createTile(1201, 1201);
+ tile.getMinElevation(100, 100, 0);
+
+ org.orekit.rugged.errors.DumpManager.deactivate();
+ }
+
private int[] neighbors(int row, int column, int nbRows, int nbColumns, int stages) {
// poor man identification of neighbors cells merged together with specified cell
@@ -335,7 +349,7 @@ public class MinMaxTreeTileTest {
}
- private MinMaxTreeTile createTile(int nbRows, int nbColumns) throws RuggedException {
+ private MinMaxTreeTile createTile(int nbRows, int nbColumns) {
MinMaxTreeTile tile = new MinMaxTreeTileFactory().createTile();
tile.setGeometry(1.0, 2.0, 0.1, 0.2, nbRows, nbColumns);
for (int i = 0; i < nbRows; ++i) {
@@ -346,5 +360,8 @@ public class MinMaxTreeTileTest {
tile.tileUpdateCompleted();
return tile;
}
+
+ @Rule
+ public TemporaryFolder tempFolder = new TemporaryFolder();
}
diff --git a/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java b/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java
index 946e1f0d9c027303989f128c4bcb885547488765..571c8ac85a1978a567dda09f599008838d56890f 100644
--- a/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java
+++ b/src/test/java/org/orekit/rugged/linesensor/FixedRotationTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -37,9 +37,6 @@ import org.hipparchus.util.FastMath;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.los.FixedRotation;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.TimeDependentLOS;
@@ -52,7 +49,7 @@ public class FixedRotationTest {
private List<Vector3D> raw;
@Test
- public void testIdentity() throws RuggedException, OrekitException {
+ public void testIdentity() {
UniformRandomGenerator rng = new UniformRandomGenerator(new Well19937a(0xaba71348a77d77cbl));
UncorrelatedRandomVectorGenerator rvg = new UncorrelatedRandomVectorGenerator(3, rng);
for (int k = 0; k < 20; ++k) {
@@ -74,7 +71,7 @@ public class FixedRotationTest {
}
@Test
- public void testCombination() throws RuggedException, OrekitException {
+ public void testCombination() {
UniformRandomGenerator rng = new UniformRandomGenerator(new Well19937a(0xefac03d9be4d24b9l));
UncorrelatedRandomVectorGenerator rvg = new UncorrelatedRandomVectorGenerator(3, rng);
for (int k = 0; k < 20; ++k) {
@@ -139,7 +136,7 @@ public class FixedRotationTest {
}
@Test
- public void testDerivatives() throws RuggedException, OrekitException {
+ public void testDerivatives() {
UniformRandomGenerator rng = new UniformRandomGenerator(new Well19937a(0xddae2b46b2207e08l));
UncorrelatedRandomVectorGenerator rvg = new UncorrelatedRandomVectorGenerator(3, rng);
for (int k = 0; k < 20; ++k) {
@@ -199,20 +196,16 @@ public class FixedRotationTest {
int[] orders = new int[selected.size()];
orders[index] = 1;
UnivariateDifferentiableMatrixFunction f =
- differentiator.differentiate((UnivariateMatrixFunction) x -> {
- try {
- double oldX = driver.getValue();
- double[][] matrix = new double[raw.size()][];
- driver.setValue(x);
- for (int i = 0 ; i < raw.size(); ++i) {
- matrix[i] = tdl.getLOS(i, AbsoluteDate.J2000_EPOCH).toArray();
- }
- driver.setValue(oldX);
- return matrix;
- } catch (OrekitException oe) {
- throw new OrekitExceptionWrapper(oe);
- }
- });
+ differentiator.differentiate((UnivariateMatrixFunction) x -> {
+ double oldX = driver.getValue();
+ double[][] matrix = new double[raw.size()][];
+ driver.setValue(x);
+ for (int i = 0 ; i < raw.size(); ++i) {
+ matrix[i] = tdl.getLOS(i, AbsoluteDate.J2000_EPOCH).toArray();
+ }
+ driver.setValue(oldX);
+ return matrix;
+ });
DerivativeStructure[][] mDS = f.value(factory11.variable(0, driver.getValue()));
for (int i = 0; i < raw.size(); ++i) {
Vector3D los = tdl.getLOS(i, AbsoluteDate.J2000_EPOCH);
@@ -232,7 +225,7 @@ public class FixedRotationTest {
}
@Before
- public void setUp() throws OrekitException, URISyntaxException {
+ public void setUp() throws URISyntaxException {
final Vector3D normal = Vector3D.PLUS_I;
final Vector3D fovCenter = Vector3D.PLUS_K;
diff --git a/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java b/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java
index 2734af05eefd0d8ec6036be4de04915112746dd2..7c095bfd2bef5ea8c373887400bc5db22143baa1 100644
--- a/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java
+++ b/src/test/java/org/orekit/rugged/linesensor/PolynomialRotationTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -38,9 +38,6 @@ import org.hipparchus.util.FastMath;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.los.PolynomialRotation;
import org.orekit.rugged.los.TimeDependentLOS;
@@ -53,7 +50,7 @@ public class PolynomialRotationTest {
private List<Vector3D> raw;
@Test
- public void testIdentity() throws RuggedException, OrekitException {
+ public void testIdentity() {
UniformRandomGenerator rng = new UniformRandomGenerator(new Well19937a(0xbe0d9b530fe7f53cl));
UncorrelatedRandomVectorGenerator rvg = new UncorrelatedRandomVectorGenerator(3, rng);
for (int k = 0; k < 20; ++k) {
@@ -75,7 +72,7 @@ public class PolynomialRotationTest {
}
@Test
- public void testFixedCombination() throws RuggedException, OrekitException {
+ public void testFixedCombination() {
UniformRandomGenerator rng = new UniformRandomGenerator(new Well19937a(0xdc4cfdea38edd2bbl));
UncorrelatedRandomVectorGenerator rvg = new UncorrelatedRandomVectorGenerator(3, rng);
for (int k = 0; k < 20; ++k) {
@@ -146,7 +143,7 @@ public class PolynomialRotationTest {
}
@Test
- public void testDerivatives() throws RuggedException, OrekitException {
+ public void testDerivatives() {
UniformRandomGenerator rng = new UniformRandomGenerator(new Well19937a(0xc60acfc04eb27935l));
UncorrelatedRandomVectorGenerator rvg = new UncorrelatedRandomVectorGenerator(3, rng);
for (int k = 0; k < 20; ++k) {
@@ -216,20 +213,16 @@ public class PolynomialRotationTest {
int[] orders = new int[selected.size()];
orders[index] = 1;
UnivariateDifferentiableMatrixFunction f =
- differentiator.differentiate((UnivariateMatrixFunction) x -> {
- try {
- double oldX = driver.getValue();
- double[][] matrix = new double[raw.size()][];
- driver.setValue(x);
- for (int i = 0 ; i < raw.size(); ++i) {
- matrix[i] = tdl.getLOS(i, date).toArray();
- }
- driver.setValue(oldX);
- return matrix;
- } catch (OrekitException oe) {
- throw new OrekitExceptionWrapper(oe);
- }
- });
+ differentiator.differentiate((UnivariateMatrixFunction) x -> {
+ double oldX = driver.getValue();
+ double[][] matrix = new double[raw.size()][];
+ driver.setValue(x);
+ for (int i = 0 ; i < raw.size(); ++i) {
+ matrix[i] = tdl.getLOS(i, date).toArray();
+ }
+ driver.setValue(oldX);
+ return matrix;
+ });
DerivativeStructure[][] mDS = f.value(factory11.variable(0, driver.getValue()));
for (int i = 0; i < raw.size(); ++i) {
Vector3D los = tdl.getLOS(i, date);
@@ -248,7 +241,7 @@ public class PolynomialRotationTest {
}
@Before
- public void setUp() throws OrekitException, URISyntaxException {
+ public void setUp() throws URISyntaxException {
final Vector3D normal = Vector3D.PLUS_I;
final Vector3D fovCenter = Vector3D.PLUS_K;
diff --git a/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java b/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
index b045b92f68c5d1adb597a0d5a49d4a7e2a8a728a..d80aa5d8805ef42cf844053b6bad383326dcbddf 100644
--- a/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
+++ b/src/test/java/org/orekit/rugged/linesensor/SensorMeanPlaneCrossingTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,11 +16,6 @@
*/
package org.orekit.rugged.linesensor;
-import org.hipparchus.geometry.euclidean.threed.Line;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.random.RandomGenerator;
-import org.hipparchus.random.Well19937a;
-import org.hipparchus.util.FastMath;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -28,6 +23,11 @@ import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
+import org.hipparchus.geometry.euclidean.threed.Line;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.random.RandomGenerator;
+import org.hipparchus.random.Well19937a;
+import org.hipparchus.util.FastMath;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -38,7 +38,6 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.bodies.OneAxisEllipsoid;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
-import org.orekit.errors.OrekitException;
import org.orekit.frames.FramesFactory;
import org.orekit.frames.Transform;
import org.orekit.orbits.CircularOrbit;
@@ -49,7 +48,6 @@ import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.analytical.KeplerianPropagator;
import org.orekit.propagation.sampling.OrekitFixedStepHandler;
import org.orekit.rugged.TestUtils;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.linesensor.SensorMeanPlaneCrossing.CrossingResult;
import org.orekit.rugged.los.LOSBuilder;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
@@ -65,7 +63,7 @@ import org.orekit.utils.TimeStampedPVCoordinates;
public class SensorMeanPlaneCrossingTest {
@Test
- public void testPerfectLine() throws RuggedException, OrekitException {
+ public void testPerfectLine() {
final Vector3D position = new Vector3D(1.5, Vector3D.PLUS_I);
final Vector3D normal = Vector3D.PLUS_I;
@@ -94,7 +92,7 @@ public class SensorMeanPlaneCrossingTest {
}
@Test
- public void testNoisyLine() throws RuggedException, OrekitException {
+ public void testNoisyLine() {
final RandomGenerator random = new Well19937a(0xf3ddb33785e12bdal);
final Vector3D position = new Vector3D(1.5, Vector3D.PLUS_I);
@@ -129,29 +127,29 @@ public class SensorMeanPlaneCrossingTest {
}
@Test
- public void testDerivativeWithoutCorrections() throws RuggedException, OrekitException {
+ public void testDerivativeWithoutCorrections() {
doTestDerivative(false, false, 3.1e-11);
}
@Test
- public void testDerivativeLightTimeCorrection() throws RuggedException, OrekitException {
+ public void testDerivativeLightTimeCorrection() {
doTestDerivative(true, false, 2.4e-7);
}
@Test
- public void testDerivativeAberrationOfLightCorrection() throws RuggedException, OrekitException {
+ public void testDerivativeAberrationOfLightCorrection() {
doTestDerivative(false, true, 1.1e-7);
}
@Test
- public void testDerivativeWithAllCorrections() throws RuggedException, OrekitException {
+ public void testDerivativeWithAllCorrections() {
doTestDerivative(true, true, 1.4e-7);
}
private void doTestDerivative(boolean lightTimeCorrection,
boolean aberrationOfLightCorrection,
double tol)
- throws RuggedException, OrekitException {
+ {
final Vector3D position = new Vector3D(1.5, Vector3D.PLUS_I);
final Vector3D normal = Vector3D.PLUS_I;
@@ -223,7 +221,7 @@ public class SensorMeanPlaneCrossingTest {
@Test
public void testSlowFind()
- throws RuggedException, OrekitException, NoSuchMethodException,
+ throws NoSuchMethodException,
SecurityException, IllegalAccessException, IllegalArgumentException,
InvocationTargetException {
@@ -287,8 +285,8 @@ public class SensorMeanPlaneCrossingTest {
1.0e-15);
}
- private SpacecraftToObservedBody createInterpolator(LineSensor sensor)
- throws RuggedException, OrekitException {
+ private SpacecraftToObservedBody createInterpolator(LineSensor sensor) {
+
Orbit orbit = new CircularOrbit(7173352.811913891,
-4.029194321683225E-4, 0.0013530362644647786,
FastMath.toRadians(98.63218182243709),
@@ -312,8 +310,8 @@ public class SensorMeanPlaneCrossingTest {
private List<TimeStampedPVCoordinates> orbitToPV(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
- double step)
- throws OrekitException {
+ double step) {
+
Propagator propagator = new KeplerianPropagator(orbit);
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
@@ -332,8 +330,8 @@ public class SensorMeanPlaneCrossingTest {
private List<TimeStampedAngularCoordinates> orbitToQ(Orbit orbit, BodyShape earth,
AbsoluteDate minDate, AbsoluteDate maxDate,
- double step)
- throws OrekitException {
+ double step) {
+
Propagator propagator = new KeplerianPropagator(orbit);
propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
propagator.propagate(minDate);
@@ -350,7 +348,7 @@ public class SensorMeanPlaneCrossingTest {
}
@Before
- public void setUp() throws OrekitException, URISyntaxException {
+ public void setUp() throws URISyntaxException {
TestUtils.clearFactories();
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
diff --git a/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
index ab813e9996269df3c56a0c57ad002788175b73ac..f450c008ba370290e35c4d335ed8839a9403b928 100644
--- a/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,7 +17,6 @@
package org.orekit.rugged.raster;
import org.hipparchus.util.FastMath;
-import org.orekit.rugged.errors.RuggedException;
public class CheckedPatternElevationUpdater implements TileUpdater {
@@ -33,8 +32,8 @@ public class CheckedPatternElevationUpdater implements TileUpdater {
this.elevation2 = elevation2;
}
- public void updateTile(double latitude, double longitude, UpdatableTile tile)
- throws RuggedException {
+ public void updateTile(double latitude, double longitude, UpdatableTile tile) {
+
double step = size / (n - 1);
double minLatitude = size * FastMath.floor(latitude / size);
double minLongitude = size * FastMath.floor(longitude / size);
diff --git a/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
index f9d1befe2b3fb7647e550a8ac8af39b138efaa83..0a5e9b9bc54d5275d4304dd8b2ac8cfceb573cfe 100644
--- a/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -18,7 +18,6 @@ package org.orekit.rugged.raster;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.rugged.errors.RuggedException;
public class CliffsElevationUpdater implements TileUpdater {
@@ -40,8 +39,8 @@ public class CliffsElevationUpdater implements TileUpdater {
this.n = n;
}
- public void updateTile(double latitude, double longitude, UpdatableTile tile)
- throws RuggedException {
+ public void updateTile(double latitude, double longitude, UpdatableTile tile) {
+
double step = size / (n - 1);
double minLatitude = size * FastMath.floor(latitude / size);
double minLongitude = size * FastMath.floor(longitude / size);
diff --git a/src/test/java/org/orekit/rugged/raster/CountingFactory.java b/src/test/java/org/orekit/rugged/raster/CountingFactory.java
index dd903def9361ea0a549118e0b9b7bbe04e859385..7256f0e59f250cd23f4ca78f39bd1429419334c9 100644
--- a/src/test/java/org/orekit/rugged/raster/CountingFactory.java
+++ b/src/test/java/org/orekit/rugged/raster/CountingFactory.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
index 0cf94ac1935cb1a4c33bcdd79fc7ce15f29017e4..0b29e0b8552be6bbd23deea2acacf0ae84a7d272 100644
--- a/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,7 +22,6 @@ import org.hipparchus.random.RandomGenerator;
import org.hipparchus.random.Well19937a;
import org.hipparchus.util.ArithmeticUtils;
import org.hipparchus.util.FastMath;
-import org.orekit.rugged.errors.RuggedException;
public class RandomLandscapeUpdater implements TileUpdater {
@@ -30,9 +29,16 @@ public class RandomLandscapeUpdater implements TileUpdater {
private int n;
private double[][] heightMap;
+ /**
+ * @param baseH elevation of the base of DEM; unit = m
+ * @param initialScale
+ * @param reductionFactor for smoothing for low value (0.1) or not (0.5 for instance) the landscape
+ * @param seed
+ * @param size size in latitude / size in longitude (rad)
+ * @param n number of latitude / number of longitude
+ */
public RandomLandscapeUpdater(double baseH, double initialScale, double reductionFactor,
- long seed, double size, int n)
- throws MathIllegalArgumentException {
+ long seed, double size, int n) {
if (!ArithmeticUtils.isPowerOfTwo(n - 1)) {
throw new MathIllegalArgumentException(LocalizedCoreFormats.SIMPLE_MESSAGE,
@@ -98,9 +104,8 @@ public class RandomLandscapeUpdater implements TileUpdater {
}
@Override
- public void updateTile(double latitude, double longitude, UpdatableTile tile)
- throws RuggedException {
-
+ public void updateTile(double latitude, double longitude, UpdatableTile tile) {
+
double step = size / (n - 1);
double minLatitude = size * FastMath.floor(latitude / size);
double minLongitude = size * FastMath.floor(longitude / size);
@@ -110,7 +115,6 @@ public class RandomLandscapeUpdater implements TileUpdater {
tile.setElevation(i, j, heightMap[i][j]);
}
}
-
}
private double mean(int i1, int j1, int i2, int j2, int i3, int j3, int i4, int j4) {
diff --git a/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java b/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
index 5d7f96db7ae10cd48cb0593c6071c1ffc274a24d..ceea009d15237ab357a189734d03c1a57eeea58f 100644
--- a/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
+++ b/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -65,7 +65,7 @@ public class SimpleTileTest {
}
@Test
- public void testUpdate() throws RuggedException {
+ public void testUpdate() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(1.0, 2.0, 0.1, 0.2, 100, 200);
@@ -103,7 +103,7 @@ public class SimpleTileTest {
}
@Test
- public void testOutOfBoundsIndices() throws RuggedException {
+ public void testOutOfBoundsIndices() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(1.0, 2.0, 0.1, 0.2, 100, 200);
@@ -116,7 +116,7 @@ public class SimpleTileTest {
}
@Test
- public void testIndexShift() throws RuggedException {
+ public void testIndexShift() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(1.0, 2.0, 0.1, 0.2, 100, 200);
@@ -164,7 +164,7 @@ public class SimpleTileTest {
}
@Test
- public void testInterpolation() throws RuggedException {
+ public void testInterpolation() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 1.0, 1.0, 50, 50);
tile.setElevation(20, 14, 91.0);
@@ -179,7 +179,7 @@ public class SimpleTileTest {
}
@Test
- public void testInterpolationWithinTolerance() throws RuggedException {
+ public void testInterpolationWithinTolerance() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 1.0, 1.0, 2, 2);
tile.setElevation(0, 0, 91.0);
@@ -195,7 +195,7 @@ public class SimpleTileTest {
}
@Test
- public void testInterpolationOutOfTolerance() throws RuggedException {
+ public void testInterpolationOutOfTolerance() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 1.0, 1.0, 2, 2);
tile.setElevation(0, 0, 91.0);
@@ -211,7 +211,7 @@ public class SimpleTileTest {
}
@Test
- public void testCellIntersection() throws RuggedException {
+ public void testCellIntersection() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
tile.setElevation(20, 14, 91.0);
@@ -239,7 +239,7 @@ public class SimpleTileTest {
}
@Test
- public void testCellIntersection2Solutions() throws RuggedException {
+ public void testCellIntersection2Solutions() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
tile.setElevation(20, 14, 91.0);
@@ -270,7 +270,7 @@ public class SimpleTileTest {
}
@Test
- public void testCellIntersectionNoSolutions() throws RuggedException {
+ public void testCellIntersectionNoSolutions() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
tile.setElevation(20, 14, 91.0);
@@ -290,7 +290,7 @@ public class SimpleTileTest {
}
@Test
- public void testCellIntersectionLinearOnly() throws RuggedException {
+ public void testCellIntersectionLinearOnly() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
tile.setElevation(0, 0, 30.0);
@@ -319,7 +319,7 @@ public class SimpleTileTest {
}
@Test
- public void testCellIntersectionLinearIntersectionOutside() throws RuggedException {
+ public void testCellIntersectionLinearIntersectionOutside() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
tile.setElevation(0, 0, 30.0);
@@ -339,7 +339,7 @@ public class SimpleTileTest {
}
@Test
- public void testCellIntersectionLinearNoIntersection() throws RuggedException {
+ public void testCellIntersectionLinearNoIntersection() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
tile.setElevation(0, 0, 30.0);
@@ -359,7 +359,7 @@ public class SimpleTileTest {
}
@Test
- public void testCellIntersectionConstant0() throws RuggedException {
+ public void testCellIntersectionConstant0() {
SimpleTile tile = new SimpleTileFactory().createTile();
tile.setGeometry(0.0, 0.0, 0.025, 0.025, 50, 50);
tile.setElevation(0, 0, 30.0);
@@ -440,11 +440,9 @@ public class SimpleTileTest {
}
- private void checkOnTile(Tile tile, GeodeticPoint gpI)
- throws RuggedException {
+ private void checkOnTile(Tile tile, GeodeticPoint gpI) {
Assert.assertEquals(gpI.getAltitude(),
tile.interpolateElevation(gpI.getLatitude(), gpI.getLongitude()),
1.0e-10);
}
-
}
diff --git a/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java b/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
index 5dd97dac3b0f8cdd76c305dade8b16796b89d705..4f3d8ffb670e2882f1222c9e830df8a54b1f4129 100644
--- a/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
+++ b/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -21,14 +21,11 @@ import org.hipparchus.random.Well19937a;
import org.hipparchus.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
-import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.raster.SimpleTile;
-import org.orekit.rugged.raster.TilesCache;
public class TilesCacheTest {
@Test
- public void testSingleTile() throws RuggedException {
+ public void testSingleTile() {
CountingFactory factory = new CountingFactory();
TilesCache<SimpleTile> cache = new TilesCache<SimpleTile>(factory,
new CheckedPatternElevationUpdater(FastMath.toRadians(3.0), 11, 10.0, 20.0), 1000);
@@ -43,7 +40,7 @@ public class TilesCacheTest {
}
@Test
- public void testEviction() throws RuggedException {
+ public void testEviction() {
CountingFactory factory = new CountingFactory();
TilesCache<SimpleTile> cache = new TilesCache<SimpleTile>(factory,
new CheckedPatternElevationUpdater(FastMath.toRadians(1.0), 11, 10.0, 20.0), 12);
@@ -95,7 +92,7 @@ public class TilesCacheTest {
}
@Test
- public void testExactEnd() throws RuggedException {
+ public void testExactEnd() {
CountingFactory factory = new CountingFactory();
TilesCache<SimpleTile> cache =
new TilesCache<SimpleTile>(factory,
@@ -123,7 +120,7 @@ public class TilesCacheTest {
}
@Test
- public void testNonContiguousFill() throws RuggedException {
+ public void testNonContiguousFill() {
CountingFactory factory = new CountingFactory();
TilesCache<SimpleTile> cache =
new TilesCache<SimpleTile>(factory,
diff --git a/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
index ef19659426eb3c2ef1779a8815868bcc0ed9523f..71e605ea69a02d3dea9a33641038dbcc311a3297 100644
--- a/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -18,7 +18,6 @@ package org.orekit.rugged.raster;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.utils.Constants;
public class VolcanicConeElevationUpdater implements TileUpdater {
@@ -38,8 +37,8 @@ public class VolcanicConeElevationUpdater implements TileUpdater {
this.n = n;
}
- public void updateTile(double latitude, double longitude, UpdatableTile tile)
- throws RuggedException {
+ public void updateTile(double latitude, double longitude, UpdatableTile tile) {
+
double step = size / (n - 1);
double minLatitude = size * FastMath.floor(latitude / size);
double minLongitude = size * FastMath.floor(longitude / size);
@@ -58,5 +57,4 @@ public class VolcanicConeElevationUpdater implements TileUpdater {
}
}
}
-
}
diff --git a/src/test/java/org/orekit/rugged/refraction/AtmosphericRefractionTest.java b/src/test/java/org/orekit/rugged/refraction/AtmosphericRefractionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..dda307f328f287f934e0359e0e194c5a1b9a9562
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/refraction/AtmosphericRefractionTest.java
@@ -0,0 +1,225 @@
+package org.orekit.rugged.refraction;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.RotationConvention;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.FastMath;
+import org.junit.Assert;
+import org.junit.Test;
+import org.orekit.bodies.BodyShape;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DirectoryCrawler;
+import org.orekit.orbits.Orbit;
+import org.orekit.rugged.TestUtils;
+import org.orekit.rugged.api.AlgorithmId;
+import org.orekit.rugged.api.BodyRotatingFrameId;
+import org.orekit.rugged.api.EllipsoidId;
+import org.orekit.rugged.api.InertialFrameId;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.api.RuggedBuilder;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
+import org.orekit.rugged.linesensor.LineDatation;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.LinearLineDatation;
+import org.orekit.rugged.linesensor.SensorPixel;
+import org.orekit.rugged.los.LOSBuilder;
+import org.orekit.rugged.los.TimeDependentLOS;
+import org.orekit.rugged.raster.RandomLandscapeUpdater;
+import org.orekit.rugged.raster.TileUpdater;
+import org.orekit.rugged.utils.GeodeticUtilities;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.time.TimeScalesFactory;
+import org.orekit.utils.AngularDerivativesFilter;
+import org.orekit.utils.CartesianDerivativesFilter;
+import org.orekit.utils.Constants;
+
+public class AtmosphericRefractionTest {
+
+
+ @Test
+ public void testAtmosphericRefractionCorrection() throws URISyntaxException {
+
+ String sensorName = "line";
+ int dimension = 4000;
+
+ RuggedBuilder builder = initRuggedForAtmosphericTests(dimension, sensorName);
+ // Build Rugged without atmospheric refraction model
+ Rugged ruggedWithout = builder.build();
+
+ // Defines atmospheric refraction model (with the default multi layers model)
+ AtmosphericRefraction atmosphericRefraction = new MultiLayerModel(ruggedWithout.getEllipsoid());
+ int pixelStep = 100;
+ int lineStep = 100;
+ atmosphericRefraction.setGridSteps(pixelStep, lineStep);
+
+ // Build Rugged with atmospheric refraction model
+ builder.setRefractionCorrection(atmosphericRefraction);
+ Rugged ruggedWith = builder.build();
+
+ // For test coverage
+ assertTrue(ruggedWith.getRefractionCorrection().getClass().isInstance(new MultiLayerModel(ruggedWith.getEllipsoid())));
+
+
+ LineSensor lineSensor = ruggedWithout.getLineSensor(sensorName);
+ int minLine = (int) FastMath.floor(lineSensor.getLine(ruggedWithout.getMinDate()));
+ int maxLine = (int) FastMath.ceil(lineSensor.getLine(ruggedWithout.getMaxDate()));
+
+ final double pixelThreshold = 1.e-3;
+ final double lineThreshold = 1.e-2;
+
+ final double epsilonPixel = pixelThreshold;
+ final double epsilonLine = lineThreshold;
+ double earthRadius = ruggedWithout.getEllipsoid().getEquatorialRadius();
+
+ // Direct loc on a line WITHOUT and WITH atmospheric correction
+ // ============================================================
+ double chosenLine = 200.;
+ GeodeticPoint[] gpWithoutAtmosphericRefractionCorrection = ruggedWithout.directLocation(sensorName, chosenLine);
+ GeodeticPoint[] gpWithAtmosphericRefractionCorrection = ruggedWith.directLocation(sensorName, chosenLine);
+
+ // Check the shift on the ground due to atmospheric correction
+ for (int i = 0; i < gpWithAtmosphericRefractionCorrection.length; i++) {
+ double currentRadius = earthRadius + (gpWithAtmosphericRefractionCorrection[i].getAltitude()+ gpWithoutAtmosphericRefractionCorrection[i].getAltitude())/2.;
+ double distance = GeodeticUtilities.computeDistanceInMeter(currentRadius, gpWithAtmosphericRefractionCorrection[i], gpWithoutAtmosphericRefractionCorrection[i]);
+ // Check if the distance is not 0 and < 2m
+ Assert.assertTrue(distance > 0.0);
+ Assert.assertTrue(distance < 2.);
+ }
+
+ // Inverse loc WITH atmospheric correction
+ // ==========================================================================
+ for (int i = 0; i < gpWithAtmosphericRefractionCorrection.length; i++) {
+
+ // to check if we go back to the initial point when taking the geodetic point with atmospheric correction
+ GeodeticPoint gpWith = gpWithAtmosphericRefractionCorrection[i];
+ SensorPixel sensorPixelReverseWith = ruggedWith.inverseLocation(sensorName, gpWith, minLine, maxLine);
+
+ if (sensorPixelReverseWith != null) {
+ assertEquals(i, sensorPixelReverseWith.getPixelNumber(), epsilonPixel);
+ assertEquals(chosenLine, sensorPixelReverseWith.getLineNumber(), epsilonLine);
+ } else {
+ fail("Inverse location failed for pixel " + i + " with atmospheric refraction correction for geodetic point computed with" );
+ }
+ } // end loop on pixel i
+
+
+ // For test coverage
+ double dummyLat = gpWithAtmosphericRefractionCorrection[0].getLatitude() + FastMath.PI/4.;
+ double dummyLon = gpWithAtmosphericRefractionCorrection[0].getLongitude() - FastMath.PI/4.;
+ GeodeticPoint dummyGP = new GeodeticPoint(dummyLat, dummyLon, 0.);
+ try {
+ ruggedWith.inverseLocation(sensorName, dummyGP, minLine, maxLine);
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.INVALID_RANGE_FOR_LINES, re.getSpecifier());
+ }
+ }
+
+ private RuggedBuilder initRuggedForAtmosphericTests(final int dimension, final String sensorName) throws URISyntaxException {
+
+ String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
+ final BodyShape earth = TestUtils.createEarth();
+ final Orbit orbit = TestUtils.createOrbit(Constants.EIGEN5C_EARTH_MU);
+
+ // one line sensor
+ // position: 1.5m in front (+X) and 20 cm above (-Z) of the S/C center of mass
+ // los: swath in the (YZ) plane, looking at 5° roll, 2.6" per pixel
+ Vector3D position = new Vector3D(1.5, 0, -0.2);
+ TimeDependentLOS los = TestUtils.createLOSPerfectLine(new Rotation(Vector3D.PLUS_I,
+ FastMath.toRadians(5.0),
+ RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
+ Vector3D.PLUS_I,
+ FastMath.toRadians((dimension/2.) * 2.6 / 3600.0), dimension).build();
+
+ // With the orbit (795km), the size of the pixel on the ground is around : 10m
+
+ // linear datation model: at reference time we get the middle line, and the rate is one line every 1.5ms
+ AbsoluteDate crossing = new AbsoluteDate("2012-01-01T12:30:00.000", TimeScalesFactory.getUTC());
+ LineDatation lineDatation = new LinearLineDatation(crossing, dimension / 2, 1.0 / 1.5e-3);
+ int firstLine = 0;
+ int lastLine = dimension;
+ LineSensor lineSensor = new LineSensor(sensorName, lineDatation, position, los);
+ AbsoluteDate minDate = lineSensor.getDate(firstLine).shiftedBy(-1.0);
+ AbsoluteDate maxDate = lineSensor.getDate(lastLine).shiftedBy(+1.0);
+
+ TileUpdater updater = new RandomLandscapeUpdater(800.0, 9000.0, 0.1, 0xf0a401650191f9f6l, FastMath.toRadians(2.0), 257);
+
+
+ RuggedBuilder builder = new RuggedBuilder().
+ setDigitalElevationModel(updater, 8).
+ setAlgorithm(AlgorithmId.DUVENHAGE).
+ setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF).
+ setTimeSpan(minDate, maxDate, 0.001, 5.0).
+ setTrajectory(InertialFrameId.EME2000,
+ TestUtils.orbitToPV(orbit, earth, minDate.shiftedBy(-1.0), maxDate.shiftedBy(+1.0), 0.25),
+ 8, CartesianDerivativesFilter.USE_PV,
+ TestUtils.orbitToQ(orbit, earth, minDate.shiftedBy(-1.0), maxDate.shiftedBy(+1.0), 0.25),
+ 2, AngularDerivativesFilter.USE_R).
+ setLightTimeCorrection(false).
+ setAberrationOfLightCorrection(false).
+ addLineSensor(lineSensor);
+
+ return builder;
+ }
+
+
+ @Test
+ public void testBadConfig() {
+
+ int dimension = 400;
+
+ TimeDependentLOS los = new LOSBuilder(new ArrayList<Vector3D>(dimension)).build();
+ LineSensor lineSensor = new LineSensor("line", null, Vector3D.ZERO, los);
+
+ // Defines atmospheric refraction model (with the default multi layers model)
+ AtmosphericRefraction atmosphericRefraction = new MultiLayerModel(null);
+
+ // Check the context
+ atmosphericRefraction.setGridSteps(100, 100);
+ atmosphericRefraction.configureCorrectionGrid(lineSensor, 0, 300);
+ assertFalse(atmosphericRefraction.isSameContext("otherSensor", 0, 300));
+ assertFalse(atmosphericRefraction.isSameContext("line", 42, 300));
+ assertFalse(atmosphericRefraction.isSameContext("line", 0, 42));
+
+ // Check the test of validity of min / max line vs line step
+ try {
+ atmosphericRefraction.setGridSteps(100, 100);
+ atmosphericRefraction.configureCorrectionGrid(lineSensor, 0, 100);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.INVALID_RANGE_FOR_LINES,re.getSpecifier());
+ }
+
+ // Bad pixel step
+ try {
+ atmosphericRefraction.setGridSteps(-5, 100);
+ atmosphericRefraction.configureCorrectionGrid(lineSensor, 0, 100);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.INVALID_STEP,re.getSpecifier());
+ }
+
+ // Bad line step
+ try {
+ atmosphericRefraction.setGridSteps(10, -42);
+ atmosphericRefraction.configureCorrectionGrid(lineSensor, 0, 100);
+ Assert.fail("An exception should have been thrown");
+
+ } catch (RuggedException re) {
+ Assert.assertEquals(RuggedMessages.INVALID_STEP,re.getSpecifier());
+ }
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java b/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java
index ab2afbd269c3e04973c47b9c6b2682594380d660..cadca6e1c02a12940ec4144ff8f5d6091aef13f9 100644
--- a/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java
+++ b/src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,6 +16,11 @@
*/
package org.orekit.rugged.refraction;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import org.hipparchus.analysis.UnivariateFunction;
import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
@@ -23,7 +28,6 @@ import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
-import org.orekit.errors.OrekitException;
import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.intersection.AbstractAlgorithmTest;
@@ -32,15 +36,10 @@ import org.orekit.rugged.intersection.duvenhage.DuvenhageAlgorithm;
import org.orekit.rugged.raster.TileUpdater;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
public class MultiLayerModelTest extends AbstractAlgorithmTest {
@Test
- public void testAlmostNadir() throws OrekitException, RuggedException {
+ public void testAlmostNadir() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
@@ -61,7 +60,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
}
@Test
- public void testNoOpRefraction() throws OrekitException, RuggedException {
+ public void testNoOpRefraction() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
@@ -89,8 +88,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
@Test
public void testReversedAtmosphere()
- throws OrekitException, RuggedException, IllegalArgumentException,
- IllegalAccessException, NoSuchFieldException, SecurityException {
+ throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
@@ -138,8 +136,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
@Test
public void testTwoAtmospheres()
- throws OrekitException, RuggedException, IllegalArgumentException,
- IllegalAccessException, NoSuchFieldException, SecurityException {
+ throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
@@ -181,7 +178,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
}
@Test
- public void testMissingLayers() throws OrekitException, RuggedException {
+ public void testMissingLayers() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
@@ -206,7 +203,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
}
@Test
- public void testLayersBelowDEM() throws OrekitException, RuggedException {
+ public void testLayersBelowDEM() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
@@ -225,7 +222,7 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
}
@Test
- public void testDivingAngleChange() throws OrekitException, RuggedException {
+ public void testDivingAngleChange() {
setUpMayonVolcanoContext();
final IntersectionAlgorithm algorithm = createAlgorithm(updater, 8);
@@ -251,8 +248,8 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
}
- private Vector3D los(final Vector3D position, final double angleFromNadir)
- throws OrekitException {
+ private Vector3D los(final Vector3D position, final double angleFromNadir) {
+
final Vector3D nadir = earth.transform(position, earth.getBodyFrame(), null).getNadir();
final Rotation losRotation = new Rotation(nadir.orthogonal(), angleFromNadir,
RotationConvention.VECTOR_OPERATOR);
diff --git a/src/test/java/org/orekit/rugged/utils/EnumeratesTest.java b/src/test/java/org/orekit/rugged/utils/EnumeratesTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d74d19c5156372405f3cd212da9c45ae51b1eeb2
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/utils/EnumeratesTest.java
@@ -0,0 +1,41 @@
+package org.orekit.rugged.utils;
+
+import org.junit.Test;
+import org.orekit.rugged.adjustment.OptimizerId;
+import org.orekit.rugged.api.BodyRotatingFrameId;
+import org.orekit.rugged.api.EllipsoidId;
+import org.orekit.rugged.api.InertialFrameId;
+
+/** Tests to obtain 100% of coverage for enum class with jacoco tool.
+ * Even though one use each enumerate of an enum class,
+ * there is no way to obtain a full 100% coverage of the class
+ * unless ... to perform a simple test like
+ * TheEnumClass.valueOf(TheEnumClass.OneEnumValue..toString());
+ * @author Guylaine Prat
+ */
+public class EnumeratesTest {
+
+ @Test
+ public void testEnumOptimizerId() {
+ // Test to have 100% coverage of enum class
+ OptimizerId.valueOf(OptimizerId.LEVENBERG_MARQUADT.toString());
+ }
+
+ @Test
+ public void testBodyRotatingFrameId() {
+ // Test to have 100% coverage of enum class
+ BodyRotatingFrameId.valueOf(BodyRotatingFrameId.ITRF.toString());
+ }
+
+ @Test
+ public void testEllipsoidId() {
+ // Test to have 100% coverage of enum class
+ EllipsoidId.valueOf(EllipsoidId.IERS2003.toString());
+ }
+
+ @Test
+ public void testInertialFrameId() {
+ // Test to have 100% coverage of enum class
+ InertialFrameId.valueOf(InertialFrameId.GCRF.toString());
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java b/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
index bbd254875d46b8f64532cea0722f0054d3fccb90..c065f18c3d78ba4e50c6cb33e87a91d268106af9 100644
--- a/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
+++ b/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -41,7 +41,7 @@ import org.orekit.utils.IERSConventions;
public class ExtendedEllipsoidTest {
@Test
- public void testPointAtLongitude() throws RuggedException, OrekitException {
+ public void testPointAtLongitude() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
Vector3D d = new Vector3D(1.0, 2.0, 3.0);
@@ -55,7 +55,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLongitudeError() throws RuggedException, OrekitException {
+ public void testPointAtLongitudeError() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
double longitude = 1.25;
@@ -73,7 +73,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitude() throws RuggedException, OrekitException {
+ public void testPointAtLatitude() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
Vector3D d = new Vector3D(1.0, 2.0, 3.0);
@@ -88,7 +88,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitudeTwoPointsSameSide() throws RuggedException, OrekitException {
+ public void testPointAtLatitudeTwoPointsSameSide() {
// the line of sight is almost parallel an iso-latitude cone generatrix
// the spacecraft is at latitude lTarget - 0.951", and altitude 794.6km
@@ -124,7 +124,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitudeTwoPointsOppositeSides() throws RuggedException, OrekitException {
+ public void testPointAtLatitudeTwoPointsOppositeSides() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
Vector3D d = new Vector3D(1.0, 2.0, 0.1);
@@ -143,7 +143,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitudeAlmostEquator() throws RuggedException, OrekitException {
+ public void testPointAtLatitudeAlmostEquator() {
Vector3D p = new Vector3D(5767483.098580201, 4259689.325372237, -41553.67750784925);
Vector3D d = new Vector3D(-0.7403523952347795, -0.6701811835520302, 0.05230212180799747);
double latitude = -3.469446951953614E-18;
@@ -155,7 +155,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitudeErrorQuadraticEquation() throws RuggedException, OrekitException {
+ public void testPointAtLatitudeErrorQuadraticEquation() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
Vector3D d = new Vector3D(1.0, 2.0, 3.0);
@@ -172,7 +172,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitudeErrorNappe() throws RuggedException, OrekitException {
+ public void testPointAtLatitudeErrorNappe() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
Vector3D d = new Vector3D(1.0, 2.0, 0.1);
@@ -189,7 +189,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtAltitude() throws RuggedException, OrekitException {
+ public void testPointAtAltitude() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
Vector3D d = new Vector3D(1.0, 2.0, 3.0);
@@ -202,7 +202,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtAltitudeStartInside() throws RuggedException, OrekitException {
+ public void testPointAtAltitudeStartInside() {
Vector3D p = new Vector3D(322010.30, 6962.30, -644982.20);
Vector3D d = new Vector3D(-1.0, -2.0, -3.0);
@@ -215,7 +215,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtAltitudeError() throws RuggedException, OrekitException {
+ public void testPointAtAltitudeError() {
Vector3D p = new Vector3D(3220103.0, 69623.0, -6449822.0);
Vector3D d = new Vector3D(1.0, 2.0, 3.0);
@@ -231,7 +231,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testConvertLOS() throws RuggedException, OrekitException {
+ public void testConvertLOS() {
GeodeticPoint gp = new GeodeticPoint(-0.2, 1.8, 2400.0);
Vector3D p = ellipsoid.transform(gp);
@@ -251,7 +251,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitudeError() throws RuggedException, OrekitException {
+ public void testPointAtLatitudeError() {
Vector3D p = new Vector3D(-3052690.88784496, 6481300.309857268, 25258.7478104745);
Vector3D d = new Vector3D(0.6, -0.8, 0.0);
@@ -269,7 +269,7 @@ public class ExtendedEllipsoidTest {
}
@Test
- public void testPointAtLatitudeIssue1() throws RuggedException, OrekitException {
+ public void testPointAtLatitudeIssue1() {
Vector3D position = new Vector3D(-1988136.619268088, -2905373.394638188, 6231185.484365295);
Vector3D los = new Vector3D(0.3489121277213534, 0.3447806500507106, -0.8714279261531437);
diff --git a/src/test/java/org/orekit/rugged/utils/GeodeticUtilities.java b/src/test/java/org/orekit/rugged/utils/GeodeticUtilities.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b8ea48e7c8cd14ba18a3d3d57de253d964f934b
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/utils/GeodeticUtilities.java
@@ -0,0 +1,265 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.utils;
+
+import java.text.NumberFormat;
+
+import org.hipparchus.exception.MathRuntimeException;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.util.CompositeFormat;
+import org.hipparchus.util.FastMath;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.errors.OrekitException;
+
+public class GeodeticUtilities {
+
+ /** Compute an (approximate) geodetic distance in meters between geodetic points (long1, lat1) and (long2, lat2).
+ * TBN: Orekit does not have such a method
+ * @param earthRadius Earth radius (m)
+ * @param long1 longitude of first geodetic point (rad)
+ * @param lat1 latitude of first geodetic point (rad)
+ * @param long2 longitude of second geodetic point (rad)
+ * @param lat2 latitude of second geodetic point (rad)
+ * @return distance in meters
+ */
+ public static double computeDistanceInMeter(double earthRadius, final double long1, final double lat1,
+ final double long2, final double lat2) {
+
+ // get vectors on unit sphere from angular coordinates
+ final Vector3D p1 = new Vector3D(long1, lat1);
+ final Vector3D p2 = new Vector3D(long2, lat2);
+ return earthRadius * Vector3D.angle(p1, p2);
+ }
+
+ /** Compute an (approximate) geodetic distance in meters between two geodetic points
+ * TBN: Orekit does not have such a method
+ * @param earthRadius Earth radius (m)
+ * @param gp1 first geodetic point
+ * @param gp2 second geodetic point
+ * @return distance in meters
+ */
+ public static double computeDistanceInMeter(double earthRadius, final GeodeticPoint gp1, final GeodeticPoint gp2) {
+
+ return computeDistanceInMeter(earthRadius, gp1.getLongitude(), gp1.getLatitude(), gp2.getLongitude(), gp2.getLatitude());
+ }
+
+
+
+ public static String toStringDMS(GeodeticPoint gp) {
+
+ final NumberFormat format = CompositeFormat.getDefaultNumberFormat();
+ format.setMaximumFractionDigits(1);
+ DMSangle latDMS = convertLatitudeToDMS(FastMath.toDegrees(gp.getLatitude()));
+ DMSangle lonDMS = convertLongitudeToDMS(FastMath.toDegrees(gp.getLongitude()));
+
+ String latSign = "";
+ if (latDMS.getCardinalPoint() == CardinalDirection.South) latSign = "-";
+ String lonSign = "";
+ if (lonDMS.getCardinalPoint() == CardinalDirection.West) lonSign = "-";
+
+ return "{lat: " + latSign +
+ format.format(latDMS.getDegrees()) + "° " +
+ format.format(latDMS.getMinutes()) + "' " +
+ format.format(latDMS.getSeconds()) + "'' " +
+ " lon: " + lonSign +
+ format.format(lonDMS.getDegrees()) + "° " +
+ format.format(lonDMS.getMinutes()) + "' " +
+ format.format(lonDMS.getSeconds()) + "'' " +
+ "}";
+ }
+
+ /**
+ * Convert longitude (in decimal degrees) in degrees/minutes/seconds
+ * @param longitudeInDecimalDegrees
+ * @return the DMS angle
+ */
+ static DMSangle convertLongitudeToDMS(double longitudeInDecimalDegrees) {
+
+ String cardinalDirection;
+ // Get the cardinal direction
+ if (longitudeInDecimalDegrees >= 0.0){
+ cardinalDirection= "E";
+ } else {
+ cardinalDirection= "W";
+ }
+
+ return convertToDMS(longitudeInDecimalDegrees, cardinalDirection);
+ }
+
+ /**
+ * Convert latitude (in decimal degrees) in degrees/minutes/seconds
+ * @param latitudeInDecimalDegrees
+ * @return the DMSangle
+ */
+ public static DMSangle convertLatitudeToDMS(double latitudeInDecimalDegrees){
+
+ String cardinalDirection;
+ // Get the cardinal direction
+ if (latitudeInDecimalDegrees >= 0.0){
+ cardinalDirection= "N";
+ } else {
+ cardinalDirection= "S";
+ }
+
+ return convertToDMS(latitudeInDecimalDegrees, cardinalDirection);
+
+ }
+
+ /**
+ * Convert angle (in decimal degrees) in degrees/minutes/seconds and add the associated cardinal direction
+ * @param angleInDecimalDegrees angle in decimal degrees
+ * @param cardinalDirection the associated cardinal direction
+ * @return the DMSangle
+ */
+ private static DMSangle convertToDMS(double angleInDecimalDegrees, String cardinalDirection) {
+
+ // We know the cardinal direction so we work on |angleInDecimalDegrees| the positive value
+ double angleInDD = FastMath.abs(angleInDecimalDegrees);
+ // Get the degrees part
+ int degreesPart = (int) FastMath.floor(angleInDD);
+
+ // Get the minutes part (always positive value)
+ double minutesInDecimal = 60.*(angleInDD - degreesPart);
+ int minutesPart = (int) FastMath.floor(minutesInDecimal);
+
+ // Get the seconds (in decimal)
+ double secondsInDecimal = 60.*(minutesInDecimal - minutesPart);
+
+ // Due to rounding problem (at equator around 30 micrometre > diameter of human hair)
+ if (secondsInDecimal > (60. - 1.e-8)) {
+ secondsInDecimal = 0.0;
+ minutesPart++;
+ if (minutesPart == 60) {
+ minutesPart = 0;
+ degreesPart++;
+ }
+ }
+
+ return new DMSangle(degreesPart, minutesPart, secondsInDecimal, cardinalDirection);
+ }
+}
+class DMSangle {
+
+ /**
+ * Degrees part of the angle
+ */
+ private int degrees;
+
+ /**
+ * Minutes part of the angle
+ */
+ private int minutes;
+
+ /**
+ * Seconds part of the angle
+ */
+ private double seconds;
+
+ /**
+ * Cardinal direction
+ */
+ private CardinalDirection cardinalPoint;
+
+ /**
+ * Create a DMS angle for a GeodeticPoint (for instance)
+ * @param degrees degrees part
+ * @param minutes minutes part
+ * @param seconds seconds part
+ * @param cardinalName cardinal direction
+ */
+ public DMSangle(int degrees, int minutes, double seconds, String cardinalName) {
+ this.degrees = degrees;
+ this.minutes = minutes;
+ this.seconds = seconds;
+ this.cardinalPoint = CardinalDirection.getCardinalDirectionFromName(cardinalName);
+ if (this.cardinalPoint == null){
+ throw new OrekitException(new MathRuntimeException(null, this.cardinalPoint));
+ }
+ }
+
+ /**
+ * @return the degrees part of the angle
+ */
+ public int getDegrees() {
+ return degrees;
+ }
+ /**
+ * @return the minutes part of the angle
+ */
+ public int getMinutes() {
+ return minutes;
+ }
+ /**
+ * @return the seconds part of the angle
+ */
+ public double getSeconds() {
+ return seconds;
+ }
+ /**
+ * @return the cardinal direction of the latitude or the longitude
+ */
+ public CardinalDirection getCardinalPoint() {
+ return cardinalPoint;
+ }
+}
+
+enum CardinalDirection {
+ North("North","N"),
+ South("South","S"),
+ West("West","W"),
+ East("East","E");
+ /**
+ * Cardinal direction full name
+ */
+ private String cardinalFullName = null;
+
+ /**
+ * Cardinal direction short name
+ */
+ private String cardinalShortName = null;
+
+ /**
+ * Private constructor
+ * @param fullName
+ * @param shortName
+ */
+ private CardinalDirection(String fullName, String shortName){
+ this.cardinalFullName = fullName;
+ this.cardinalShortName = shortName;
+ }
+
+ /**
+ * Get the cardinal direction from name (long or short)
+ * @param cardinalName cardinal name (long or short)
+ * @return the CardinalDirection
+ */
+ public static CardinalDirection getCardinalDirectionFromName(String cardinalName){
+ // Get the cardinal direction from full name ...
+ for (CardinalDirection currentName : CardinalDirection.values()) {
+ if (currentName.cardinalFullName.equals(cardinalName)) {
+ return currentName;
+ }
+ }
+ // otherwise get for short name ...
+ for (CardinalDirection currentName : CardinalDirection.values()) {
+ if (currentName.cardinalShortName.equals(cardinalName)) {
+ return currentName;
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/org/orekit/rugged/utils/NormalizedGeodeticPointTest.java b/src/test/java/org/orekit/rugged/utils/NormalizedGeodeticPointTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c607cc844f17557e2689a8e34dba616802a0d2f6
--- /dev/null
+++ b/src/test/java/org/orekit/rugged/utils/NormalizedGeodeticPointTest.java
@@ -0,0 +1,54 @@
+/* Copyright 2013-2019 CS Systèmes d'Information
+ * Licensed to CS Systèmes d'Information (CS) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * CS licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.orekit.rugged.utils;
+
+import org.hipparchus.util.FastMath;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NormalizedGeodeticPointTest {
+
+ /**
+ * check {@link NormalizedGeodeticPoint#equals(Object)}.
+ */
+ @Test
+ public void testEquals() {
+ // setup
+ NormalizedGeodeticPoint point = new NormalizedGeodeticPoint(1, 2, 3, 4);
+
+ // actions + verify
+ Assert.assertEquals(point, new NormalizedGeodeticPoint(1, 2, 3, 4));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(0, 2, 3, 4)));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(1, 0, 3, 4)));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(1, 2, 0, 4)));
+ Assert.assertFalse(point.equals(new NormalizedGeodeticPoint(1, 2, 3, 10)));
+ Assert.assertFalse(point.equals(new Object()));
+ }
+
+ /**
+ * check {@link NormalizedGeodeticPoint#hashCode()}.
+ */
+ @Test
+ public void testHashCode() {
+ // setup
+ NormalizedGeodeticPoint point = new NormalizedGeodeticPoint(1, 2, 3, 4);
+
+ // actions + verify
+ Assert.assertEquals(point.hashCode(), new NormalizedGeodeticPoint(1, 2, 3, 4).hashCode());
+ Assert.assertNotEquals(point.hashCode(), new NormalizedGeodeticPoint(1, FastMath.nextUp(2), 3, 4).hashCode());
+ }
+}
diff --git a/src/test/java/org/orekit/rugged/utils/RefiningLiaisonMetrics.java b/src/test/java/org/orekit/rugged/utils/RefiningLiaisonMetrics.java
deleted file mode 100644
index 4e655361f62416b0179112fb9571a00e7dd3deb2..0000000000000000000000000000000000000000
--- a/src/test/java/org/orekit/rugged/utils/RefiningLiaisonMetrics.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.orekit.rugged.utils;
-
-/**
- * Contains results from liaison metrics computation
- */
-public class RefiningLiaisonMetrics {
-
- /** Maximum residual distance. */
- private double resMax;
- /** Mean residual distance. */
- private double resMean;
- /** LOS distance max. */
- private double losDistanceMax;
- /** LOS distance mean. */
- private double losDistanceMean;
- /** Earth distance max. */
- private double earthDistanceMax;
- /** Earth distance mean.*/
- private double earthDistanceMean;
-
- public RefiningLiaisonMetrics() {
-
- this.resMax = 0.0;
- this.resMean = 0.0;
- this.losDistanceMax = 0.0;
- this.losDistanceMean = 0.0;
- this.earthDistanceMax = 0.0;
- this.earthDistanceMean = 0.0;
- }
-
- public double getMaxResidual() {
- return resMax;
- }
-
- public void setMaxResidual(double resMax) {
- this.resMax = resMax;
- }
-
- public double getMeanResidual() {
- return resMean;
- }
-
- public void setMeanResidual(double resMean) {
- this.resMean = resMean;
- }
-
- public double getLosMaxDistance() {
- return losDistanceMax;
- }
-
- public void setLosMaxDistance(double losDistanceMax) {
- this.losDistanceMax = losDistanceMax;
- }
-
- public double getLosMeanDistance() {
- return losDistanceMean;
- }
-
- public void setLosMeanDistance(double losDistanceMean) {
- this.losDistanceMean = losDistanceMean;
- }
-
- public double getEarthMaxDistance() {
- return earthDistanceMax;
- }
-
- public void setEarthMaxDistance(double earthDistanceMax) {
- this.earthDistanceMax = earthDistanceMax;
- }
-
- public double getEarthMeanDistance() {
- return earthDistanceMean;
- }
-
- public void setEarthMeanDistance(double earthDistanceMean) {
- this.earthDistanceMean = earthDistanceMean;
- }
-}
diff --git a/src/test/java/org/orekit/rugged/utils/RefiningTest.java b/src/test/java/org/orekit/rugged/utils/RefiningTest.java
deleted file mode 100644
index d6f5e75c3dc56465830097a1000754a9c230d2a2..0000000000000000000000000000000000000000
--- a/src/test/java/org/orekit/rugged/utils/RefiningTest.java
+++ /dev/null
@@ -1,750 +0,0 @@
-package org.orekit.rugged.utils;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hipparchus.analysis.differentiation.DerivativeStructure;
-import org.hipparchus.geometry.euclidean.threed.Rotation;
-import org.hipparchus.geometry.euclidean.threed.RotationConvention;
-import org.hipparchus.geometry.euclidean.threed.RotationOrder;
-import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
-import org.hipparchus.util.FastMath;
-import org.junit.After;
-import org.junit.Assert;
-import org.orekit.attitudes.AttitudeProvider;
-import org.orekit.attitudes.LofOffset;
-import org.orekit.attitudes.NadirPointing;
-import org.orekit.attitudes.TabulatedLofOffset;
-import org.orekit.attitudes.YawCompensation;
-import org.orekit.bodies.BodyShape;
-import org.orekit.bodies.CelestialBodyFactory;
-import org.orekit.data.DataProvidersManager;
-import org.orekit.data.DirectoryCrawler;
-import org.orekit.errors.OrekitException;
-import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
-import org.orekit.forces.gravity.ThirdBodyAttraction;
-import org.orekit.forces.gravity.potential.NormalizedSphericalHarmonicsProvider;
-import org.orekit.frames.Frame;
-import org.orekit.frames.FramesFactory;
-import org.orekit.frames.LOFType;
-import org.orekit.orbits.CircularOrbit;
-import org.orekit.orbits.Orbit;
-import org.orekit.orbits.OrbitType;
-import org.orekit.orbits.PositionAngle;
-import org.orekit.propagation.Propagator;
-import org.orekit.propagation.SpacecraftState;
-import org.orekit.propagation.analytical.KeplerianPropagator;
-import org.orekit.propagation.numerical.NumericalPropagator;
-import org.orekit.rugged.TestUtils;
-import org.orekit.rugged.adjustment.InterSensorsOptimizationProblemBuilder;
-import org.orekit.rugged.adjustment.measurements.Observables;
-import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
-import org.orekit.rugged.api.AlgorithmId;
-import org.orekit.rugged.api.BodyRotatingFrameId;
-import org.orekit.rugged.api.EllipsoidId;
-import org.orekit.rugged.api.InertialFrameId;
-import org.orekit.rugged.api.Rugged;
-import org.orekit.rugged.api.RuggedBuilder;
-import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.linesensor.LineDatation;
-import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.linesensor.LinearLineDatation;
-import org.orekit.rugged.linesensor.SensorPixel;
-import org.orekit.rugged.los.FixedRotation;
-import org.orekit.rugged.los.FixedZHomothety;
-import org.orekit.rugged.los.LOSBuilder;
-import org.orekit.rugged.los.TimeDependentLOS;
-import org.orekit.time.AbsoluteDate;
-import org.orekit.time.TimeScale;
-import org.orekit.time.TimeScalesFactory;
-import org.orekit.utils.AngularDerivativesFilter;
-import org.orekit.utils.CartesianDerivativesFilter;
-import org.orekit.utils.Constants;
-import org.orekit.utils.ParameterDriver;
-import org.orekit.utils.TimeStampedAngularCoordinates;
-import org.orekit.utils.TimeStampedPVCoordinates;
-
-
-public class RefiningTest {
-
- /** Pleiades viewing model A */
- PleiadesViewingModel pleiadesViewingModelA;
-
- /** Pleiades viewing model B */
- PleiadesViewingModel pleiadesViewingModelB;
-
- /** Line sensor A */
- LineSensor lineSensorA;
-
- /** Line sensor B */
- LineSensor lineSensorB;
-
- /** RuggedA's instance */
- Rugged ruggedA;
-
- /** RuggedB's instance */
- Rugged ruggedB;
-
-
- /**
- * Part of the name of parameter drivers
- */
- static final String rollSuffix = "_roll";
- static final String pitchSuffix = "_pitch";
- static final String factorName = "factor";
-
-
- /** Initialize refining tests
- * @param rollDisruptionA disruption to apply to roll angle for sensor A (deg)
- * @param pitchDisruptionA disruption to apply to pitch angle for sensor A (deg)
- * @param factorDisruptionA disruption to apply to homothety factor for sensor A
- * @param pitchDisruptionB disruption to apply to pitch angle for sensor B (deg)
- * @throws RuggedException
- */
- public void InitRefiningTest(double rollDisruptionA, double pitchDisruptionA, double factorDisruptionA, double pitchDisruptionB) throws RuggedException {
- try {
-
- String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
- DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
-
- // Initialize refining context
- // ---------------------------
- final String sensorNameA = "SensorA";
- final double incidenceAngleA = -5.0;
- final String dateA = "2016-01-01T11:59:50.0";
- this.pleiadesViewingModelA = new PleiadesViewingModel(sensorNameA, incidenceAngleA, dateA);
-
- final String sensorNameB = "SensorB";
- final double incidenceAngleB = 0.0;
- final String dateB = "2016-01-01T12:02:50.0";
- this.pleiadesViewingModelB = new PleiadesViewingModel(sensorNameB, incidenceAngleB, dateB);
-
- OrbitModel orbitmodelA = new OrbitModel();
- OrbitModel orbitmodelB = new OrbitModel();
-
- // Sensors's definition: creation of 2 Pleiades viewing models
- // -----------------------------------------------------------
-
- // 1/- Create First Pleiades Viewing Model A
- final AbsoluteDate minDateA = pleiadesViewingModelA.getMinDate();
- final AbsoluteDate maxDateA = pleiadesViewingModelA.getMaxDate();
- final AbsoluteDate refDateA = pleiadesViewingModelA.getDatationReference();
- this.lineSensorA = pleiadesViewingModelA.getLineSensor();
-
- // ----Satellite position, velocity and attitude: create orbit model A
- BodyShape earthA = TestUtils.createEarth();
- NormalizedSphericalHarmonicsProvider gravityFieldA = TestUtils.createGravityField();
- Orbit orbitA = orbitmodelA.createOrbit(gravityFieldA.getMu(), refDateA);
-
- // ----If no LOF Transform Attitude Provider is Nadir Pointing Yaw Compensation
- final double [] rollPoly = {0.0,0.0,0.0};
- final double[] pitchPoly = {0.025,0.0};
- final double[] yawPoly = {0.0,0.0,0.0};
- orbitmodelA.setLOFTransform(rollPoly, pitchPoly, yawPoly, minDateA);
-
- // ----Satellite attitude
- List<TimeStampedAngularCoordinates> satelliteQListA = orbitmodelA.orbitToQ(orbitA, earthA, minDateA.shiftedBy(-0.0), maxDateA.shiftedBy(+0.0), 0.25);
- final int nbQPoints = 2;
-
- // ----Position and velocities
- List<TimeStampedPVCoordinates> satellitePVListA = orbitmodelA.orbitToPV(orbitA, earthA, minDateA.shiftedBy(-0.0), maxDateA.shiftedBy(+0.0), 0.25);
- final int nbPVPoints = 8;
-
- // Rugged A initialization
- // ---------------------
- RuggedBuilder ruggedBuilderA = new RuggedBuilder();
-
- ruggedBuilderA.addLineSensor(lineSensorA);
- ruggedBuilderA.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
- ruggedBuilderA.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
- ruggedBuilderA.setTimeSpan(minDateA,maxDateA, 0.001, 5.0);
- ruggedBuilderA.setTrajectory(InertialFrameId.EME2000, satellitePVListA, nbPVPoints,
- CartesianDerivativesFilter.USE_PV, satelliteQListA,
- nbQPoints, AngularDerivativesFilter.USE_R);
- ruggedBuilderA.setLightTimeCorrection(false);
- ruggedBuilderA.setAberrationOfLightCorrection(false);
-
- ruggedBuilderA.setName("RuggedA");
-
- this.ruggedA = ruggedBuilderA.build();
-
-
- // 2/- Create Second Pleiades Viewing Model
- final AbsoluteDate minDateB = pleiadesViewingModelB.getMinDate();
- final AbsoluteDate maxDateB = pleiadesViewingModelB.getMaxDate();
- final AbsoluteDate refDateB = pleiadesViewingModelB.getDatationReference();
- this.lineSensorB = pleiadesViewingModelB.getLineSensor();
-
- // ----Satellite position, velocity and attitude: create orbit model B
- BodyShape earthB = TestUtils.createEarth();
- NormalizedSphericalHarmonicsProvider gravityFieldB = TestUtils.createGravityField();
- Orbit orbitB = orbitmodelB.createOrbit(gravityFieldB.getMu(), refDateB);
-
- // ----Satellite attitude
- List<TimeStampedAngularCoordinates> satelliteQListB = orbitmodelB.orbitToQ(orbitB, earthB, minDateB.shiftedBy(-0.0), maxDateB.shiftedBy(+0.0), 0.25);
-
- // ----Position and velocities
- List<TimeStampedPVCoordinates> satellitePVListB = orbitmodelB.orbitToPV(orbitB, earthB, minDateB.shiftedBy(-0.0), maxDateB.shiftedBy(+0.0), 0.25);
-
- // Rugged B initialization
- // ---------------------
- RuggedBuilder ruggedBuilderB = new RuggedBuilder();
-
- ruggedBuilderB.addLineSensor(lineSensorB);
- ruggedBuilderB.setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID);
- ruggedBuilderB.setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF);
- ruggedBuilderB.setTimeSpan(minDateB,maxDateB, 0.001, 5.0);
- ruggedBuilderB.setTrajectory(InertialFrameId.EME2000, satellitePVListB, nbPVPoints,
- CartesianDerivativesFilter.USE_PV, satelliteQListB,
- nbQPoints, AngularDerivativesFilter.USE_R);
- ruggedBuilderB.setLightTimeCorrection(false);
- ruggedBuilderB.setAberrationOfLightCorrection(false);
-
- ruggedBuilderB.setName("RuggedB");
-
- this.ruggedB = ruggedBuilderB.build();
-
- // Initialize disruptions:
- // -----------------------
- // Introduce rotations around instrument axes (roll and pitch angles, scale factor)
- final double rollValueA = FastMath.toRadians(rollDisruptionA);
- final double pitchValueA = FastMath.toRadians(pitchDisruptionA);
- final double pitchValueB = FastMath.toRadians(pitchDisruptionB);
- final double factorValueA = factorDisruptionA;
-
- // Select parameters to adjust
- setSelectedRoll(ruggedA, sensorNameA);
- setSelectedPitch(ruggedA, sensorNameA);
- setSelectedFactor(ruggedA, sensorNameA);
-
- setSelectedRoll(ruggedB, sensorNameB);
- setSelectedPitch(ruggedB, sensorNameB);
-// setSelectedFactor(ruggedB, sensorNameB);
-
- // Apply disruptions on physical model (acquisition A)
- applyDisruptionsRoll(ruggedA, sensorNameA, rollValueA);
- applyDisruptionsPitch(ruggedA, sensorNameA, pitchValueA);
- applyDisruptionsFactor(ruggedA, sensorNameA, factorValueA);
-
- // Apply disruptions on physical model (acquisition B)
- applyDisruptionsPitch(ruggedB, sensorNameB, pitchValueB);
-
- } catch (OrekitException oe) {
- Assert.fail(oe.getLocalizedMessage());
- } catch (URISyntaxException use) {
- Assert.fail(use.getLocalizedMessage());
- }
- }
-
-
- /** Apply disruptions on acquisition for roll angle
- * @param rugged Rugged instance
- * @param sensorName line sensor name
- * @param rollValue rotation on roll value
- */
- private void applyDisruptionsRoll(final Rugged rugged, final String sensorName, final double rollValue)
- throws OrekitException, RuggedException {
-
- rugged.
- getLineSensor(sensorName).
- getParametersDrivers().
- filter(driver -> driver.getName().equals(sensorName + rollSuffix)).
- findFirst().get().setValue(rollValue);
- }
-
- /** Apply disruptions on acquisition for pitch angle
- * @param rugged Rugged instance
- * @param sensorName line sensor name
- * @param pitchValue rotation on pitch value
- */
- private void applyDisruptionsPitch(final Rugged rugged, final String sensorName, final double pitchValue)
- throws OrekitException, RuggedException {
-
- rugged.
- getLineSensor(sensorName).
- getParametersDrivers().
- filter(driver -> driver.getName().equals(sensorName + pitchSuffix)).
- findFirst().get().setValue(pitchValue);
- }
-
- /** Apply disruptions on acquisition for scale factor
- * @param rugged Rugged instance
- * @param sensorName line sensor name
- * @param factorValue scale factor
- */
- private void applyDisruptionsFactor(final Rugged rugged, final String sensorName, final double factorValue)
- throws OrekitException, RuggedException {
-
- rugged.
- getLineSensor(sensorName).
- getParametersDrivers().
- filter(driver -> driver.getName().equals(factorName)).
- findFirst().get().setValue(factorValue);
- }
-
- /** Select roll angle to adjust
- * @param rugged Rugged instance
- * @param sensorName line sensor name
- * @throws OrekitException, RuggedException
- */
- private void setSelectedRoll(final Rugged rugged, final String sensorName) throws OrekitException, RuggedException {
-
- ParameterDriver rollDriver =
- rugged.getLineSensor(sensorName).getParametersDrivers().
- filter(driver -> driver.getName().equals(sensorName+rollSuffix)).findFirst().get();
- rollDriver.setSelected(true);
- }
-
- /** Select pitch angle to adjust
- * @param rugged Rugged instance
- * @param sensorName line sensor name
- * @throws OrekitException, RuggedException
- */
- private void setSelectedPitch(final Rugged rugged, final String sensorName) throws OrekitException, RuggedException {
-
- ParameterDriver pitchDriver =
- rugged.getLineSensor(sensorName).getParametersDrivers().
- filter(driver -> driver.getName().equals(sensorName + pitchSuffix)).findFirst().get();
- pitchDriver.setSelected(true);
- }
-
- /** Select scale factor to adjust
- * @param rugged Rugged instance
- * @param sensorName line sensor name
- * @throws OrekitException, RuggedException
- */
- private void setSelectedFactor(final Rugged rugged, final String sensorName) throws OrekitException, RuggedException {
-
- ParameterDriver factorDriver =
- rugged.getLineSensor(sensorName).getParametersDrivers().
- filter(driver -> driver.getName().equals(factorName)).findFirst().get();
- factorDriver.setSelected(true);
- }
-
- /** Compute the distances between LOS of two real pixels (one from sensor A and one from sensor B)
- * @param realPixelA real pixel from sensor A
- * @param realPixelB real pixel from sensor B
- * @return the distances of two real pixels computed between LOS and to the ground
- * @throws RuggedException
- */
- public double[] computeDistancesBetweenLOS(final SensorPixel realPixelA, final SensorPixel realPixelB) throws RuggedException {
-
- final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
-
- final AbsoluteDate realDateA = lineSensorA.getDate(realPixelA.getLineNumber());
- final AbsoluteDate realDateB = lineSensorB.getDate(realPixelB.getLineNumber());
-
- final double[] distanceLOSB = ruggedB.distanceBetweenLOS(
- lineSensorA, realDateA, realPixelA.getPixelNumber(),
- scToBodyA,
- lineSensorB, realDateB, realPixelB.getPixelNumber());
-
- return distanceLOSB;
- }
-
- /** Compute the distances with derivatives between LOS of two real pixels (one from sensor A and one from sensor B)
- * @param realPixelA real pixel from sensor A
- * @param realPixelB real pixel from sensor B
- * @return the distances of two real pixels computed between LOS and to the ground
- * @throws RuggedException
- * @throws SecurityException
- * @throws NoSuchMethodException
- * @throws InvocationTargetException
- * @throws IllegalArgumentException
- * @throws IllegalAccessException
- */
- public DerivativeStructure[] computeDistancesBetweenLOSDerivatives(final SensorPixel realPixelA, final SensorPixel realPixelB,
- double losDistance, double earthDistance)
- throws RuggedException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-
- final SpacecraftToObservedBody scToBodyA = ruggedA.getScToBody();
-
- final AbsoluteDate realDateA = lineSensorA.getDate(realPixelA.getLineNumber());
- final AbsoluteDate realDateB = lineSensorB.getDate(realPixelB.getLineNumber());
-
- final List<LineSensor> sensors = new ArrayList<LineSensor>();
- sensors.addAll(ruggedA.getLineSensors());
- sensors.addAll(ruggedB.getLineSensors());
-
- final List<Rugged> ruggedList = new ArrayList<Rugged>();
- ruggedList.add(ruggedA);
- ruggedList.add(ruggedB);
-
- // prepare generator
- final Observables measurements = new Observables(2);
- SensorToSensorMapping interMapping = new SensorToSensorMapping(lineSensorA.getName(), ruggedA.getName(), lineSensorB.getName(), ruggedB.getName());
- interMapping.addMapping(realPixelA, realPixelB, losDistance, earthDistance);
- measurements.addInterMapping(interMapping);
-
-
- InterSensorsOptimizationProblemBuilder optimizationPbBuilder = new InterSensorsOptimizationProblemBuilder(sensors, measurements, ruggedList);
- java.lang.reflect.Method createGenerator = InterSensorsOptimizationProblemBuilder.class.getSuperclass().getDeclaredMethod("createGenerator", List.class);
- createGenerator.setAccessible(true);
-
- List<LineSensor> listLineSensor = new ArrayList<LineSensor>();
- listLineSensor.addAll(ruggedA.getLineSensors());
- listLineSensor.addAll(ruggedB.getLineSensors());
-
- DSGenerator generator = (DSGenerator) createGenerator.invoke(optimizationPbBuilder, listLineSensor);
-
- final DerivativeStructure[] distanceLOSwithDS = ruggedB.distanceBetweenLOSderivatives(
- lineSensorA, realDateA, realPixelA.getPixelNumber(),
- scToBodyA,
- lineSensorB, realDateB, realPixelB.getPixelNumber(),
- generator);
-
- return distanceLOSwithDS;
- }
-
- @After
- public void tearDown() {
- }
-}
-
-
-class OrbitModel {
-
- /** Flag to change Attitude Law (by default Nadir Pointing Yaw Compensation). */
- private boolean userDefinedLOFTransform;
-
- /** User defined Roll law. */
- private double[] lofTransformRollPoly;
-
- /** User defined Pitch law. */
- private double[] lofTransformPitchPoly;
-
- /** User defined Yaw law. */
- private double[] lofTransformYawPoly;
-
- /** Reference date. */
- private AbsoluteDate refDate;
-
-
-
- /** Default constructor.
- */
- public OrbitModel() {
- userDefinedLOFTransform = false;
- }
-
- /** Create a circular orbit.
- */
- public Orbit createOrbit(final double mu, final AbsoluteDate date) throws OrekitException {
-
- // the following orbital parameters have been computed using
- // Orekit tutorial about phasing, using the following configuration:
- //
- // orbit.date = 2012-01-01T00:00:00.000
- // phasing.orbits.number = 143
- // phasing.days.number = 10
- // sun.synchronous.reference.latitude = 0
- // sun.synchronous.reference.ascending = false
- // sun.synchronous.mean.solar.time = 10:30:00
- // gravity.field.degree = 12
- // gravity.field.order = 12
-
- final Frame eme2000 = FramesFactory.getEME2000();
- return new CircularOrbit(694000.0 + Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
- -4.029194321683225E-4,
- 0.0013530362644647786,
- FastMath.toRadians(98.2), // Pleiades inclination 98.2 deg
- FastMath.toRadians(-86.47 + 180),
- FastMath.toRadians(135.9 + 0.3),
- PositionAngle.TRUE,
- eme2000,
- date,
- mu);
- }
-
- /** Set the Local Orbital Frame characteristics.
- */
- public void setLOFTransform(final double[] rollPoly, final double[] pitchPoly,
- final double[] yawPoly, final AbsoluteDate date) {
-
- this.userDefinedLOFTransform = true;
- lofTransformRollPoly = rollPoly.clone();
- lofTransformPitchPoly = pitchPoly.clone();
- lofTransformYawPoly = yawPoly.clone();
- this.refDate = date;
- }
-
- /** Recompute the polynom coefficients with shift.
- */
- private double getPoly(final double[] poly, final double shift) {
-
- double val = 0.0;
- for (int coef = 0; coef < poly.length; coef++) {
- val = val + poly[coef] * FastMath.pow(shift, coef);
- }
- return val;
- }
-
- /** Get the offset.
- */
- private Rotation getOffset(final BodyShape earth, final Orbit orbit, final double shift)
- throws OrekitException {
-
- final LOFType type = LOFType.VVLH;
- final double roll = getPoly(lofTransformRollPoly, shift);
- final double pitch = getPoly(lofTransformPitchPoly, shift);
- final double yaw = getPoly(lofTransformYawPoly, shift);
-
- final LofOffset law = new LofOffset(orbit.getFrame(), type, RotationOrder.XYZ,
- roll, pitch, yaw);
- final Rotation offsetAtt = law.
- getAttitude(orbit, orbit.getDate().shiftedBy(shift), orbit.getFrame()).
- getRotation();
- final NadirPointing nadirPointing = new NadirPointing(orbit.getFrame(), earth);
- final Rotation nadirAtt = nadirPointing.
- getAttitude(orbit, orbit.getDate().getDate().shiftedBy(shift), orbit.getFrame()).
- getRotation();
- final Rotation offsetProper = offsetAtt.compose(nadirAtt.revert(), RotationConvention.VECTOR_OPERATOR);
-
- return offsetProper;
- }
-
- /** Create the attitude provider.
- */
- public AttitudeProvider createAttitudeProvider(final BodyShape earth, final Orbit orbit)
- throws OrekitException {
-
- if (userDefinedLOFTransform) {
- final LOFType type = LOFType.VVLH;
-
- final List<TimeStampedAngularCoordinates> list = new ArrayList<TimeStampedAngularCoordinates>();
-
- for (double shift = -10.0; shift < +10.0; shift += 1e-2) {
- list.add(new TimeStampedAngularCoordinates(refDate.shiftedBy(shift),
- getOffset(earth, orbit, shift),
- Vector3D.ZERO,
- Vector3D.ZERO));
- }
-
- final TabulatedLofOffset tabulated = new TabulatedLofOffset(orbit.getFrame(), type, list,
- 2, AngularDerivativesFilter.USE_R);
-
- return tabulated;
- } else {
- return new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth));
- }
- }
-
- /** Create the orbit propagator.
- */
- public Propagator createPropagator(final BodyShape earth,
- final NormalizedSphericalHarmonicsProvider gravityField,
- final Orbit orbit)
- throws OrekitException {
-
- final AttitudeProvider attitudeProvider = createAttitudeProvider(earth, orbit);
-
- final SpacecraftState state =
- new SpacecraftState(orbit,
- attitudeProvider.getAttitude(orbit, orbit.getDate(), orbit.getFrame()), 1180.0);
-
- // numerical model for improving orbit
- final OrbitType type = OrbitType.CIRCULAR;
- final double[][] tolerances = NumericalPropagator.tolerances(0.1, orbit, type);
- final DormandPrince853Integrator integrator =
- new DormandPrince853Integrator(1.0e-4 * orbit.getKeplerianPeriod(),
- 1.0e-1 * orbit.getKeplerianPeriod(),
- tolerances[0],
- tolerances[1]);
- integrator.setInitialStepSize(1.0e-2 * orbit.getKeplerianPeriod());
-
- final NumericalPropagator numericalPropagator = new NumericalPropagator(integrator);
- numericalPropagator.addForceModel(new HolmesFeatherstoneAttractionModel(earth.getBodyFrame(), gravityField));
- numericalPropagator .addForceModel(new ThirdBodyAttraction(CelestialBodyFactory.getSun()));
- numericalPropagator .addForceModel(new ThirdBodyAttraction(CelestialBodyFactory.getMoon()));
- numericalPropagator.setOrbitType(type);
- numericalPropagator.setInitialState(state);
- numericalPropagator.setAttitudeProvider(attitudeProvider);
-
- return numericalPropagator;
- }
-
- /** Generate the orbit.
- */
- public List<TimeStampedPVCoordinates> orbitToPV(final Orbit orbit, final BodyShape earth,
- final AbsoluteDate minDate, final AbsoluteDate maxDate,
- final double step)
- throws OrekitException {
-
- final Propagator propagator = new KeplerianPropagator(orbit);
-
- propagator.setAttitudeProvider(createAttitudeProvider(earth, orbit));
-
- propagator.propagate(minDate);
- final List<TimeStampedPVCoordinates> list = new ArrayList<TimeStampedPVCoordinates>();
- propagator.setMasterMode(step,
- (currentState, isLast) ->
- list.add(new TimeStampedPVCoordinates(currentState.getDate(),
- currentState.getPVCoordinates().getPosition(),
- currentState.getPVCoordinates().getVelocity(),
- Vector3D.ZERO)));
- propagator.propagate(maxDate);
-
- return list;
- }
-
- /** Generate the attitude.
- */
- public List<TimeStampedAngularCoordinates> orbitToQ(final Orbit orbit, final BodyShape earth,
- final AbsoluteDate minDate, final AbsoluteDate maxDate,
- final double step)
- throws OrekitException {
-
- final Propagator propagator = new KeplerianPropagator(orbit);
- propagator.setAttitudeProvider(createAttitudeProvider(earth, orbit));
- propagator.propagate(minDate);
- final List<TimeStampedAngularCoordinates> list = new ArrayList<>();
- propagator.setMasterMode(step,
- (currentState, isLast) ->
- list.add(new TimeStampedAngularCoordinates(currentState.getDate(),
- currentState.getAttitude().getRotation(),
- Vector3D.ZERO,
- Vector3D.ZERO)));
- propagator.propagate(maxDate);
-
- return list;
- }
-}
-
-
-/**
- * Pleiades viewing model class definition.
- */
-class PleiadesViewingModel {
-
- /** Pleiades parameters. */
- private static final double FOV = 1.65; // 20km - alt 694km
- private static final int DIMENSION = 40000;
- private static final double LINE_PERIOD = 1.e-4;
-
- private double incidenceAngle;
- private LineSensor lineSensor;
- private String referenceDate;
- private String sensorName;
-
-
- /** Simple constructor.
- * <p>
- * initialize PleiadesViewingModel with
- * sensorName="line", incidenceAngle = 0.0, date = "2016-01-01T12:00:00.0"
- * </p>
- */
- public PleiadesViewingModel(final String sensorName) throws RuggedException, OrekitException {
-
- this(sensorName, 0.0, "2016-01-01T12:00:00.0");
- }
-
- /** PleiadesViewingModel constructor.
- * @param sensorName sensor name
- * @param incidenceAngle incidence angle
- * @param referenceDate reference date
- */
- public PleiadesViewingModel(final String sensorName, final double incidenceAngle, final String referenceDate)
- throws RuggedException, OrekitException {
-
- this.sensorName = sensorName;
- this.referenceDate = referenceDate;
- this.incidenceAngle = incidenceAngle;
- this.createLineSensor();
- }
-
- /** Create raw fixed Line Of sight
- */
- public LOSBuilder rawLOS(final Vector3D center, final Vector3D normal, final double halfAperture, final int n) {
-
- final List<Vector3D> list = new ArrayList<Vector3D>(n);
- for (int i = 0; i < n; ++i) {
- final double alpha = (halfAperture * (2 * i + 1 - n)) / (n - 1);
- list.add(new Rotation(normal, alpha, RotationConvention.VECTOR_OPERATOR).applyTo(center));
- }
-
- return new LOSBuilder(list);
- }
-
- /** Build a LOS provider
- */
- public TimeDependentLOS buildLOS() {
-
- final LOSBuilder losBuilder = rawLOS(new Rotation(Vector3D.PLUS_I,
- FastMath.toRadians(incidenceAngle),
- RotationConvention.VECTOR_OPERATOR).applyTo(Vector3D.PLUS_K),
- Vector3D.PLUS_I, FastMath.toRadians(FOV / 2), DIMENSION);
-
- losBuilder.addTransform(new FixedRotation(sensorName + RefiningTest.rollSuffix, Vector3D.MINUS_I, 0.00));
- losBuilder.addTransform(new FixedRotation(sensorName + RefiningTest.pitchSuffix, Vector3D.MINUS_J, 0.00));
-
- // factor is a common parameters shared between all Pleiades models
- losBuilder.addTransform(new FixedZHomothety(RefiningTest.factorName, 1.0));
-
- return losBuilder.build();
- }
-
-
- /** Get the reference date.
- */
- public AbsoluteDate getDatationReference() throws OrekitException {
-
- // We use Orekit for handling time and dates, and Rugged for defining the datation model:
- final TimeScale utc = TimeScalesFactory.getUTC();
-
- return new AbsoluteDate(referenceDate, utc);
- }
-
- /** Get the min date.
- */
- public AbsoluteDate getMinDate() throws RuggedException {
- return lineSensor.getDate(0);
- }
-
- /** Get the max date.
- */
- public AbsoluteDate getMaxDate() throws RuggedException {
- return lineSensor.getDate(DIMENSION);
- }
-
- /** Get the line sensor.
- */
- public LineSensor getLineSensor() {
- return lineSensor;
- }
-
- /** Get the sensor name.
- */
- public String getSensorName() {
- return sensorName;
- }
-
- /** Get the number of lines of the sensor.
- * @return the number of lines of the sensor
- */
- public int getDimension() {
- return DIMENSION;
- }
-
- /** Create the line sensor.
- */
- private void createLineSensor() throws RuggedException, OrekitException {
-
- // Offset of the MSI from center of mass of satellite
- // one line sensor
- // los: swath in the (YZ) plane, looking at 50° roll, 2.6" per pixel
- final Vector3D msiOffset = new Vector3D(0, 0, 0);
-
- final TimeDependentLOS lineOfSight = buildLOS();
-
- final double rate = 1. / LINE_PERIOD;
- // linear datation model: at reference time we get the middle line, and the rate is one line every 1.5ms
-
- final LineDatation lineDatation = new LinearLineDatation(getDatationReference(), DIMENSION / 2, rate);
-
- lineSensor = new LineSensor(sensorName, lineDatation, msiOffset, lineOfSight);
- }
-}
diff --git a/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java b/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java
index 558cb928318598694bfdba596cc780335170dde6..f6e782b92650c36724e5ecff681c1e41dd5777d6 100644
--- a/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java
+++ b/src/test/java/org/orekit/rugged/utils/RoughVisibilityEstimatorTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,13 +16,13 @@
*/
package org.orekit.rugged.utils;
-import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
-import org.hipparchus.util.FastMath;
import java.io.File;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
+import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
+import org.hipparchus.util.FastMath;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -51,7 +51,6 @@ import org.orekit.propagation.Propagator;
import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.numerical.NumericalPropagator;
import org.orekit.propagation.sampling.OrekitFixedStepHandler;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScalesFactory;
import org.orekit.utils.Constants;
@@ -61,8 +60,7 @@ import org.orekit.utils.TimeStampedPVCoordinates;
public class RoughVisibilityEstimatorTest {
@Test
- public void testThreeOrbitsSpan()
- throws RuggedException, OrekitException, URISyntaxException {
+ public void testThreeOrbitsSpan() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -87,8 +85,7 @@ public class RoughVisibilityEstimatorTest {
}
@Test
- public void testOneOrbitsSpan()
- throws RuggedException, OrekitException, URISyntaxException {
+ public void testOneOrbitsSpan() throws URISyntaxException {
String path = getClass().getClassLoader().getResource("orekit-data").toURI().getPath();
DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(new File(path)));
@@ -112,20 +109,17 @@ public class RoughVisibilityEstimatorTest {
}
- private BodyShape createEarth()
- throws OrekitException {
+ private BodyShape createEarth() {
return new OneAxisEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
FramesFactory.getITRF(IERSConventions.IERS_2010, true));
}
- private NormalizedSphericalHarmonicsProvider createGravityField()
- throws OrekitException {
+ private NormalizedSphericalHarmonicsProvider createGravityField() {
return GravityFieldFactory.getNormalizedProvider(12, 12);
}
- private Orbit createOrbit(double mu)
- throws OrekitException {
+ private Orbit createOrbit(double mu) {
// the following orbital parameters have been computed using
// Orekit tutorial about phasing, using the following configuration:
//
@@ -149,8 +143,7 @@ public class RoughVisibilityEstimatorTest {
private Propagator createPropagator(BodyShape earth,
NormalizedSphericalHarmonicsProvider gravityField,
- Orbit orbit)
- throws OrekitException {
+ Orbit orbit) {
AttitudeProvider yawCompensation = new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth));
SpacecraftState state = new SpacecraftState(orbit,
diff --git a/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java b/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java
index 439a71770867ee3d84cee49ee05ab88e2b5d5a3d..cbd67c2f133df021bf4556515db6173f4670e9d2 100644
--- a/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java
+++ b/src/test/java/org/orekit/rugged/utils/SpacecraftToObservedBodyTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -71,7 +71,7 @@ public class SpacecraftToObservedBodyTest {
@Test
- public void testIssue256() throws RuggedException, OrekitException {
+ public void testIssue256() {
AbsoluteDate minSensorDate = sensor.getDate(0);
AbsoluteDate maxSensorDate = sensor.getDate(2000);
diff --git a/src/test/resources/orekit-data/UTC-TAI.history b/src/test/resources/orekit-data/UTC-TAI.history
index 2d8f96b7633fd37267a26cc01f86cda97e6962c9..45a25bfadecf60ea3408877dacb896b7eb38fdb4 100644
--- a/src/test/resources/orekit-data/UTC-TAI.history
+++ b/src/test/resources/orekit-data/UTC-TAI.history
@@ -21,15 +21,15 @@
1968 Feb. 1 - 1972 Jan. 1 4.213 170 0s + ""
1972 Jan. 1 - Jul. 1 10s
Jul. 1 - 1973 Jan. 1 11s
- 1973 Jan. 1 - 1974 Jan. 1 12s
- 1974 Jan. 1 - 1975 Jan. 1 13s
- 1975 Jan. 1 - 1976 Jan. 1 14s
- 1976 Jan. 1 - 1977 Jan. 1 15s
+ 1973 Jan. 1 - 1974 Jan. 1 12s
+ 1974 Jan. 1 - 1975 Jan. 1 13s
+ 1975 Jan. 1 - 1976 Jan. 1 14s
+ 1976 Jan. 1 - 1977 Jan. 1 15s
1977 Jan. 1 - 1978 Jan. 1 16s
- 1978 Jan. 1 - 1979 Jan. 1 17s
- 1979 Jan. 1 - 1980 Jan. 1 18s
- 1980 Jan. 1 - 1981 Jul. 1 19s
- 1981 Jul. 1 - 1982 Jul. 1 20s
+ 1978 Jan. 1 - 1979 Jan. 1 17s
+ 1979 Jan. 1 - 1980 Jan. 1 18s
+ 1980 Jan. 1 - 1981 Jul. 1 19s
+ 1981 Jul. 1 - 1982 Jul. 1 20s
1982 Jul. 1 - 1983 Jul. 1 21s
1983 Jul. 1 - 1985 Jul. 1 22s
1985 Jul. 1 - 1988 Jan. 1 23s
@@ -44,5 +44,7 @@
1999 Jan. 1.- 2006 Jan. 1 32s
2006 Jan. 1.- 2009 Jan. 1 33s
2009 Jan. 1.- 2012 Jul 1 34s
- 2012 Jul 1 - 35s
+ 2012 Jul 1 - 2015 Jul 1 35s
+ 2015 Jul 1 - 2017 Jan 1 36s
+ 2017 Jan 1 - 37s
----------------------------------------------------------------------
diff --git a/src/test/resources/orekit-data/eopc04_08_IAU2000.13 b/src/test/resources/orekit-data/eopc04_08_IAU2000.13
new file mode 100644
index 0000000000000000000000000000000000000000..b32dfc612aec739e214c3c7598f10819e0382678
--- /dev/null
+++ b/src/test/resources/orekit-data/eopc04_08_IAU2000.13
@@ -0,0 +1,379 @@
+
+
+ INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE
+ EARTH ORIENTATION PARAMETERS
+ EOP (IERS) 08 C04
+
+
+ FORMAT(3(I4),I7,2(F11.6),2(F12.7),2(F11.6),2(F11.6),2(F11.7),2F12.6)
+**********************************************************************************
+
+ Date MJD x y UT1-UTC LOD dX dY x Err y Err UT1-UTC Err LOD Err dX Err dY Err
+ " " s s " " " " s s " "
+ (0h UTC)
+
+2013 1 1 56293 0.075310 0.289856 0.2770907 0.0008953 0.000305 0.000222 0.000018 0.000028 0.0000053 0.0000061 0.000024 0.000036
+2013 1 2 56294 0.073304 0.289898 0.2761366 0.0010388 0.000311 0.000209 0.000017 0.000027 0.0000030 0.0000058 0.000029 0.000042
+2013 1 3 56295 0.071432 0.289699 0.2750374 0.0011460 0.000319 0.000191 0.000019 0.000027 0.0000008 0.0000058 0.000033 0.000048
+2013 1 4 56296 0.070098 0.289581 0.2738579 0.0012008 0.000213 0.000153 0.000017 0.000027 0.0000002 0.0000058 0.000016 0.000026
+2013 1 5 56297 0.069042 0.289567 0.2726572 0.0012058 0.000165 0.000115 0.000015 0.000027 0.0000120 0.0000058 0.000014 0.000027
+2013 1 6 56298 0.068196 0.289667 0.2714547 0.0011330 0.000149 0.000080 0.000015 0.000027 0.0000105 0.0000058 0.000020 0.000038
+2013 1 7 56299 0.067202 0.290066 0.2703787 0.0009866 0.000134 0.000048 0.000018 0.000029 0.0000061 0.0000060 0.000026 0.000050
+2013 1 8 56300 0.066292 0.290535 0.2694610 0.0008848 0.000121 0.000019 0.000020 0.000029 0.0000013 0.0000060 0.000032 0.000061
+2013 1 9 56301 0.065345 0.291314 0.2686011 0.0008299 0.000155 0.000022 0.000018 0.000028 0.0000093 0.0000058 0.000043 0.000074
+2013 1 10 56302 0.064410 0.292185 0.2677166 0.0008850 0.000206 0.000037 0.000016 0.000028 0.0000055 0.0000058 0.000056 0.000090
+2013 1 11 56303 0.063228 0.293001 0.2667804 0.0010202 0.000259 0.000058 0.000018 0.000028 0.0000017 0.0000058 0.000070 0.000106
+2013 1 12 56304 0.062007 0.293634 0.2657273 0.0011708 0.000285 0.000069 0.000020 0.000028 0.0000073 0.0000058 0.000067 0.000102
+2013 1 13 56305 0.060558 0.294295 0.2644642 0.0013139 0.000296 0.000074 0.000020 0.000031 0.0000051 0.0000065 0.000058 0.000091
+2013 1 14 56306 0.059312 0.295115 0.2630661 0.0014745 0.000297 0.000110 0.000018 0.000034 0.0000061 0.0000069 0.000051 0.000085
+2013 1 15 56307 0.058302 0.295904 0.2615439 0.0015341 0.000287 0.000095 0.000016 0.000031 0.0000067 0.0000061 0.000042 0.000073
+2013 1 16 56308 0.057049 0.296543 0.2600685 0.0014583 0.000263 0.000077 0.000016 0.000033 0.0000014 0.0000058 0.000022 0.000060
+2013 1 17 56309 0.055451 0.297451 0.2586723 0.0013456 0.000229 0.000066 0.000016 0.000068 0.0000098 0.0000058 0.000023 0.000060
+2013 1 18 56310 0.053948 0.298279 0.2573663 0.0012650 0.000190 0.000056 0.000016 0.000068 0.0000024 0.0000058 0.000027 0.000063
+2013 1 19 56311 0.052961 0.299392 0.2561193 0.0011997 0.000194 0.000064 0.000018 0.000033 0.0000077 0.0000062 0.000025 0.000059
+2013 1 20 56312 0.051723 0.300681 0.2549468 0.0011070 0.000215 0.000076 0.000021 0.000039 0.0000089 0.0000072 0.000021 0.000051
+2013 1 21 56313 0.050316 0.301866 0.2538462 0.0010660 0.000234 0.000086 0.000021 0.000039 0.0000078 0.0000072 0.000034 0.000045
+2013 1 22 56314 0.049409 0.302778 0.2527747 0.0010632 0.000254 0.000094 0.000017 0.000033 0.0000045 0.0000061 0.000027 0.000037
+2013 1 23 56315 0.048658 0.304062 0.2517351 0.0010777 0.000271 0.000100 0.000017 0.000031 0.0000010 0.0000059 0.000020 0.000030
+2013 1 24 56316 0.047848 0.305129 0.2506394 0.0011155 0.000190 0.000068 0.000017 0.000031 0.0000130 0.0000059 0.000078 0.000120
+2013 1 25 56317 0.047084 0.305881 0.2495234 0.0011164 0.000088 0.000024 0.000019 0.000034 0.0000021 0.0000063 0.000154 0.000236
+2013 1 26 56318 0.046371 0.306470 0.2483765 0.0011738 0.000088 0.000013 0.000021 0.000037 0.0000123 0.0000066 0.000148 0.000225
+2013 1 27 56319 0.045599 0.306874 0.2471377 0.0013068 0.000131 0.000012 0.000021 0.000034 0.0000038 0.0000066 0.000112 0.000168
+2013 1 28 56320 0.044918 0.307151 0.2457751 0.0014177 0.000178 0.000008 0.000020 0.000033 0.0000040 0.0000069 0.000079 0.000115
+2013 1 29 56321 0.044014 0.307627 0.2443075 0.0014914 0.000230 0.000004 0.000020 0.000033 0.0000016 0.0000069 0.000042 0.000056
+2013 1 30 56322 0.043132 0.308172 0.2427764 0.0015553 0.000260 -0.000025 0.000019 0.000033 0.0000141 0.0000071 0.000043 0.000054
+2013 1 31 56323 0.042804 0.309225 0.2412309 0.0015468 0.000282 -0.000061 0.000019 0.000036 0.0000052 0.0000071 0.000054 0.000066
+2013 2 1 56324 0.042402 0.310532 0.2397409 0.0014332 0.000298 -0.000099 0.000019 0.000033 0.0000015 0.0000071 0.000064 0.000079
+2013 2 2 56325 0.042573 0.311892 0.2383674 0.0012980 0.000286 -0.000135 0.000017 0.000030 0.0000095 0.0000067 0.000060 0.000074
+2013 2 3 56326 0.042527 0.313519 0.2371341 0.0011515 0.000261 -0.000167 0.000015 0.000030 0.0000039 0.0000060 0.000051 0.000064
+2013 2 4 56327 0.041943 0.314696 0.2360251 0.0010576 0.000228 -0.000193 0.000017 0.000031 0.0000039 0.0000066 0.000043 0.000054
+2013 2 5 56328 0.041026 0.315632 0.2350277 0.0009339 0.000195 -0.000211 0.000019 0.000031 0.0000015 0.0000070 0.000033 0.000043
+2013 2 6 56329 0.039925 0.316871 0.2341112 0.0009146 0.000182 -0.000204 0.000017 0.000029 0.0000103 0.0000068 0.000040 0.000050
+2013 2 7 56330 0.038904 0.318468 0.2331814 0.0009866 0.000177 -0.000184 0.000017 0.000029 0.0000027 0.0000068 0.000051 0.000061
+2013 2 8 56331 0.037461 0.319742 0.2321391 0.0011251 0.000177 -0.000157 0.000017 0.000032 0.0000015 0.0000068 0.000062 0.000073
+2013 2 9 56332 0.036213 0.320493 0.2309424 0.0012819 0.000175 -0.000138 0.000017 0.000035 0.0000131 0.0000069 0.000064 0.000075
+2013 2 10 56333 0.035528 0.321217 0.2296106 0.0013781 0.000173 -0.000119 0.000018 0.000034 0.0000037 0.0000074 0.000062 0.000075
+2013 2 11 56334 0.035202 0.322110 0.2281932 0.0014360 0.000177 -0.000098 0.000022 0.000033 0.0000058 0.0000071 0.000061 0.000074
+2013 2 12 56335 0.034936 0.323155 0.2267687 0.0013864 0.000187 -0.000076 0.000022 0.000030 0.0000059 0.0000067 0.000059 0.000073
+2013 2 13 56336 0.034437 0.324038 0.2254403 0.0012154 0.000197 -0.000057 0.000021 0.000035 0.0000012 0.0000066 0.000058 0.000072
+2013 2 14 56337 0.033839 0.324559 0.2242863 0.0010507 0.000219 -0.000002 0.000021 0.000038 0.0000162 0.0000070 0.000049 0.000063
+2013 2 15 56338 0.033897 0.325100 0.2232824 0.0009415 0.000245 0.000057 0.000019 0.000035 0.0000011 0.0000066 0.000037 0.000052
+2013 2 16 56339 0.033941 0.325933 0.2223836 0.0008336 0.000265 0.000057 0.000017 0.000032 0.0000189 0.0000062 0.000038 0.000053
+2013 2 17 56340 0.033665 0.326909 0.2215868 0.0007367 0.000282 0.000029 0.000019 0.000032 0.0000032 0.0000066 0.000042 0.000059
+2013 2 18 56341 0.033343 0.327848 0.2208980 0.0006401 0.000293 -0.000004 0.000019 0.000031 0.0000036 0.0000073 0.000049 0.000064
+2013 2 19 56342 0.033016 0.329142 0.2202777 0.0005919 0.000305 -0.000047 0.000019 0.000031 0.0000017 0.0000073 0.000053 0.000070
+2013 2 20 56343 0.032971 0.330293 0.2196491 0.0006588 0.000325 -0.000058 0.000020 0.000030 0.0000208 0.0000068 0.000056 0.000068
+2013 2 21 56344 0.032764 0.331394 0.2189361 0.0007661 0.000343 -0.000062 0.000020 0.000033 0.0000063 0.0000068 0.000059 0.000066
+2013 2 22 56345 0.032560 0.332411 0.2180799 0.0009389 0.000356 -0.000067 0.000022 0.000035 0.0000013 0.0000076 0.000062 0.000065
+2013 2 23 56346 0.032021 0.333397 0.2170537 0.0011245 0.000351 -0.000100 0.000022 0.000035 0.0000360 0.0000080 0.000061 0.000063
+2013 2 24 56347 0.031547 0.334330 0.2158533 0.0012915 0.000334 -0.000139 0.000022 0.000033 0.0000035 0.0000076 0.000060 0.000061
+2013 2 25 56348 0.030709 0.334905 0.2144766 0.0014607 0.000295 -0.000159 0.000023 0.000032 0.0000033 0.0000073 0.000057 0.000059
+2013 2 26 56349 0.029709 0.335104 0.2129240 0.0016352 0.000270 -0.000190 0.000023 0.000032 0.0000013 0.0000073 0.000056 0.000057
+2013 2 27 56350 0.029307 0.335794 0.2112407 0.0017303 0.000283 -0.000207 0.000028 0.000037 0.0000210 0.0000076 0.000064 0.000063
+2013 2 28 56351 0.029597 0.336794 0.2094895 0.0017399 0.000305 -0.000217 0.000028 0.000037 0.0000062 0.0000076 0.000074 0.000071
+2013 3 1 56352 0.030243 0.338132 0.2077371 0.0017242 0.000325 -0.000220 0.000028 0.000041 0.0000015 0.0000076 0.000084 0.000080
+2013 3 2 56353 0.030488 0.339745 0.2060790 0.0015855 0.000322 -0.000235 0.000026 0.000041 0.0000141 0.0000072 0.000100 0.000105
+2013 3 3 56354 0.030848 0.341230 0.2045416 0.0014922 0.000305 -0.000248 0.000026 0.000041 0.0000035 0.0000080 0.000118 0.000136
+2013 3 4 56355 0.031163 0.342793 0.2030631 0.0014730 0.000280 -0.000253 0.000023 0.000039 0.0000035 0.0000086 0.000138 0.000171
+2013 3 5 56356 0.031611 0.343977 0.2015976 0.0014735 0.000249 -0.000247 0.000023 0.000036 0.0000022 0.0000082 0.000156 0.000203
+2013 3 6 56357 0.032058 0.344980 0.2001138 0.0015136 0.000208 -0.000183 0.000021 0.000036 0.0000104 0.0000083 0.000134 0.000179
+2013 3 7 56358 0.032962 0.345676 0.1985635 0.0016159 0.000164 -0.000104 0.000021 0.000040 0.0000040 0.0000087 0.000103 0.000142
+2013 3 8 56359 0.034232 0.346404 0.1969090 0.0017065 0.000121 -0.000025 0.000021 0.000036 0.0000016 0.0000087 0.000072 0.000106
+2013 3 9 56360 0.035551 0.347362 0.1951480 0.0018239 0.000115 0.000018 0.000019 0.000033 0.0000151 0.0000083 0.000065 0.000095
+2013 3 10 56361 0.036634 0.348518 0.1932916 0.0019075 0.000127 0.000042 0.000019 0.000036 0.0000029 0.0000083 0.000067 0.000094
+2013 3 11 56362 0.037679 0.349957 0.1913827 0.0019055 0.000170 0.000068 0.000020 0.000037 0.0000062 0.0000084 0.000069 0.000094
+2013 3 12 56363 0.038791 0.351869 0.1894875 0.0018686 0.000194 0.000074 0.000018 0.000033 0.0000067 0.0000077 0.000071 0.000092
+2013 3 13 56364 0.039884 0.354087 0.1876517 0.0017802 0.000210 0.000075 0.000018 0.000034 0.0000012 0.0000075 0.000074 0.000092
+2013 3 14 56365 0.040481 0.355956 0.1859185 0.0016696 0.000240 0.000018 0.000018 0.000034 0.0000145 0.0000075 0.000066 0.000081
+2013 3 15 56366 0.040942 0.357387 0.1843097 0.0015444 0.000265 -0.000054 0.000016 0.000034 0.0000013 0.0000075 0.000056 0.000068
+2013 3 16 56367 0.040901 0.358605 0.1828274 0.0014094 0.000286 -0.000105 0.000018 0.000034 0.0000139 0.0000079 0.000059 0.000072
+2013 3 17 56368 0.041061 0.359554 0.1814609 0.0013064 0.000298 -0.000144 0.000020 0.000037 0.0000031 0.0000082 0.000067 0.000083
+2013 3 18 56369 0.041602 0.360244 0.1801933 0.0012257 0.000292 -0.000172 0.000022 0.000046 0.0000032 0.0000084 0.000075 0.000095
+2013 3 19 56370 0.042509 0.360690 0.1790038 0.0011488 0.000286 -0.000190 0.000022 0.000046 0.0000016 0.0000085 0.000083 0.000106
+2013 3 20 56371 0.043558 0.361269 0.1778524 0.0011518 0.000259 -0.000174 0.000021 0.000042 0.0000182 0.0000087 0.000074 0.000093
+2013 3 21 56372 0.044679 0.362180 0.1766940 0.0011941 0.000224 -0.000143 0.000021 0.000042 0.0000076 0.0000087 0.000062 0.000077
+2013 3 22 56373 0.045142 0.363185 0.1754806 0.0012650 0.000190 -0.000108 0.000021 0.000042 0.0000011 0.0000084 0.000050 0.000061
+2013 3 23 56374 0.045731 0.364433 0.1741466 0.0014234 0.000183 -0.000078 0.000021 0.000039 0.0000124 0.0000084 0.000044 0.000055
+2013 3 24 56375 0.046501 0.365546 0.1726579 0.0015763 0.000190 -0.000055 0.000021 0.000039 0.0000033 0.0000084 0.000041 0.000053
+2013 3 25 56376 0.047553 0.366900 0.1710171 0.0017087 0.000199 -0.000040 0.000024 0.000040 0.0000034 0.0000082 0.000032 0.000047
+2013 3 26 56377 0.048035 0.368190 0.1692350 0.0018537 0.000216 -0.000038 0.000024 0.000036 0.0000012 0.0000082 0.000030 0.000045
+2013 3 27 56378 0.048658 0.369461 0.1673193 0.0019571 0.000193 -0.000101 0.000024 0.000032 0.0000003 0.0000081 0.000035 0.000051
+2013 3 28 56379 0.049532 0.370878 0.1653462 0.0019493 0.000200 -0.000151 0.000021 0.000032 0.0000132 0.0000081 0.000035 0.000052
+2013 3 29 56380 0.050475 0.372076 0.1634083 0.0018880 0.000223 -0.000192 0.000021 0.000032 0.0000098 0.0000081 0.000034 0.000049
+2013 3 30 56381 0.051030 0.373287 0.1615621 0.0017866 0.000244 -0.000229 0.000021 0.000032 0.0000066 0.0000081 0.000032 0.000047
+2013 3 31 56382 0.051422 0.374395 0.1598229 0.0016822 0.000261 -0.000258 0.000021 0.000032 0.0000034 0.0000081 0.000031 0.000045
+2013 4 1 56383 0.051214 0.375299 0.1581763 0.0016152 0.000265 -0.000273 0.000023 0.000033 0.0000032 0.0000089 0.000029 0.000044
+2013 4 2 56384 0.050902 0.376037 0.1565882 0.0015642 0.000270 -0.000279 0.000023 0.000033 0.0000026 0.0000089 0.000028 0.000042
+2013 4 3 56385 0.051000 0.376745 0.1550193 0.0015665 0.000269 -0.000274 0.000020 0.000029 0.0000009 0.0000079 0.000027 0.000039
+2013 4 4 56386 0.051505 0.377383 0.1534214 0.0016313 0.000196 -0.000196 0.000020 0.000029 0.0000126 0.0000083 0.000029 0.000039
+2013 4 5 56387 0.052276 0.378082 0.1517328 0.0017658 0.000107 -0.000098 0.000020 0.000029 0.0000010 0.0000083 0.000033 0.000039
+2013 4 6 56388 0.052845 0.378754 0.1499249 0.0018676 0.000119 -0.000077 0.000018 0.000029 0.0000128 0.0000079 0.000030 0.000034
+2013 4 7 56389 0.053129 0.379352 0.1480361 0.0019019 0.000172 -0.000088 0.000018 0.000029 0.0000034 0.0000080 0.000023 0.000027
+2013 4 8 56390 0.053558 0.380052 0.1461365 0.0018727 0.000211 -0.000095 0.000023 0.000031 0.0000034 0.0000084 0.000017 0.000021
+2013 4 9 56391 0.054118 0.381208 0.1442935 0.0018016 0.000268 -0.000118 0.000026 0.000031 0.0000010 0.0000088 0.000010 0.000014
+2013 4 10 56392 0.054958 0.382367 0.1425544 0.0016754 0.000296 -0.000136 0.000023 0.000035 0.0000162 0.0000093 0.000017 0.000026
+2013 4 11 56393 0.055463 0.383473 0.1409548 0.0015061 0.000316 -0.000154 0.000023 0.000035 0.0000078 0.0000087 0.000027 0.000043
+2013 4 12 56394 0.055503 0.384248 0.1395110 0.0013579 0.000331 -0.000175 0.000023 0.000032 0.0000012 0.0000079 0.000037 0.000060
+2013 4 13 56395 0.055466 0.385068 0.1382134 0.0012326 0.000331 -0.000180 0.000023 0.000031 0.0000235 0.0000081 0.000048 0.000076
+2013 4 14 56396 0.055484 0.385646 0.1370305 0.0011411 0.000322 -0.000178 0.000023 0.000031 0.0000040 0.0000085 0.000060 0.000092
+2013 4 15 56397 0.055607 0.386035 0.1359184 0.0010907 0.000303 -0.000168 0.000025 0.000034 0.0000037 0.0000092 0.000072 0.000108
+2013 4 16 56398 0.055929 0.386392 0.1348169 0.0011174 0.000284 -0.000162 0.000025 0.000034 0.0000026 0.0000087 0.000084 0.000124
+2013 4 17 56399 0.056522 0.386975 0.1336791 0.0011618 0.000261 -0.000156 0.000022 0.000034 0.0000017 0.0000082 0.000105 0.000143
+2013 4 18 56400 0.057528 0.387547 0.1325125 0.0011964 0.000282 -0.000164 0.000019 0.000034 0.0000119 0.0000082 0.000080 0.000106
+2013 4 19 56401 0.058638 0.388699 0.1312775 0.0013092 0.000313 -0.000175 0.000019 0.000034 0.0000011 0.0000078 0.000045 0.000055
+2013 4 20 56402 0.059400 0.389916 0.1298980 0.0014732 0.000321 -0.000214 0.000022 0.000034 0.0000146 0.0000078 0.000037 0.000043
+2013 4 21 56403 0.060039 0.390944 0.1283636 0.0015956 0.000316 -0.000260 0.000022 0.000034 0.0000033 0.0000078 0.000039 0.000046
+2013 4 22 56404 0.061024 0.391927 0.1267085 0.0017050 0.000300 -0.000284 0.000018 0.000033 0.0000031 0.0000082 0.000040 0.000050
+2013 4 23 56405 0.062011 0.392789 0.1249559 0.0018000 0.000282 -0.000319 0.000016 0.000031 0.0000010 0.0000086 0.000042 0.000053
+2013 4 24 56406 0.062979 0.393349 0.1231388 0.0018280 0.000248 -0.000337 0.000019 0.000029 0.0000225 0.0000081 0.000094 0.000134
+2013 4 25 56407 0.063907 0.393885 0.1213194 0.0017907 0.000207 -0.000347 0.000022 0.000029 0.0000051 0.0000077 0.000160 0.000234
+2013 4 26 56408 0.064780 0.394217 0.1195726 0.0016971 0.000164 -0.000350 0.000024 0.000029 0.0000029 0.0000081 0.000226 0.000335
+2013 4 27 56409 0.065690 0.394751 0.1179550 0.0015370 0.000139 -0.000354 0.000024 0.000029 0.0000110 0.0000089 0.000206 0.000306
+2013 4 28 56410 0.066110 0.395232 0.1164902 0.0013879 0.000123 -0.000354 0.000024 0.000029 0.0000036 0.0000089 0.000156 0.000229
+2013 4 29 56411 0.066926 0.395496 0.1151226 0.0013580 0.000082 -0.000312 0.000022 0.000033 0.0000031 0.0000086 0.000103 0.000153
+2013 4 30 56412 0.067935 0.395987 0.1137639 0.0013742 0.000071 -0.000293 0.000020 0.000033 0.0000012 0.0000081 0.000051 0.000077
+2013 5 1 56413 0.069079 0.396187 0.1123734 0.0014241 0.000058 -0.000278 0.000018 0.000031 0.0000133 0.0000077 0.000042 0.000066
+2013 5 2 56414 0.070601 0.396865 0.1108968 0.0015399 0.000051 -0.000261 0.000020 0.000031 0.0000025 0.0000081 0.000044 0.000072
+2013 5 3 56415 0.072194 0.397607 0.1092979 0.0016617 0.000051 -0.000241 0.000022 0.000031 0.0000013 0.0000081 0.000046 0.000078
+2013 5 4 56416 0.073934 0.398142 0.1076280 0.0017014 0.000062 -0.000202 0.000020 0.000031 0.0000133 0.0000077 0.000047 0.000077
+2013 5 5 56417 0.075382 0.398690 0.1059460 0.0016757 0.000080 -0.000156 0.000020 0.000031 0.0000024 0.0000077 0.000047 0.000073
+2013 5 6 56418 0.076726 0.399162 0.1042827 0.0016511 0.000098 -0.000109 0.000021 0.000033 0.0000053 0.0000084 0.000047 0.000069
+2013 5 7 56419 0.077727 0.399520 0.1026651 0.0015729 0.000123 -0.000072 0.000021 0.000033 0.0000059 0.0000084 0.000047 0.000065
+2013 5 8 56420 0.078782 0.399676 0.1011258 0.0014570 0.000147 -0.000041 0.000020 0.000032 0.0000013 0.0000077 0.000045 0.000059
+2013 5 9 56421 0.080212 0.400159 0.0997499 0.0012809 0.000097 -0.000090 0.000017 0.000032 0.0000136 0.0000073 0.000084 0.000101
+2013 5 10 56422 0.081756 0.400479 0.0985505 0.0011247 0.000028 -0.000164 0.000020 0.000032 0.0000021 0.0000077 0.000131 0.000156
+2013 5 11 56423 0.084245 0.400858 0.0974696 0.0010228 0.000054 -0.000180 0.000022 0.000032 0.0000131 0.0000081 0.000127 0.000151
+2013 5 12 56424 0.086309 0.401440 0.0964810 0.0009413 0.000114 -0.000173 0.000020 0.000032 0.0000031 0.0000077 0.000102 0.000123
+2013 5 13 56425 0.088337 0.402161 0.0955606 0.0009037 0.000166 -0.000149 0.000022 0.000032 0.0000034 0.0000079 0.000082 0.000103
+2013 5 14 56426 0.089451 0.403203 0.0946677 0.0009035 0.000218 -0.000142 0.000024 0.000032 0.0000015 0.0000078 0.000056 0.000073
+2013 5 15 56427 0.090741 0.403960 0.0937434 0.0009546 0.000183 -0.000224 0.000022 0.000033 0.0000164 0.0000073 0.000054 0.000075
+2013 5 16 56428 0.091099 0.404564 0.0927334 0.0010329 0.000124 -0.000325 0.000022 0.000033 0.0000061 0.0000077 0.000059 0.000088
+2013 5 17 56429 0.091665 0.404720 0.0916057 0.0011913 0.000062 -0.000418 0.000022 0.000033 0.0000013 0.0000077 0.000063 0.000101
+2013 5 18 56430 0.092279 0.404886 0.0903432 0.0013154 0.000089 -0.000442 0.000022 0.000033 0.0000170 0.0000077 0.000063 0.000100
+2013 5 19 56431 0.093382 0.404814 0.0889580 0.0014222 0.000152 -0.000430 0.000024 0.000033 0.0000031 0.0000077 0.000062 0.000093
+2013 5 20 56432 0.094812 0.404856 0.0874807 0.0015032 0.000109 -0.000393 0.000020 0.000030 0.0000031 0.0000070 0.000128 0.000171
+2013 5 21 56433 0.096671 0.405103 0.0859534 0.0015170 0.000129 -0.000354 0.000020 0.000030 0.0000026 0.0000070 0.000152 0.000195
+2013 5 22 56434 0.098090 0.405783 0.0844501 0.0014488 0.000145 -0.000310 0.000021 0.000027 0.0000040 0.0000072 0.000171 0.000218
+2013 5 23 56435 0.099439 0.406575 0.0830146 0.0013755 0.000149 -0.000249 0.000021 0.000027 0.0001122 0.0000072 0.000146 0.000196
+2013 5 24 56436 0.100665 0.407104 0.0817241 0.0012537 0.000145 -0.000186 0.000019 0.000027 0.0000018 0.0000069 0.000109 0.000162
+2013 5 25 56437 0.101494 0.407171 0.0805331 0.0011307 0.000106 -0.000193 0.000017 0.000027 0.0000250 0.0000069 0.000101 0.000154
+2013 5 26 56438 0.102303 0.407199 0.0794448 0.0010336 0.000053 -0.000224 0.000304 0.000234 0.0000054 0.0000236 0.000105 0.000156
+2013 5 27 56439 0.102856 0.407246 0.0784812 0.0009137 -0.000009 -0.000245 0.000026 0.000030 0.0000031 0.0000075 0.000114 0.000159
+2013 5 28 56440 0.103519 0.407139 0.0775747 0.0009094 -0.000057 -0.000278 0.000026 0.000034 0.0000026 0.0000075 0.000118 0.000161
+2013 5 29 56441 0.104126 0.407196 0.0766735 0.0009130 -0.000094 -0.000310 0.000025 0.000032 0.0000019 0.0000073 0.000118 0.000153
+2013 5 30 56442 0.104903 0.407053 0.0757525 0.0009351 -0.000087 -0.000262 0.000028 0.000031 0.0000112 0.0000077 0.000107 0.000133
+2013 5 31 56443 0.106365 0.406900 0.0748141 0.0009118 -0.000059 -0.000192 0.000028 0.000031 0.0000016 0.0000077 0.000092 0.000107
+2013 6 1 56444 0.108299 0.406628 0.0739569 0.0008131 -0.000001 -0.000158 0.000028 0.000031 0.0000081 0.0000077 0.000084 0.000096
+2013 6 2 56445 0.110240 0.406481 0.0732060 0.0007016 0.000068 -0.000139 0.000028 0.000031 0.0000030 0.0000077 0.000077 0.000091
+2013 6 3 56446 0.111834 0.406343 0.0725254 0.0006471 0.000136 -0.000127 0.000023 0.000030 0.0000029 0.0000074 0.000071 0.000086
+2013 6 4 56447 0.113268 0.405956 0.0719147 0.0005507 0.000197 -0.000121 0.000023 0.000030 0.0000013 0.0000074 0.000064 0.000081
+2013 6 5 56448 0.114167 0.405386 0.0714299 0.0004190 0.000151 -0.000152 0.000022 0.000028 0.0000174 0.0000072 0.000062 0.000085
+2013 6 6 56449 0.114617 0.404595 0.0710683 0.0003198 0.000072 -0.000194 0.000022 0.000028 0.0000059 0.0000072 0.000062 0.000092
+2013 6 7 56450 0.115025 0.403767 0.0707839 0.0002307 -0.000011 -0.000236 0.000022 0.000028 0.0000014 0.0000072 0.000062 0.000100
+2013 6 8 56451 0.115680 0.402894 0.0706110 0.0001381 -0.000001 -0.000257 0.000022 0.000028 0.0000279 0.0000071 0.000060 0.000096
+2013 6 9 56452 0.116312 0.402086 0.0705071 0.0000830 0.000043 -0.000264 0.000307 0.000144 0.0000033 0.0000201 0.000057 0.000089
+2013 6 10 56453 0.117352 0.401350 0.0704022 0.0000989 0.000086 -0.000262 0.000032 0.000025 0.0000027 0.0000082 0.000054 0.000081
+2013 6 11 56454 0.118269 0.401044 0.0702341 0.0001960 0.000126 -0.000255 0.000032 0.000028 0.0000013 0.0000078 0.000051 0.000074
+2013 6 12 56455 0.119218 0.400606 0.0699942 0.0002892 0.000090 -0.000217 0.000034 0.000030 0.0000187 0.0000080 0.000055 0.000075
+2013 6 13 56456 0.120723 0.399987 0.0696499 0.0004153 0.000031 -0.000173 0.000034 0.000030 0.0000028 0.0000084 0.000060 0.000079
+2013 6 14 56457 0.122404 0.399512 0.0691558 0.0005602 -0.000029 -0.000132 0.000031 0.000030 0.0000016 0.0000080 0.000066 0.000083
+2013 6 15 56458 0.123927 0.398878 0.0685337 0.0006864 -0.000064 -0.000161 0.000027 0.000030 0.0000217 0.0000076 0.000076 0.000091
+2013 6 16 56459 0.125694 0.398557 0.0678080 0.0007759 -0.000085 -0.000216 0.000027 0.000027 0.0000034 0.0000076 0.000090 0.000101
+2013 6 17 56460 0.127398 0.398251 0.0669948 0.0008524 -0.000096 -0.000257 0.000029 0.000024 0.0000034 0.0000082 0.000101 0.000110
+2013 6 18 56461 0.129288 0.397823 0.0661280 0.0008752 -0.000105 -0.000310 0.000032 0.000027 0.0000018 0.0000087 0.000114 0.000120
+2013 6 19 56462 0.131187 0.397852 0.0652819 0.0008272 -0.000095 -0.000318 0.000032 0.000063 0.0000246 0.0000085 0.000091 0.000097
+2013 6 20 56463 0.132607 0.397704 0.0644927 0.0007700 -0.000077 -0.000312 0.000029 0.000063 0.0000027 0.0000081 0.000060 0.000066
+2013 6 21 56464 0.134163 0.397002 0.0637729 0.0006587 -0.000058 -0.000298 0.000029 0.000030 0.0000011 0.0000081 0.000029 0.000035
+2013 6 22 56465 0.135302 0.396487 0.0631683 0.0005846 -0.000068 -0.000297 0.000032 0.000030 0.0000159 0.0000085 0.000029 0.000034
+2013 6 23 56466 0.136143 0.395919 0.0626275 0.0005627 -0.000089 -0.000296 0.000029 0.000030 0.0000026 0.0000085 0.000041 0.000045
+2013 6 24 56467 0.136415 0.395594 0.0620426 0.0005992 -0.000103 -0.000278 0.000029 0.000030 0.0000030 0.0000083 0.000052 0.000055
+2013 6 25 56468 0.136974 0.394965 0.0613753 0.0007043 -0.000122 -0.000264 0.000029 0.000030 0.0000016 0.0000079 0.000063 0.000065
+2013 6 26 56469 0.137552 0.394336 0.0606312 0.0007642 -0.000127 -0.000281 0.000027 0.000030 0.0000155 0.0000078 0.000061 0.000064
+2013 6 27 56470 0.138002 0.393733 0.0598411 0.0007937 -0.000127 -0.000300 0.000027 0.000030 0.0000051 0.0000077 0.000054 0.000061
+2013 6 28 56471 0.138767 0.392827 0.0590512 0.0007557 -0.000126 -0.000315 0.000027 0.000030 0.0000010 0.0000077 0.000047 0.000058
+2013 6 29 56472 0.140194 0.391993 0.0583348 0.0006506 -0.000124 -0.000272 0.000031 0.000030 0.0000299 0.0000082 0.000055 0.000055
+2013 6 30 56473 0.141516 0.391422 0.0577584 0.0004939 -0.000119 -0.000206 0.000031 0.000030 0.0000032 0.0000082 0.000070 0.000052
+2013 7 1 56474 0.142616 0.390794 0.0573666 0.0002946 -0.000050 -0.000215 0.000026 0.000031 0.0000036 0.0000072 0.000025 0.000031
+2013 7 2 56475 0.144079 0.390119 0.0571657 0.0001138 -0.000026 -0.000181 0.000026 0.000030 0.0000026 0.0000088 0.000017 0.000021
+2013 7 3 56476 0.145665 0.389520 0.0571564 -0.0000670 -0.000074 -0.000169 0.000025 0.000030 0.0000015 0.0000084 0.000063 0.000073
+2013 7 4 56477 0.146711 0.388729 0.0572832 -0.0002368 -0.000109 -0.000193 0.000025 0.000030 0.0000094 0.0000084 0.000090 0.000089
+2013 7 5 56478 0.147713 0.387541 0.0575537 -0.0003000 -0.000132 -0.000226 0.000025 0.000030 0.0000087 0.0000087 0.000105 0.000086
+2013 7 6 56479 0.148953 0.386151 0.0579280 -0.0003526 -0.000150 -0.000255 0.000025 0.000030 0.0000096 0.0000090 0.000119 0.000083
+2013 7 7 56480 0.150376 0.384903 0.0583167 -0.0003661 -0.000163 -0.000275 0.000107 0.000099 0.0000163 0.0000110 0.000134 0.000080
+2013 7 8 56481 0.151569 0.383539 0.0585779 -0.0002537 -0.000127 -0.000261 0.000032 0.000032 0.0000125 0.0000085 0.000042 0.000052
+2013 7 9 56482 0.153050 0.382250 0.0587683 -0.0001194 -0.000132 -0.000271 0.000032 0.000032 0.0000044 0.0000085 0.000034 0.000043
+2013 7 10 56483 0.154493 0.381145 0.0588276 0.0000078 -0.000113 -0.000234 0.000030 0.000036 0.0000109 0.0000085 0.000066 0.000078
+2013 7 11 56484 0.156082 0.380732 0.0587437 0.0001635 -0.000091 -0.000208 0.000034 0.000036 0.0000068 0.0000087 0.000099 0.000114
+2013 7 12 56485 0.156863 0.380599 0.0585248 0.0002568 -0.000066 -0.000186 0.000034 0.000036 0.0000038 0.0000087 0.000132 0.000149
+2013 7 13 56486 0.158069 0.380042 0.0582255 0.0003536 -0.000073 -0.000194 0.000030 0.000036 0.0000181 0.0000087 0.000127 0.000144
+2013 7 14 56487 0.159076 0.379385 0.0578480 0.0003991 -0.000087 -0.000215 0.000030 0.000036 0.0000085 0.0000089 0.000108 0.000124
+2013 7 15 56488 0.159931 0.378229 0.0574290 0.0004241 -0.000082 -0.000236 0.000028 0.000035 0.0000093 0.0000087 0.000088 0.000100
+2013 7 16 56489 0.160905 0.377171 0.0569832 0.0004291 -0.000090 -0.000247 0.000031 0.000035 0.0000109 0.0000088 0.000068 0.000080
+2013 7 17 56490 0.161815 0.376243 0.0565385 0.0003878 -0.000092 -0.000249 0.000036 0.000034 0.0000048 0.0000091 0.000049 0.000059
+2013 7 18 56491 0.162565 0.375422 0.0561746 0.0003214 -0.000096 -0.000180 0.000036 0.000034 0.0000094 0.0000091 0.000060 0.000077
+2013 7 19 56492 0.162945 0.374696 0.0558663 0.0002716 -0.000096 -0.000091 0.000033 0.000034 0.0000029 0.0000090 0.000079 0.000105
+2013 7 20 56493 0.163846 0.373849 0.0556151 0.0002333 -0.000127 -0.000085 0.000029 0.000034 0.0000178 0.0000090 0.000078 0.000103
+2013 7 21 56494 0.164553 0.373090 0.0554059 0.0002098 -0.000167 -0.000112 0.000032 0.000034 0.0000067 0.0000090 0.000069 0.000089
+2013 7 22 56495 0.164789 0.371800 0.0551523 0.0002812 -0.000200 -0.000142 0.000034 0.000036 0.0000069 0.0000095 0.000059 0.000075
+2013 7 23 56496 0.165291 0.370338 0.0547829 0.0004291 -0.000224 -0.000176 0.000031 0.000036 0.0000028 0.0000093 0.000051 0.000061
+2013 7 24 56497 0.166002 0.368999 0.0542810 0.0005603 -0.000168 -0.000170 0.000031 0.000033 0.0000166 0.0000089 0.000049 0.000065
+2013 7 25 56498 0.166346 0.367911 0.0536717 0.0006255 -0.000090 -0.000152 0.000034 0.000033 0.0000105 0.0000092 0.000060 0.000084
+2013 7 26 56499 0.166811 0.366676 0.0530071 0.0006567 -0.000012 -0.000130 0.000034 0.000033 0.0000035 0.0000095 0.000072 0.000102
+2013 7 27 56500 0.167707 0.365549 0.0523630 0.0006006 0.000015 -0.000119 0.000034 0.000033 0.0000121 0.0000098 0.000088 0.000126
+2013 7 28 56501 0.168765 0.364738 0.0518197 0.0004764 0.000017 -0.000109 0.000031 0.000033 0.0000108 0.0000098 0.000104 0.000151
+2013 7 29 56502 0.169700 0.363977 0.0513965 0.0003449 0.000011 -0.000085 0.000027 0.000032 0.0000105 0.0000102 0.000125 0.000182
+2013 7 30 56503 0.170594 0.362929 0.0510988 0.0002185 0.000006 -0.000072 0.000028 0.000033 0.0000065 0.0000088 0.000142 0.000208
+2013 7 31 56504 0.171158 0.361742 0.0509293 0.0001075 -0.000047 -0.000055 0.000029 0.000032 0.0000126 0.0000085 0.000098 0.000152
+2013 8 1 56505 0.171614 0.360801 0.0508664 0.0000354 -0.000115 -0.000041 0.000029 0.000032 0.0000116 0.0000088 0.000061 0.000092
+2013 8 2 56506 0.171449 0.359906 0.0508698 -0.0000262 -0.000184 -0.000031 0.000029 0.000032 0.0000021 0.0000088 0.000024 0.000033
+2013 8 3 56507 0.171812 0.358758 0.0508896 -0.0000357 -0.000185 -0.000041 0.000029 0.000032 0.0000159 0.0000088 0.000015 0.000019
+2013 8 4 56508 0.172184 0.357514 0.0508920 -0.0000184 -0.000157 -0.000058 0.000029 0.000029 0.0000092 0.0000091 0.000017 0.000021
+2013 8 5 56509 0.172401 0.356273 0.0508653 0.0000659 -0.000111 -0.000073 0.000033 0.000029 0.0000153 0.0000097 0.000019 0.000026
+2013 8 6 56510 0.172554 0.355256 0.0507705 0.0001743 -0.000076 -0.000090 0.000033 0.000032 0.0000055 0.0000096 0.000021 0.000028
+2013 8 7 56511 0.172778 0.354263 0.0505584 0.0002672 -0.000114 -0.000073 0.000030 0.000031 0.0000125 0.0000098 0.000031 0.000044
+2013 8 8 56512 0.173427 0.353372 0.0502377 0.0003265 -0.000172 -0.000048 0.000030 0.000028 0.0000059 0.0000098 0.000043 0.000062
+2013 8 9 56513 0.173697 0.352904 0.0498320 0.0004346 -0.000232 -0.000025 0.000030 0.000028 0.0000021 0.0000099 0.000054 0.000079
+2013 8 10 56514 0.173888 0.352080 0.0493378 0.0005192 -0.000260 -0.000042 0.000030 0.000028 0.0000104 0.0000101 0.000053 0.000076
+2013 8 11 56515 0.173994 0.351257 0.0487936 0.0005298 -0.000274 -0.000075 0.000030 0.000028 0.0000082 0.0000101 0.000047 0.000064
+2013 8 12 56516 0.173765 0.350190 0.0482710 0.0004758 -0.000286 -0.000107 0.000033 0.000032 0.0000091 0.0000098 0.000041 0.000053
+2013 8 13 56517 0.173651 0.348912 0.0477934 0.0004126 -0.000288 -0.000146 0.000033 0.000032 0.0000033 0.0000099 0.000035 0.000042
+2013 8 14 56518 0.173705 0.347770 0.0473953 0.0003477 -0.000236 -0.000091 0.000031 0.000030 0.0000013 0.0000103 0.000053 0.000067
+2013 8 15 56519 0.173741 0.346387 0.0470610 0.0002979 -0.000223 -0.000112 0.000034 0.000033 0.0000087 0.0000105 0.000058 0.000074
+2013 8 16 56520 0.173646 0.345159 0.0467545 0.0002797 -0.000226 -0.000167 0.000034 0.000033 0.0000096 0.0000108 0.000055 0.000071
+2013 8 17 56521 0.173383 0.343912 0.0464163 0.0003744 -0.000223 -0.000214 0.000031 0.000033 0.0000089 0.0000111 0.000052 0.000067
+2013 8 18 56522 0.173288 0.342890 0.0459741 0.0005323 -0.000213 -0.000249 0.000034 0.000033 0.0000088 0.0000111 0.000049 0.000064
+2013 8 19 56523 0.173168 0.341865 0.0453977 0.0006168 -0.000174 -0.000272 0.000033 0.000034 0.0000079 0.0000104 0.000044 0.000057
+2013 8 20 56524 0.173063 0.340726 0.0446799 0.0007632 -0.000177 -0.000287 0.000029 0.000034 0.0000025 0.0000104 0.000042 0.000054
+2013 8 21 56525 0.172398 0.339375 0.0438305 0.0008525 -0.000179 -0.000249 0.000028 0.000031 0.0000139 0.0000103 0.000051 0.000063
+2013 8 22 56526 0.171684 0.337844 0.0429512 0.0008717 -0.000185 -0.000190 0.000031 0.000031 0.0000092 0.0000097 0.000064 0.000076
+2013 8 23 56527 0.170625 0.336442 0.0420842 0.0008230 -0.000194 -0.000127 0.000031 0.000031 0.0000041 0.0000097 0.000076 0.000089
+2013 8 24 56528 0.169798 0.334944 0.0412703 0.0007489 -0.000217 -0.000093 0.000031 0.000031 0.0000090 0.0000099 0.000118 0.000146
+2013 8 25 56529 0.169189 0.333577 0.0405795 0.0006309 -0.000243 -0.000073 0.000031 0.000034 0.0000072 0.0000099 0.000169 0.000220
+2013 8 26 56530 0.168893 0.332209 0.0400021 0.0005207 -0.000239 -0.000063 0.000028 0.000034 0.0000114 0.0000100 0.000282 0.000295
+2013 8 27 56531 0.168519 0.330738 0.0395337 0.0003777 -0.000247 -0.000057 0.000028 0.000031 0.0000100 0.0000100 0.000348 0.000369
+2013 8 28 56532 0.168415 0.329414 0.0391717 0.0002806 -0.000228 -0.000070 0.000029 0.000030 0.0000139 0.0000093 0.000235 0.000293
+2013 8 29 56533 0.168163 0.328251 0.0388973 0.0002473 -0.000196 -0.000082 0.000029 0.000033 0.0000142 0.0000093 0.000138 0.000172
+2013 8 30 56534 0.167661 0.327082 0.0386768 0.0002367 -0.000168 -0.000096 0.000029 0.000033 0.0000058 0.0000095 0.000041 0.000051
+2013 8 31 56535 0.166593 0.325700 0.0384634 0.0002152 -0.000155 -0.000089 0.000029 0.000033 0.0000122 0.0000095 0.000023 0.000028
+2013 9 1 56536 0.165860 0.324084 0.0382068 0.0002970 -0.000152 -0.000074 0.000029 0.000033 0.0000084 0.0000093 0.000035 0.000041
+2013 9 2 56537 0.165573 0.322684 0.0378617 0.0004198 -0.000142 -0.000047 0.000035 0.000036 0.0000102 0.0000109 0.000043 0.000053
+2013 9 3 56538 0.165314 0.321419 0.0373927 0.0005024 -0.000149 -0.000031 0.000039 0.000036 0.0000127 0.0000114 0.000053 0.000066
+2013 9 4 56539 0.164827 0.320456 0.0367879 0.0006379 -0.000156 -0.000014 0.000034 0.000034 0.0000049 0.0000106 0.000062 0.000077
+2013 9 5 56540 0.164368 0.319491 0.0360450 0.0008060 -0.000259 -0.000088 0.000034 0.000034 0.0000114 0.0000104 0.000058 0.000072
+2013 9 6 56541 0.164310 0.318349 0.0351748 0.0009072 -0.000380 -0.000180 0.000038 0.000034 0.0000046 0.0000104 0.000051 0.000064
+2013 9 7 56542 0.163910 0.317351 0.0342240 0.0009627 -0.000400 -0.000187 0.000034 0.000034 0.0000118 0.0000101 0.000061 0.000083
+2013 9 8 56543 0.163508 0.316383 0.0332626 0.0009316 -0.000371 -0.000155 0.000034 0.000031 0.0000085 0.0000098 0.000077 0.000112
+2013 9 9 56544 0.162948 0.315306 0.0323533 0.0008653 -0.000327 -0.000098 0.000033 0.000031 0.0000085 0.0000101 0.000094 0.000145
+2013 9 10 56545 0.162052 0.314146 0.0315245 0.0007584 -0.000269 -0.000045 0.000033 0.000035 0.0000075 0.0000101 0.000110 0.000176
+2013 9 11 56546 0.161094 0.312773 0.0307834 0.0006948 -0.000268 0.000120 0.000031 0.000029 0.0000096 0.0000100 0.000092 0.000145
+2013 9 12 56547 0.159937 0.311450 0.0301155 0.0006528 -0.000286 0.000308 0.000027 0.000026 0.0000070 0.0000100 0.000066 0.000100
+2013 9 13 56548 0.158737 0.309930 0.0294762 0.0006294 -0.000305 0.000479 0.000027 0.000026 0.0000030 0.0000100 0.000039 0.000055
+2013 9 14 56549 0.157790 0.308431 0.0288025 0.0007154 -0.000342 0.000490 0.000031 0.000029 0.0000144 0.0000103 0.000044 0.000057
+2013 9 15 56550 0.157350 0.306944 0.0280242 0.0008645 -0.000383 0.000421 0.000031 0.000029 0.0000071 0.0000105 0.000060 0.000077
+2013 9 16 56551 0.157106 0.305976 0.0270896 0.0010175 -0.000419 0.000334 0.000030 0.000030 0.0000068 0.0000099 0.000071 0.000091
+2013 9 17 56552 0.156504 0.305514 0.0259668 0.0011926 -0.000437 0.000221 0.000030 0.000034 0.0000079 0.0000099 0.000085 0.000109
+2013 9 18 56553 0.155377 0.305349 0.0246770 0.0013240 -0.000434 0.000094 0.000029 0.000032 0.0000056 0.0000102 0.000099 0.000127
+2013 9 19 56554 0.153947 0.304766 0.0232973 0.0013738 -0.000357 0.000099 0.000043 0.000045 0.0000129 0.0000102 0.000074 0.000097
+2013 9 20 56555 0.152824 0.303963 0.0219443 0.0012905 -0.000246 0.000155 0.000043 0.000045 0.0000038 0.0000102 0.000037 0.000054
+2013 9 21 56556 0.151406 0.303196 0.0207179 0.0011330 -0.000223 0.000123 0.000048 0.000045 0.0000082 0.0000108 0.000028 0.000043
+2013 9 22 56557 0.149281 0.302354 0.0196438 0.0010117 -0.000233 0.000067 0.000054 0.000050 0.0000083 0.0000111 0.000031 0.000045
+2013 9 23 56558 0.146735 0.301442 0.0186897 0.0008985 -0.000242 0.000020 0.000033 0.000048 0.0000096 0.0000092 0.000033 0.000047
+2013 9 24 56559 0.144871 0.300344 0.0178077 0.0008517 -0.000255 -0.000012 0.000033 0.000047 0.0000100 0.0000092 0.000035 0.000048
+2013 9 25 56560 0.143566 0.299610 0.0169717 0.0008146 -0.000269 -0.000032 0.000033 0.000045 0.0000028 0.0000092 0.000035 0.000044
+2013 9 26 56561 0.142079 0.298821 0.0161801 0.0007604 -0.000214 0.000000 0.000033 0.000045 0.0000090 0.0000089 0.000030 0.000037
+2013 9 27 56562 0.140889 0.297939 0.0154371 0.0007188 -0.000141 0.000048 0.000033 0.000046 0.0000036 0.0000092 0.000023 0.000027
+2013 9 28 56563 0.139500 0.297257 0.0147280 0.0007030 -0.000128 0.000090 0.000033 0.000046 0.0000080 0.0000095 0.000028 0.000036
+2013 9 29 56564 0.137657 0.296237 0.0140048 0.0007466 -0.000136 0.000126 0.000033 0.000046 0.0000106 0.0000095 0.000037 0.000051
+2013 9 30 56565 0.135490 0.295144 0.0131976 0.0008856 -0.000134 0.000152 0.000036 0.000048 0.0000104 0.0000103 0.000050 0.000080
+2013 10 1 56566 0.133064 0.294137 0.0122633 0.0009920 -0.000149 0.000174 0.000036 0.000048 0.0000043 0.0000100 0.000059 0.000099
+2013 10 2 56567 0.131082 0.292889 0.0112038 0.0011247 -0.000154 0.000132 0.000035 0.000048 0.0000049 0.0000099 0.000058 0.000093
+2013 10 3 56568 0.129546 0.292015 0.0100389 0.0011865 -0.000159 0.000071 0.000035 0.000043 0.0000070 0.0000099 0.000053 0.000080
+2013 10 4 56569 0.128542 0.291032 0.0088032 0.0012562 -0.000167 0.000009 0.000035 0.000043 0.0000040 0.0000096 0.000048 0.000067
+2013 10 5 56570 0.127903 0.290154 0.0075119 0.0012920 -0.000179 0.000008 0.000035 0.000048 0.0000064 0.0000099 0.000054 0.000072
+2013 10 6 56571 0.126726 0.289547 0.0062221 0.0012702 -0.000191 0.000032 0.000032 0.000043 0.0000055 0.0000101 0.000064 0.000083
+2013 10 7 56572 0.124819 0.289094 0.0049648 0.0012181 -0.000199 0.000060 0.000025 0.000039 0.0000101 0.0000103 0.000073 0.000094
+2013 10 8 56573 0.123190 0.288137 0.0037538 0.0011662 -0.000197 0.000089 0.000025 0.000039 0.0000053 0.0000107 0.000083 0.000106
+2013 10 9 56574 0.121832 0.287286 0.0025855 0.0011269 -0.000069 -0.000034 0.000023 0.000040 0.0000143 0.0000106 0.000213 0.000162
+2013 10 10 56575 0.120512 0.286733 0.0014693 0.0010983 -0.000080 -0.000006 0.000023 0.000040 0.0000103 0.0000103 0.000179 0.000140
+2013 10 11 56576 0.118663 0.286056 0.0003773 0.0011016 -0.000145 0.000057 0.000023 0.000040 0.0000038 0.0000103 0.000081 0.000083
+2013 10 12 56577 0.116817 0.285276 -0.0007606 0.0011490 -0.000173 0.000121 0.000023 0.000040 0.0000094 0.0000107 0.000066 0.000067
+2013 10 13 56578 0.115102 0.284800 -0.0019609 0.0012373 -0.000186 0.000183 0.000023 0.000040 0.0000082 0.0000103 0.000080 0.000065
+2013 10 14 56579 0.113868 0.284527 -0.0032639 0.0013714 -0.000193 0.000188 0.000028 0.000040 0.0000065 0.0000094 0.000112 0.000144
+2013 10 15 56580 0.112808 0.284046 -0.0047073 0.0014833 -0.000203 0.000223 0.000028 0.000040 0.0000070 0.0000098 0.000134 0.000171
+2013 10 16 56581 0.111727 0.283791 -0.0062374 0.0015257 -0.000208 0.000248 0.000025 0.000039 0.0000055 0.0000112 0.000158 0.000209
+2013 10 17 56582 0.110185 0.283609 -0.0077677 0.0014962 -0.000211 0.000231 0.000025 0.000039 0.0000072 0.0000110 0.000117 0.000158
+2013 10 18 56583 0.108331 0.283369 -0.0092485 0.0014182 -0.000209 0.000198 0.000025 0.000039 0.0000038 0.0000108 0.000062 0.000087
+2013 10 19 56584 0.105962 0.283145 -0.0106017 0.0012698 -0.000213 0.000212 0.000025 0.000039 0.0000057 0.0000108 0.000044 0.000065
+2013 10 20 56585 0.103739 0.282664 -0.0117696 0.0010868 -0.000214 0.000241 0.000025 0.000039 0.0000070 0.0000105 0.000041 0.000060
+2013 10 21 56586 0.101756 0.282519 -0.0127744 0.0008939 -0.000094 0.000347 0.000025 0.000041 0.0000096 0.0000092 0.000053 0.000079
+2013 10 22 56587 0.099947 0.282314 -0.0136435 0.0007831 -0.000040 0.000389 0.000025 0.000041 0.0000045 0.0000092 0.000056 0.000084
+2013 10 23 56588 0.098496 0.282252 -0.0144146 0.0007482 -0.000052 0.000370 0.000025 0.000039 0.0000084 0.0000089 0.000034 0.000051
+2013 10 24 56589 0.096884 0.282500 -0.0151819 0.0007967 -0.000087 0.000329 0.000025 0.000039 0.0000084 0.0000088 0.000029 0.000044
+2013 10 25 56590 0.095045 0.282628 -0.0160382 0.0009378 -0.000127 0.000282 0.000025 0.000039 0.0000034 0.0000091 0.000023 0.000037
+2013 10 26 56591 0.093453 0.282516 -0.0170097 0.0010264 -0.000138 0.000290 0.000028 0.000043 0.0000094 0.0000090 0.000029 0.000046
+2013 10 27 56592 0.092408 0.282377 -0.0180777 0.0010975 -0.000137 0.000313 0.000028 0.000048 0.0000081 0.0000087 0.000039 0.000060
+2013 10 28 56593 0.091832 0.282935 -0.0192744 0.0012683 -0.000126 0.000308 0.000042 0.000044 0.0000121 0.0000103 0.000049 0.000073
+2013 10 29 56594 0.091210 0.283632 -0.0206159 0.0014075 -0.000125 0.000323 0.000043 0.000038 0.0000047 0.0000103 0.000058 0.000088
+2013 10 30 56595 0.090411 0.284092 -0.0220701 0.0015026 -0.000151 0.000247 0.000043 0.000037 0.0000059 0.0000099 0.000053 0.000081
+2013 10 31 56596 0.089550 0.284177 -0.0235933 0.0015306 -0.000182 0.000157 0.000043 0.000038 0.0000041 0.0000096 0.000043 0.000070
+2013 11 1 56597 0.088052 0.284261 -0.0251053 0.0014742 -0.000191 0.000161 0.000043 0.000044 0.0000047 0.0000099 0.000039 0.000064
+2013 11 2 56598 0.086815 0.284330 -0.0265342 0.0013825 -0.000188 0.000203 0.000048 0.000048 0.0000073 0.0000101 0.000038 0.000060
+2013 11 3 56599 0.085515 0.284793 -0.0278983 0.0013090 -0.000178 0.000249 0.000058 0.000056 0.0000087 0.0000101 0.000037 0.000056
+2013 11 4 56600 0.084395 0.284876 -0.0292178 0.0013031 -0.000152 0.000247 0.000061 0.000064 0.0000114 0.0000106 0.000028 0.000041
+2013 11 5 56601 0.083174 0.285500 -0.0305056 0.0012640 -0.000136 0.000285 0.000060 0.000058 0.0000121 0.0000108 0.000026 0.000036
+2013 11 6 56602 0.081816 0.285783 -0.0317375 0.0012043 -0.000120 0.000318 0.000058 0.000057 0.0000039 0.0000105 0.000023 0.000033
+2013 11 7 56603 0.081089 0.286143 -0.0328981 0.0011348 -0.000118 0.000322 0.000059 0.000065 0.0000087 0.0000103 0.000039 0.000061
+2013 11 8 56604 0.079839 0.286639 -0.0340371 0.0011551 -0.000121 0.000309 0.000059 0.000071 0.0000068 0.0000103 0.000058 0.000098
+2013 11 9 56605 0.077895 0.286644 -0.0352054 0.0012086 -0.000133 0.000315 0.000059 0.000067 0.0000084 0.0000103 0.000058 0.000097
+2013 11 10 56606 0.076242 0.286099 -0.0364510 0.0013029 -0.000147 0.000321 0.000053 0.000062 0.0000076 0.0000101 0.000050 0.000082
+2013 11 11 56607 0.074842 0.285789 -0.0377943 0.0013823 -0.000149 0.000282 0.000053 0.000062 0.0000050 0.0000101 0.000021 0.000033
+2013 11 12 56608 0.073684 0.285213 -0.0392306 0.0014468 -0.000159 0.000276 0.000057 0.000061 0.0000057 0.0000101 0.000023 0.000034
+2013 11 13 56609 0.073102 0.284968 -0.0407210 0.0015014 -0.000178 0.000239 0.000054 0.000060 0.0000027 0.0000096 0.000026 0.000035
+2013 11 14 56610 0.072468 0.284950 -0.0421969 0.0014397 -0.000233 0.000251 0.000049 0.000059 0.0000059 0.0000099 0.000024 0.000031
+2013 11 15 56611 0.071816 0.285149 -0.0435710 0.0012753 -0.000292 0.000267 0.000054 0.000060 0.0000031 0.0000103 0.000022 0.000026
+2013 11 16 56612 0.070240 0.285498 -0.0447887 0.0011467 -0.000224 0.000298 0.000059 0.000062 0.0000073 0.0000103 0.000023 0.000028
+2013 11 17 56613 0.068372 0.285979 -0.0458782 0.0010639 -0.000106 0.000327 0.000054 0.000059 0.0000076 0.0000103 0.000026 0.000032
+2013 11 18 56614 0.066653 0.286810 -0.0468692 0.0009610 0.000021 0.000332 0.000052 0.000058 0.0000056 0.0000100 0.000030 0.000038
+2013 11 19 56615 0.065169 0.287571 -0.0477974 0.0009047 0.000133 0.000353 0.000057 0.000061 0.0000026 0.0000102 0.000033 0.000042
+2013 11 20 56616 0.063703 0.288165 -0.0486896 0.0008702 0.000074 0.000352 0.000056 0.000060 0.0000060 0.0000105 0.000037 0.000039
+2013 11 21 56617 0.062361 0.288725 -0.0495709 0.0008757 0.000005 0.000293 0.000058 0.000061 0.0000069 0.0000107 0.000051 0.000075
+2013 11 22 56618 0.061418 0.289168 -0.0504526 0.0009166 -0.000092 0.000253 0.000076 0.000080 0.0000052 0.0000107 0.000062 0.000094
+2013 11 23 56619 0.060913 0.289509 -0.0514100 0.0010386 -0.000114 0.000231 0.000078 0.000082 0.0000062 0.0000107 0.000147 0.000201
+2013 11 24 56620 0.060152 0.290186 -0.0525353 0.0011651 -0.000106 0.000223 0.000054 0.000065 0.0000099 0.0000105 0.000260 0.000341
+2013 11 25 56621 0.059490 0.290704 -0.0537384 0.0012346 -0.000111 0.000207 0.000055 0.000065 0.0000081 0.0000101 0.000370 0.000475
+2013 11 26 56622 0.059061 0.291555 -0.0550059 0.0013008 -0.000097 0.000216 0.000054 0.000065 0.0000121 0.0000099 0.000487 0.000622
+2013 11 27 56623 0.058500 0.292168 -0.0563624 0.0013913 -0.000092 0.000235 0.000070 0.000077 0.0000085 0.0000099 0.000454 0.000579
+2013 11 28 56624 0.057886 0.292791 -0.0577845 0.0014574 -0.000082 0.000262 0.000075 0.000078 0.0000056 0.0000101 0.000385 0.000492
+2013 11 29 56625 0.057502 0.293295 -0.0592309 0.0014060 -0.000070 0.000294 0.000057 0.000063 0.0000095 0.0000104 0.000315 0.000404
+2013 11 30 56626 0.057586 0.293748 -0.0606302 0.0013599 -0.000054 0.000325 0.000058 0.000066 0.0000076 0.0000103 0.000246 0.000317
+2013 12 1 56627 0.057869 0.294172 -0.0619823 0.0013422 -0.000039 0.000349 0.000059 0.000070 0.0000075 0.0000103 0.000177 0.000230
+2013 12 2 56628 0.057812 0.294877 -0.0632813 0.0012444 -0.000025 0.000364 0.000058 0.000067 0.0000117 0.0000103 0.000106 0.000143
+2013 12 3 56629 0.057215 0.295605 -0.0644885 0.0011523 -0.000011 0.000364 0.000058 0.000064 0.0000044 0.0000101 0.000037 0.000056
+2013 12 4 56630 0.056964 0.296397 -0.0656052 0.0011449 -0.000025 0.000400 0.000065 0.000066 0.0000038 0.0000101 0.000045 0.000041
+2013 12 5 56631 0.057134 0.297390 -0.0667424 0.0011605 -0.000046 0.000431 0.000065 0.000069 0.0000052 0.0000104 0.000072 0.000045
+2013 12 6 56632 0.057086 0.298647 -0.0679462 0.0012484 -0.000069 0.000448 0.000059 0.000067 0.0000064 0.0000101 0.000099 0.000049
+2013 12 7 56633 0.057007 0.300398 -0.0692497 0.0013630 0.000005 0.000002 0.000076 0.000082 0.0000074 0.0000101 0.000082 0.000070
+2013 12 8 56634 0.056973 0.301531 -0.0706396 0.0014153 0.000005 0.000002 0.000072 0.000082 0.0000109 0.0000101 0.000074 0.000078
+2013 12 9 56635 0.057200 0.302531 -0.0720708 0.0014258 -0.000009 0.000166 0.000048 0.000061 0.0000107 0.0000096 0.000046 0.000030
+2013 12 10 56636 0.057065 0.303856 -0.0734731 0.0013519 -0.000010 0.000191 0.000056 0.000067 0.0000049 0.0000094 0.000021 0.000029
+2013 12 11 56637 0.056879 0.305162 -0.0747678 0.0012529 0.000001 0.000212 0.000056 0.000068 0.0000082 0.0000092 0.000019 0.000026
+2013 12 12 56638 0.056870 0.306250 -0.0759664 0.0011467 0.000023 0.000233 0.000092 0.000085 0.0000130 0.0000088 0.000019 0.000027
+2013 12 13 56639 0.056510 0.307277 -0.0770616 0.0010506 0.000043 0.000253 0.000095 0.000086 0.0000039 0.0000090 0.000019 0.000028
+2013 12 14 56640 0.055709 0.308232 -0.0780346 0.0009162 0.000036 0.000273 0.000064 0.000071 0.0000080 0.0000099 0.000043 0.000061
+2013 12 15 56641 0.054570 0.308614 -0.0788823 0.0007751 0.000019 0.000287 0.000063 0.000070 0.0000099 0.0000100 0.000076 0.000106
+2013 12 16 56642 0.053198 0.308546 -0.0796017 0.0006761 0.000027 0.000306 0.000056 0.000063 0.0000078 0.0000098 0.000144 0.000170
+2013 12 17 56643 0.051716 0.308102 -0.0802450 0.0006113 0.000021 0.000310 0.000056 0.000061 0.0000055 0.0000098 0.000188 0.000221
+2013 12 18 56644 0.049959 0.308079 -0.0808446 0.0006039 0.000039 0.000311 0.000086 0.000087 0.0000048 0.0000096 0.000151 0.000179
+2013 12 19 56645 0.048338 0.308156 -0.0814731 0.0006730 0.000058 0.000302 0.000090 0.000093 0.0000065 0.0000099 0.000089 0.000106
+2013 12 20 56646 0.047108 0.308654 -0.0821956 0.0007626 0.000075 0.000283 0.000094 0.000097 0.0000030 0.0000097 0.000028 0.000033
+2013 12 21 56647 0.046064 0.309102 -0.0830489 0.0009298 0.000077 0.000229 0.000098 0.000098 0.0000065 0.0000097 0.000013 0.000016
+2013 12 22 56648 0.045176 0.309738 -0.0840445 0.0010657 0.000070 0.000163 0.000069 0.000070 0.0000060 0.0000094 0.000015 0.000019
+2013 12 23 56649 0.044293 0.310448 -0.0851722 0.0011703 0.000062 0.000101 0.000056 0.000062 0.0000095 0.0000094 0.000017 0.000023
+2013 12 24 56650 0.043537 0.311200 -0.0864091 0.0012775 0.000050 0.000045 0.000053 0.000059 0.0000037 0.0000096 0.000019 0.000026
+2013 12 25 56651 0.042686 0.312361 -0.0877291 0.0013395 0.000045 0.000040 0.000078 0.000079 0.0000075 0.0000100 0.000018 0.000025
+2013 12 26 56652 0.041808 0.313435 -0.0891107 0.0014002 0.000040 0.000058 0.000081 0.000083 0.0000111 0.0000104 0.000016 0.000022
+2013 12 27 56653 0.041068 0.314844 -0.0905322 0.0014365 0.000032 0.000087 0.000113 0.000099 0.0000036 0.0000102 0.000014 0.000020
+2013 12 28 56654 0.040491 0.315949 -0.0919602 0.0013981 0.000026 0.000104 0.000114 0.000101 0.0000090 0.0000105 0.000016 0.000021
+2013 12 29 56655 0.040099 0.316820 -0.0933502 0.0013767 0.000021 0.000120 0.000079 0.000077 0.0000103 0.0000104 0.000018 0.000025
+2013 12 30 56656 0.039588 0.317646 -0.0946605 0.0012598 0.000013 0.000141 0.000074 0.000070 0.0000060 0.0000097 0.000021 0.000028
+2013 12 31 56657 0.038987 0.318247 -0.0958816 0.0011687 0.000007 0.000162 0.000060 0.000069 0.0000013 0.0000096 0.000023 0.000031
diff --git a/src/test/resources/orekit-data/eopc04_08_IAU2000.14 b/src/test/resources/orekit-data/eopc04_08_IAU2000.14
new file mode 100644
index 0000000000000000000000000000000000000000..16f24d73cc82fb4184e97d07ae3e5dcc25a25e14
--- /dev/null
+++ b/src/test/resources/orekit-data/eopc04_08_IAU2000.14
@@ -0,0 +1,379 @@
+
+
+ INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE
+ EARTH ORIENTATION PARAMETERS
+ EOP (IERS) 08 C04
+
+
+ FORMAT(3(I4),I7,2(F11.6),2(F12.7),2(F11.6),2(F11.6),2(F11.7),2(F12.6))
+##################################################################################
+
+ Date MJD x y UT1-UTC LOD dX dY x Err y Err UT1-UTC Err LOD Err dX Err dY Err
+ " " s s " " " " s s " "
+ (0h UTC)
+
+2014 1 1 56658 0.038635 0.318873 -0.0970509 0.0011868 -0.000027 0.000194 0.000061 0.000072 0.0000062 0.0000101 0.000038 0.000050
+2014 1 2 56659 0.038392 0.319560 -0.0982417 0.0012244 -0.000064 0.000224 0.000066 0.000069 0.0000100 0.0000103 0.000058 0.000075
+2014 1 3 56660 0.037782 0.320363 -0.0995045 0.0012891 -0.000095 0.000243 0.000074 0.000074 0.0000044 0.0000106 0.000078 0.000099
+2014 1 4 56661 0.037125 0.320762 -0.1008534 0.0013700 -0.000075 0.000256 0.000077 0.000080 0.0000090 0.0000108 0.000073 0.000092
+2014 1 5 56662 0.036686 0.321192 -0.1022594 0.0014069 -0.000033 0.000258 0.000062 0.000073 0.0000084 0.0000105 0.000058 0.000074
+2014 1 6 56663 0.036107 0.321881 -0.1036670 0.0013719 0.000013 0.000248 0.000050 0.000063 0.0000060 0.0000105 0.000050 0.000061
+2014 1 7 56664 0.035279 0.322794 -0.1049941 0.0012600 0.000056 0.000231 0.000062 0.000064 0.0000015 0.0000101 0.000033 0.000041
+2014 1 8 56665 0.034294 0.323912 -0.1061719 0.0010866 0.000057 0.000229 0.000075 0.000068 0.0000053 0.0000095 0.000028 0.000034
+2014 1 9 56666 0.033907 0.324957 -0.1072008 0.0009609 0.000045 0.000233 0.000070 0.000071 0.0000107 0.0000099 0.000026 0.000031
+2014 1 10 56667 0.033546 0.326433 -0.1080952 0.0008228 0.000031 0.000235 0.000063 0.000072 0.0000060 0.0000104 0.000024 0.000027
+2014 1 11 56668 0.032776 0.327841 -0.1088510 0.0006595 0.000033 0.000249 0.000066 0.000071 0.0000073 0.0000104 0.000030 0.000034
+2014 1 12 56669 0.031632 0.328925 -0.1094762 0.0005864 0.000040 0.000265 0.000066 0.000071 0.0000066 0.0000104 0.000038 0.000045
+2014 1 13 56670 0.030272 0.329986 -0.1100333 0.0005443 0.000047 0.000274 0.000063 0.000063 0.0000076 0.0000104 0.000046 0.000056
+2014 1 14 56671 0.029421 0.330656 -0.1105752 0.0005506 0.000050 0.000275 0.000076 0.000085 0.0000026 0.0000103 0.000054 0.000067
+2014 1 15 56672 0.028546 0.331742 -0.1111690 0.0006303 0.000118 0.000199 0.000123 0.000120 0.0000096 0.0000102 0.000041 0.000051
+2014 1 16 56673 0.027457 0.332608 -0.1118389 0.0007078 0.000152 0.000183 0.000115 0.000097 0.0000148 0.0000104 0.000035 0.000043
+2014 1 17 56674 0.026580 0.333728 -0.1126043 0.0008222 0.000183 0.000167 0.000066 0.000060 0.0000060 0.0000104 0.000028 0.000036
+2014 1 18 56675 0.025855 0.335069 -0.1134933 0.0009783 0.000181 0.000156 0.000066 0.000060 0.0000069 0.0000104 0.000029 0.000037
+2014 1 19 56676 0.024806 0.336353 -0.1145454 0.0011223 0.000164 0.000148 0.000070 0.000066 0.0000081 0.0000104 0.000034 0.000042
+2014 1 20 56677 0.023812 0.337368 -0.1157127 0.0012096 0.000127 0.000141 0.000063 0.000065 0.0000073 0.0000110 0.000038 0.000046
+2014 1 21 56678 0.023712 0.338243 -0.1169561 0.0012609 0.000104 0.000132 0.000059 0.000068 0.0000109 0.0000109 0.000042 0.000050
+2014 1 22 56679 0.024082 0.338997 -0.1182377 0.0012905 0.000080 0.000121 0.000061 0.000068 0.0000046 0.0000105 0.000046 0.000054
+2014 1 23 56680 0.024329 0.339927 -0.1195135 0.0012530 0.000166 0.000120 0.000060 0.000063 0.0000084 0.0000109 0.000034 0.000040
+2014 1 24 56681 0.024480 0.340703 -0.1207234 0.0011452 0.000277 0.000119 0.000063 0.000066 0.0000050 0.0000115 0.000018 0.000021
+2014 1 25 56682 0.024339 0.341338 -0.1218334 0.0010877 0.000304 0.000101 0.000072 0.000071 0.0000059 0.0000117 0.000029 0.000036
+2014 1 26 56683 0.024143 0.341833 -0.1228609 0.0010070 0.000292 0.000075 0.000068 0.000072 0.0000108 0.0000114 0.000051 0.000064
+2014 1 27 56684 0.024219 0.342592 -0.1238269 0.0009428 0.000247 0.000063 0.000067 0.000076 0.0000106 0.0000111 0.000025 0.000031
+2014 1 28 56685 0.024393 0.343907 -0.1247856 0.0009563 0.000206 0.000042 0.000063 0.000071 0.0000105 0.0000107 0.000030 0.000037
+2014 1 29 56686 0.024500 0.345495 -0.1258104 0.0010692 0.000153 0.000023 0.000052 0.000058 0.0000039 0.0000106 0.000031 0.000042
+2014 1 30 56687 0.024526 0.346902 -0.1269629 0.0012370 0.000185 0.000030 0.000056 0.000057 0.0000083 0.0000107 0.000037 0.000048
+2014 1 31 56688 0.024216 0.347929 -0.1282635 0.0013411 0.000234 0.000048 0.000056 0.000053 0.0000041 0.0000106 0.000044 0.000055
+2014 2 1 56689 0.023746 0.348777 -0.1296531 0.0014023 0.000200 0.000066 0.000057 0.000052 0.0000094 0.0000105 0.000043 0.000053
+2014 2 2 56690 0.023546 0.349472 -0.1310704 0.0013911 0.000134 0.000089 0.000054 0.000053 0.0000063 0.0000106 0.000038 0.000047
+2014 2 3 56691 0.023587 0.350099 -0.1324575 0.0013340 0.000070 0.000115 0.000055 0.000051 0.0000069 0.0000102 0.000034 0.000041
+2014 2 4 56692 0.023731 0.351001 -0.1337438 0.0012028 0.000011 0.000143 0.000053 0.000052 0.0000023 0.0000102 0.000030 0.000035
+2014 2 5 56693 0.023882 0.352327 -0.1348635 0.0010018 0.000059 0.000153 0.000052 0.000053 0.0000108 0.0000107 0.000053 0.000039
+2014 2 6 56694 0.024326 0.353693 -0.1357882 0.0008236 0.000141 0.000158 0.000052 0.000052 0.0000146 0.0000107 0.000085 0.000045
+2014 2 7 56695 0.024504 0.355291 -0.1365502 0.0007000 0.000228 0.000157 0.000052 0.000053 0.0000086 0.0000107 0.000116 0.000051
+2014 2 8 56696 0.024453 0.356675 -0.1372079 0.0006189 0.000224 0.000179 0.000051 0.000050 0.0000090 0.0000107 0.000107 0.000050
+2014 2 9 56697 0.024378 0.358195 -0.1378092 0.0005558 0.000185 0.000204 0.000052 0.000051 0.0000125 0.0000107 0.000082 0.000046
+2014 2 10 56698 0.024167 0.359775 -0.1383968 0.0005869 0.000141 0.000219 0.000051 0.000053 0.0000097 0.0000108 0.000057 0.000042
+2014 2 11 56699 0.024019 0.361757 -0.1390051 0.0006671 0.000093 0.000227 0.000055 0.000057 0.0000021 0.0000105 0.000033 0.000039
+2014 2 12 56700 0.023525 0.363716 -0.1396693 0.0007379 0.000160 0.000178 0.000062 0.000059 0.0000058 0.0000100 0.000036 0.000048
+2014 2 13 56701 0.022797 0.365376 -0.1404604 0.0008575 0.000255 0.000115 0.000067 0.000062 0.0000067 0.0000103 0.000045 0.000061
+2014 2 14 56702 0.022064 0.367071 -0.1413986 0.0009859 0.000344 0.000053 0.000076 0.000071 0.0000049 0.0000108 0.000054 0.000074
+2014 2 15 56703 0.021480 0.368624 -0.1424512 0.0011128 0.000330 0.000044 0.000066 0.000072 0.0000060 0.0000102 0.000079 0.000098
+2014 2 16 56704 0.021005 0.370370 -0.1436581 0.0012658 0.000273 0.000057 0.000058 0.000065 0.0000086 0.0000103 0.000109 0.000126
+2014 2 17 56705 0.020488 0.372132 -0.1449610 0.0013315 0.000211 0.000066 0.000061 0.000060 0.0000077 0.0000104 0.000139 0.000153
+2014 2 18 56706 0.019812 0.373408 -0.1463208 0.0013559 0.000138 0.000082 0.000061 0.000063 0.0000042 0.0000103 0.000169 0.000181
+2014 2 19 56707 0.019886 0.374810 -0.1477070 0.0013818 0.000153 0.000041 0.000068 0.000064 0.0000071 0.0000106 0.000141 0.000153
+2014 2 20 56708 0.020101 0.376100 -0.1490550 0.0013295 0.000200 0.000009 0.000068 0.000059 0.0000076 0.0000106 0.000095 0.000107
+2014 2 21 56709 0.020333 0.377353 -0.1503430 0.0012159 0.000245 -0.000020 0.000064 0.000059 0.0000046 0.0000108 0.000051 0.000062
+2014 2 22 56710 0.020503 0.378514 -0.1515427 0.0011412 0.000272 0.000003 0.000063 0.000060 0.0000115 0.0000109 0.000035 0.000046
+2014 2 23 56711 0.020667 0.379942 -0.1526833 0.0011363 0.000287 0.000043 0.000063 0.000060 0.0000081 0.0000109 0.000031 0.000042
+2014 2 24 56712 0.020406 0.381353 -0.1538325 0.0011823 0.000287 0.000079 0.000061 0.000060 0.0000072 0.0000110 0.000027 0.000036
+2014 2 25 56713 0.019586 0.382709 -0.1550436 0.0012766 0.000291 0.000120 0.000063 0.000063 0.0000022 0.0000115 0.000023 0.000032
+2014 2 26 56714 0.018776 0.383582 -0.1563845 0.0014431 0.000271 0.000114 0.000068 0.000063 0.0000054 0.0000114 0.000029 0.000038
+2014 2 27 56715 0.018820 0.384179 -0.1579347 0.0016747 0.000244 0.000094 0.000074 0.000066 0.0000048 0.0000104 0.000037 0.000046
+2014 2 28 56716 0.019274 0.385242 -0.1597391 0.0018881 0.000216 0.000068 0.000074 0.000067 0.0000029 0.0000101 0.000045 0.000053
+2014 3 1 56717 0.019841 0.386558 -0.1616963 0.0019819 0.000223 0.000068 0.000070 0.000063 0.0000075 0.0000107 0.000045 0.000053
+2014 3 2 56718 0.020229 0.387859 -0.1637004 0.0019764 0.000241 0.000076 0.000070 0.000063 0.0000067 0.0000111 0.000041 0.000051
+2014 3 3 56719 0.020440 0.389343 -0.1656640 0.0019105 0.000255 0.000080 0.000123 0.000123 0.0000078 0.0000180 0.000038 0.000047
+2014 3 4 56720 0.020479 0.390843 -0.1675271 0.0017869 0.000260 0.000082 0.000065 0.000056 0.0000026 0.0000110 0.000034 0.000044
+2014 3 5 56721 0.020391 0.391998 -0.1692176 0.0015938 0.000287 0.000070 0.000063 0.000054 0.0000074 0.0000109 0.000042 0.000060
+2014 3 6 56722 0.020407 0.392940 -0.1707396 0.0014224 0.000317 0.000054 0.000059 0.000054 0.0000080 0.0000109 0.000056 0.000081
+2014 3 7 56723 0.020307 0.393997 -0.1721130 0.0013004 0.000348 0.000039 0.000068 0.000061 0.0000058 0.0000109 0.000071 0.000102
+2014 3 8 56724 0.020124 0.395068 -0.1733490 0.0011717 0.000360 0.000020 0.000077 0.000067 0.0000097 0.0000114 0.000071 0.000095
+2014 3 9 56725 0.019881 0.396125 -0.1744791 0.0010656 0.000364 0.000002 0.000067 0.000063 0.0000053 0.0000081 0.000064 0.000078
+2014 3 10 56726 0.019532 0.396915 -0.1755600 0.0010786 0.000333 -0.000009 0.000054 0.000059 0.0000050 0.0000075 0.000049 0.000064
+2014 3 11 56727 0.019307 0.397995 -0.1766225 0.0010647 0.000312 -0.000015 0.000049 0.000059 0.0000055 0.0000105 0.000036 0.000047
+2014 3 12 56728 0.019487 0.399097 -0.1776624 0.0010541 0.000281 -0.000020 0.000048 0.000066 0.0000026 0.0000102 0.000029 0.000038
+2014 3 13 56729 0.020326 0.400186 -0.1787710 0.0011566 0.000276 0.000030 0.000059 0.000069 0.0000041 0.0000102 0.000033 0.000043
+2014 3 14 56730 0.021470 0.401233 -0.1799750 0.0012344 0.000274 0.000091 0.000066 0.000072 0.0000027 0.0000102 0.000041 0.000054
+2014 3 15 56731 0.022536 0.402424 -0.1812403 0.0012801 0.000255 0.000118 0.000067 0.000075 0.0000062 0.0000107 0.000044 0.000058
+2014 3 16 56732 0.023611 0.403661 -0.1825144 0.0012767 0.000228 0.000127 0.000067 0.000076 0.0000089 0.0000117 0.000045 0.000060
+2014 3 17 56733 0.024471 0.404936 -0.1837860 0.0012374 0.000189 0.000133 0.000073 0.000086 0.0000083 0.0000114 0.000045 0.000060
+2014 3 18 56734 0.024892 0.405583 -0.1850368 0.0012226 0.000168 0.000128 0.000070 0.000086 0.0000037 0.0000110 0.000046 0.000062
+2014 3 19 56735 0.025396 0.405970 -0.1862549 0.0011946 0.000267 0.000307 0.000061 0.000077 0.0000088 0.0000109 0.000088 0.000076
+2014 3 20 56736 0.026182 0.406487 -0.1874422 0.0011525 0.000394 0.000514 0.000064 0.000076 0.0000087 0.0000110 0.000141 0.000091
+2014 3 21 56737 0.027434 0.407106 -0.1885777 0.0011114 0.000510 0.000693 0.000073 0.000077 0.0000118 0.0000108 0.000193 0.000106
+2014 3 22 56738 0.028319 0.408424 -0.1896834 0.0010993 0.000529 0.000615 0.000064 0.000069 0.0000133 0.0000098 0.000172 0.000094
+2014 3 23 56739 0.029456 0.409785 -0.1908270 0.0011587 0.000496 0.000424 0.000062 0.000063 0.0000080 0.0000100 0.000124 0.000072
+2014 3 24 56740 0.030870 0.411294 -0.1920415 0.0012512 0.000408 -0.000027 0.000049 0.000051 0.0000078 0.0000100 0.000039 0.000053
+2014 3 25 56741 0.032294 0.412629 -0.1933480 0.0013671 0.000364 -0.000046 0.000046 0.000045 0.0000022 0.0000099 0.000022 0.000028
+2014 3 26 56742 0.033618 0.414145 -0.1947922 0.0015336 0.000334 -0.000032 0.000059 0.000052 0.0000086 0.0000110 0.000016 0.000023
+2014 3 27 56743 0.035069 0.415154 -0.1963878 0.0016663 0.000300 0.000002 0.000059 0.000056 0.0000075 0.0000104 0.000015 0.000023
+2014 3 28 56744 0.036794 0.415987 -0.1980989 0.0017386 0.000262 0.000051 0.000064 0.000056 0.0000023 0.0000099 0.000013 0.000023
+2014 3 29 56745 0.038524 0.416876 -0.1998809 0.0017997 0.000210 0.000074 0.000069 0.000059 0.0000063 0.0000103 0.000023 0.000023
+2014 3 30 56746 0.040416 0.418052 -0.2016754 0.0017886 0.000158 0.000095 0.000064 0.000062 0.0000102 0.0000111 0.000036 0.000024
+2014 3 31 56747 0.042240 0.419457 -0.2034060 0.0016529 0.000171 0.000083 0.000053 0.000057 0.0000095 0.0000116 0.000029 0.000039
+2014 4 1 56748 0.043607 0.420940 -0.2050077 0.0014833 0.000165 0.000100 0.000058 0.000056 0.0000023 0.0000111 0.000033 0.000044
+2014 4 2 56749 0.044731 0.422505 -0.2064734 0.0014041 0.000149 0.000156 0.000064 0.000065 0.0000053 0.0000113 0.000069 0.000033
+2014 4 3 56750 0.045490 0.423828 -0.2078192 0.0013026 0.000180 0.000166 0.000038 0.000026 0.0000093 0.0000230 0.000334 0.000142
+2014 4 4 56751 0.045979 0.424932 -0.2090728 0.0012096 0.000254 0.000110 0.000041 0.000028 0.0000094 0.0000231 0.000174 0.000076
+2014 4 5 56752 0.046374 0.425656 -0.2102805 0.0012037 0.000322 0.000091 0.000043 0.000031 0.0000095 0.0000231 0.000070 0.000035
+2014 4 6 56753 0.046842 0.426321 -0.2114745 0.0011918 0.000377 0.000088 0.000047 0.000034 0.0000095 0.0000231 0.000055 0.000033
+2014 4 7 56754 0.047736 0.426413 -0.2126716 0.0011774 0.000403 0.000081 0.000050 0.000038 0.0000094 0.0000229 0.000039 0.000031
+2014 4 8 56755 0.049174 0.427200 -0.2138681 0.0011797 0.000434 0.000071 0.000053 0.000042 0.0000092 0.0000228 0.000024 0.000029
+2014 4 9 56756 0.050711 0.428221 -0.2150826 0.0012402 0.000430 0.000044 0.000055 0.000045 0.0000090 0.0000225 0.000039 0.000033
+2014 4 10 56757 0.052168 0.429049 -0.2163479 0.0012906 0.000407 0.000016 0.000056 0.000048 0.0000088 0.0000222 0.000062 0.000039
+2014 4 11 56758 0.053250 0.429803 -0.2176742 0.0013679 0.000369 -0.000010 0.000056 0.000049 0.0000087 0.0000219 0.000086 0.000045
+2014 4 12 56759 0.054234 0.430495 -0.2190704 0.0014091 0.000361 -0.000029 0.000056 0.000050 0.0000088 0.0000215 0.000078 0.000041
+2014 4 13 56760 0.054922 0.430829 -0.2205171 0.0014478 0.000356 -0.000041 0.000056 0.000050 0.0000089 0.0000212 0.000058 0.000034
+2014 4 14 56761 0.055815 0.431117 -0.2219822 0.0014663 0.000362 -0.000059 0.000055 0.000050 0.0000092 0.0000210 0.000060 0.000077
+2014 4 15 56762 0.056685 0.432066 -0.2234228 0.0013816 0.000324 -0.000051 0.000055 0.000050 0.0000095 0.0000207 0.000022 0.000028
+2014 4 16 56763 0.057372 0.432707 -0.2247286 0.0012667 0.000186 -0.000090 0.000055 0.000050 0.0000100 0.0000205 0.000026 0.000025
+2014 4 17 56764 0.058285 0.433345 -0.2259156 0.0011908 0.000174 -0.000102 0.000055 0.000050 0.0000104 0.0000204 0.000027 0.000026
+2014 4 18 56765 0.059603 0.434397 -0.2271391 0.0012129 0.000204 -0.000106 0.000055 0.000050 0.0000107 0.0000203 0.000028 0.000027
+2014 4 19 56766 0.060277 0.435889 -0.2283317 0.0012106 0.000233 -0.000109 0.000055 0.000051 0.0000109 0.0000202 0.000029 0.000029
+2014 4 20 56767 0.061059 0.436854 -0.2295709 0.0012763 0.000263 -0.000113 0.000055 0.000051 0.0000108 0.0000201 0.000031 0.000032
+2014 4 21 56768 0.062226 0.437949 -0.2308728 0.0013690 0.000293 -0.000117 0.000056 0.000052 0.0000106 0.0000200 0.000033 0.000034
+2014 4 22 56769 0.063815 0.438636 -0.2323091 0.0015186 0.000323 -0.000120 0.000056 0.000052 0.0000103 0.0000198 0.000035 0.000036
+2014 4 23 56770 0.065292 0.439387 -0.2338990 0.0016702 0.000352 -0.000124 0.000056 0.000052 0.0000100 0.0000197 0.000036 0.000038
+2014 4 24 56771 0.066921 0.439872 -0.2356278 0.0017850 0.000334 -0.000151 0.000056 0.000052 0.0000098 0.0000196 0.000036 0.000038
+2014 4 25 56772 0.068585 0.440441 -0.2374693 0.0019314 0.000246 -0.000097 0.000056 0.000052 0.0000097 0.0000194 0.000036 0.000038
+2014 4 26 56773 0.070307 0.441005 -0.2394767 0.0020125 0.000217 -0.000075 0.000056 0.000052 0.0000096 0.0000193 0.000036 0.000038
+2014 4 27 56774 0.071805 0.441748 -0.2414570 0.0019375 0.000217 -0.000075 0.000055 0.000052 0.0000096 0.0000191 0.000035 0.000037
+2014 4 28 56775 0.072999 0.442322 -0.2433045 0.0017822 0.000217 -0.000075 0.000054 0.000051 0.0000094 0.0000190 0.000033 0.000034
+2014 4 29 56776 0.074344 0.442647 -0.2450174 0.0016082 0.000216 -0.000075 0.000053 0.000051 0.0000091 0.0000188 0.000030 0.000030
+2014 4 30 56777 0.076138 0.442770 -0.2465525 0.0014022 0.000294 -0.000101 0.000052 0.000050 0.0000084 0.0000187 0.000025 0.000025
+2014 5 1 56778 0.078006 0.443141 -0.2478353 0.0012218 0.000389 -0.000122 0.000051 0.000049 0.0000075 0.0000186 0.000021 0.000021
+2014 5 2 56779 0.079752 0.443556 -0.2490242 0.0011072 0.000455 -0.000133 0.000049 0.000047 0.0000065 0.0000185 0.000017 0.000017
+2014 5 3 56780 0.081711 0.443986 -0.2501264 0.0010898 0.000414 -0.000124 0.000048 0.000045 0.0000055 0.0000184 0.000014 0.000014
+2014 5 4 56781 0.083804 0.444551 -0.2512096 0.0011009 0.000373 -0.000115 0.000047 0.000043 0.0000047 0.0000183 0.000012 0.000012
+2014 5 5 56782 0.085264 0.444867 -0.2523442 0.0011410 0.000332 -0.000106 0.000046 0.000041 0.0000040 0.0000183 0.000011 0.000010
+2014 5 6 56783 0.086218 0.444993 -0.2535314 0.0012144 0.000292 -0.000097 0.000045 0.000038 0.0000035 0.0000183 0.000010 0.000009
+2014 5 7 56784 0.087407 0.445508 -0.2547832 0.0012917 0.000228 -0.000090 0.000044 0.000036 0.0000031 0.0000183 0.000009 0.000009
+2014 5 8 56785 0.088971 0.446127 -0.2561164 0.0013740 0.000170 -0.000095 0.000043 0.000035 0.0000028 0.0000183 0.000009 0.000008
+2014 5 9 56786 0.090412 0.446742 -0.2575222 0.0014280 0.000152 -0.000111 0.000042 0.000034 0.0000026 0.0000183 0.000009 0.000008
+2014 5 10 56787 0.091516 0.446842 -0.2589607 0.0014445 0.000150 -0.000128 0.000042 0.000033 0.0000025 0.0000183 0.000009 0.000008
+2014 5 11 56788 0.093120 0.446733 -0.2604000 0.0014330 0.000156 -0.000161 0.000041 0.000032 0.0000024 0.0000184 0.000008 0.000008
+2014 5 12 56789 0.095450 0.446666 -0.2618050 0.0013731 0.000164 -0.000196 0.000041 0.000032 0.0000023 0.0000185 0.000008 0.000008
+2014 5 13 56790 0.097759 0.447045 -0.2631161 0.0012470 0.000150 -0.000189 0.000041 0.000032 0.0000023 0.0000186 0.000008 0.000008
+2014 5 14 56791 0.099823 0.447537 -0.2643053 0.0011407 0.000137 -0.000182 0.000041 0.000032 0.0000023 0.0000187 0.000008 0.000007
+2014 5 15 56792 0.101336 0.447890 -0.2654073 0.0010624 0.000134 -0.000177 0.000042 0.000032 0.0000023 0.0000189 0.000008 0.000007
+2014 5 16 56793 0.102754 0.448019 -0.2664381 0.0010092 0.000137 -0.000186 0.000042 0.000032 0.0000024 0.0000191 0.000008 0.000007
+2014 5 17 56794 0.103945 0.448045 -0.2674370 0.0010041 0.000146 -0.000222 0.000043 0.000033 0.0000025 0.0000192 0.000008 0.000007
+2014 5 18 56795 0.104918 0.447989 -0.2684767 0.0010704 0.000148 -0.000236 0.000044 0.000034 0.0000026 0.0000194 0.000008 0.000008
+2014 5 19 56796 0.105841 0.447812 -0.2696113 0.0012053 0.000142 -0.000227 0.000045 0.000036 0.0000028 0.0000195 0.000009 0.000008
+2014 5 20 56797 0.107248 0.447607 -0.2708972 0.0013566 0.000133 -0.000197 0.000046 0.000037 0.0000031 0.0000196 0.000009 0.000008
+2014 5 21 56798 0.108980 0.447694 -0.2723098 0.0014569 0.000134 -0.000167 0.000047 0.000039 0.0000035 0.0000196 0.000010 0.000009
+2014 5 22 56799 0.110853 0.448038 -0.2737784 0.0014631 0.000147 -0.000153 0.000048 0.000041 0.0000040 0.0000197 0.000011 0.000010
+2014 5 23 56800 0.112172 0.448263 -0.2752192 0.0014141 0.000173 -0.000157 0.000049 0.000043 0.0000047 0.0000196 0.000012 0.000011
+2014 5 24 56801 0.113669 0.448048 -0.2766489 0.0013577 0.000189 -0.000156 0.000050 0.000045 0.0000056 0.0000196 0.000013 0.000012
+2014 5 25 56802 0.115160 0.447700 -0.2779098 0.0011981 0.000202 -0.000151 0.000050 0.000046 0.0000068 0.0000195 0.000016 0.000014
+2014 5 26 56803 0.116710 0.446966 -0.2790136 0.0010390 0.000214 -0.000146 0.000051 0.000047 0.0000081 0.0000193 0.000018 0.000017
+2014 5 27 56804 0.118078 0.446334 -0.2799649 0.0008563 0.000225 -0.000144 0.000051 0.000048 0.0000095 0.0000192 0.000022 0.000021
+2014 5 28 56805 0.120155 0.445401 -0.2807220 0.0006981 0.000233 -0.000154 0.000051 0.000048 0.0000107 0.0000190 0.000025 0.000024
+2014 5 29 56806 0.122767 0.444962 -0.2813525 0.0005656 0.000274 -0.000170 0.000051 0.000048 0.0000112 0.0000189 0.000027 0.000027
+2014 5 30 56807 0.125428 0.444159 -0.2818407 0.0004248 0.000324 -0.000189 0.000051 0.000048 0.0000112 0.0000188 0.000027 0.000029
+2014 5 31 56808 0.127751 0.443535 -0.2822207 0.0003855 0.000323 -0.000187 0.000051 0.000047 0.0000109 0.0000187 0.000027 0.000028
+2014 6 1 56809 0.129382 0.442901 -0.2826269 0.0003870 0.000302 -0.000178 0.000051 0.000047 0.0000105 0.0000185 0.000025 0.000027
+2014 6 2 56810 0.130672 0.441904 -0.2830313 0.0004260 0.000281 -0.000169 0.000051 0.000047 0.0000102 0.0000184 0.000024 0.000026
+2014 6 3 56811 0.131670 0.440946 -0.2834755 0.0004692 0.000260 -0.000160 0.000051 0.000047 0.0000100 0.0000183 0.000024 0.000026
+2014 6 4 56812 0.133002 0.439682 -0.2839682 0.0005757 0.000148 -0.000196 0.000051 0.000048 0.0000099 0.0000182 0.000024 0.000025
+2014 6 5 56813 0.134479 0.438899 -0.2846041 0.0006269 0.000050 -0.000238 0.000051 0.000048 0.0000100 0.0000181 0.000024 0.000026
+2014 6 6 56814 0.136334 0.437847 -0.2852191 0.0006864 0.000099 -0.000260 0.000051 0.000048 0.0000103 0.0000180 0.000024 0.000026
+2014 6 7 56815 0.138475 0.437411 -0.2859542 0.0007247 0.000122 -0.000259 0.000051 0.000049 0.0000108 0.0000179 0.000024 0.000026
+2014 6 8 56816 0.140267 0.436583 -0.2866897 0.0007540 0.000136 -0.000249 0.000051 0.000049 0.0000114 0.0000179 0.000024 0.000026
+2014 6 9 56817 0.142193 0.435883 -0.2874319 0.0007277 0.000150 -0.000239 0.000051 0.000049 0.0000120 0.0000179 0.000025 0.000026
+2014 6 10 56818 0.143900 0.435273 -0.2881091 0.0006877 0.000164 -0.000229 0.000051 0.000049 0.0000126 0.0000179 0.000025 0.000027
+2014 6 11 56819 0.145742 0.434729 -0.2887678 0.0006694 0.000178 -0.000218 0.000052 0.000049 0.0000132 0.0000179 0.000026 0.000027
+2014 6 12 56820 0.147475 0.434263 -0.2894086 0.0006460 0.000134 -0.000256 0.000052 0.000049 0.0000136 0.0000179 0.000027 0.000028
+2014 6 13 56821 0.149117 0.433486 -0.2900394 0.0006312 0.000120 -0.000264 0.000052 0.000049 0.0000138 0.0000179 0.000027 0.000028
+2014 6 14 56822 0.150723 0.432699 -0.2906975 0.0006772 0.000116 -0.000250 0.000052 0.000049 0.0000138 0.0000179 0.000028 0.000029
+2014 6 15 56823 0.152515 0.431573 -0.2914277 0.0007752 0.000109 -0.000232 0.000052 0.000049 0.0000135 0.0000179 0.000029 0.000030
+2014 6 16 56824 0.154208 0.430685 -0.2922723 0.0008985 0.000102 -0.000215 0.000052 0.000049 0.0000130 0.0000178 0.000029 0.000030
+2014 6 17 56825 0.155920 0.430008 -0.2932342 0.0010492 0.000096 -0.000197 0.000052 0.000049 0.0000123 0.0000177 0.000028 0.000030
+2014 6 18 56826 0.157288 0.429487 -0.2943547 0.0011434 0.000089 -0.000179 0.000052 0.000049 0.0000115 0.0000176 0.000027 0.000028
+2014 6 19 56827 0.158508 0.428886 -0.2955066 0.0011746 0.000085 -0.000200 0.000052 0.000049 0.0000107 0.0000175 0.000025 0.000027
+2014 6 20 56828 0.159865 0.428145 -0.2966774 0.0011326 0.000082 -0.000230 0.000051 0.000048 0.0000098 0.0000173 0.000024 0.000026
+2014 6 21 56829 0.160944 0.427272 -0.2977446 0.0009942 0.000086 -0.000229 0.000051 0.000048 0.0000090 0.0000172 0.000022 0.000024
+2014 6 22 56830 0.161869 0.426250 -0.2986714 0.0008196 0.000093 -0.000216 0.000051 0.000047 0.0000084 0.0000171 0.000022 0.000023
+2014 6 23 56831 0.163248 0.425126 -0.2993918 0.0006487 0.000100 -0.000202 0.000051 0.000047 0.0000078 0.0000170 0.000021 0.000023
+2014 6 24 56832 0.164735 0.423900 -0.2999778 0.0004974 0.000107 -0.000189 0.000050 0.000047 0.0000074 0.0000170 0.000021 0.000023
+2014 6 25 56833 0.166018 0.422594 -0.3003892 0.0003641 0.000086 -0.000181 0.000051 0.000047 0.0000072 0.0000171 0.000021 0.000023
+2014 6 26 56834 0.166820 0.421456 -0.3007069 0.0002290 0.000102 -0.000217 0.000051 0.000047 0.0000071 0.0000172 0.000022 0.000023
+2014 6 27 56835 0.167441 0.420226 -0.3008703 0.0001372 0.000115 -0.000328 0.000051 0.000047 0.0000071 0.0000174 0.000022 0.000024
+2014 6 28 56836 0.168132 0.419090 -0.3010214 0.0001603 0.000145 -0.000340 0.000051 0.000047 0.0000072 0.0000175 0.000023 0.000024
+2014 6 29 56837 0.168884 0.417834 -0.3013068 0.0002438 0.000184 -0.000308 0.000051 0.000047 0.0000074 0.0000177 0.000023 0.000025
+2014 6 30 56838 0.169659 0.416477 -0.3015470 0.0003249 0.000223 -0.000275 0.000051 0.000047 0.0000076 0.0000179 0.000024 0.000025
+2014 7 1 56839 0.170584 0.414989 -0.3018456 0.0003594 0.000262 -0.000242 0.000051 0.000048 0.0000080 0.0000180 0.000024 0.000025
+2014 7 2 56840 0.171897 0.413791 -0.3022202 0.0004117 0.000205 -0.000263 0.000051 0.000048 0.0000084 0.0000181 0.000024 0.000025
+2014 7 3 56841 0.173223 0.412770 -0.3026915 0.0004952 0.000123 -0.000297 0.000051 0.000048 0.0000089 0.0000181 0.000025 0.000025
+2014 7 4 56842 0.174571 0.411718 -0.3032412 0.0005552 0.000007 -0.000313 0.000051 0.000048 0.0000095 0.0000181 0.000025 0.000025
+2014 7 5 56843 0.175531 0.410939 -0.3037563 0.0005275 -0.000021 -0.000314 0.000052 0.000049 0.0000101 0.0000181 0.000025 0.000025
+2014 7 6 56844 0.176357 0.409851 -0.3042825 0.0004529 -0.000007 -0.000311 0.000052 0.000049 0.0000105 0.0000181 0.000026 0.000026
+2014 7 7 56845 0.177000 0.408770 -0.3047259 0.0003754 0.000007 -0.000309 0.000052 0.000049 0.0000108 0.0000181 0.000027 0.000026
+2014 7 8 56846 0.177602 0.407704 -0.3050529 0.0003262 0.000021 -0.000306 0.000052 0.000049 0.0000107 0.0000181 0.000028 0.000027
+2014 7 9 56847 0.178395 0.406780 -0.3053678 0.0002828 0.000086 -0.000273 0.000053 0.000049 0.0000105 0.0000181 0.000030 0.000028
+2014 7 10 56848 0.179056 0.405874 -0.3056340 0.0002779 0.000164 -0.000231 0.000053 0.000049 0.0000102 0.0000181 0.000031 0.000029
+2014 7 11 56849 0.180057 0.404783 -0.3059835 0.0003438 0.000129 -0.000256 0.000054 0.000049 0.0000099 0.0000181 0.000032 0.000029
+2014 7 12 56850 0.181119 0.403702 -0.3063784 0.0004383 0.000083 -0.000308 0.000054 0.000050 0.0000097 0.0000182 0.000033 0.000030
+2014 7 13 56851 0.182012 0.402757 -0.3069232 0.0006128 0.000076 -0.000333 0.000054 0.000050 0.0000096 0.0000182 0.000033 0.000031
+2014 7 14 56852 0.182718 0.401707 -0.3076397 0.0007925 0.000084 -0.000324 0.000054 0.000050 0.0000096 0.0000182 0.000033 0.000031
+2014 7 15 56853 0.183180 0.400689 -0.3085068 0.0008957 0.000076 -0.000310 0.000054 0.000050 0.0000098 0.0000182 0.000033 0.000031
+2014 7 16 56854 0.183580 0.399238 -0.3094178 0.0009376 0.000078 -0.000284 0.000054 0.000051 0.0000101 0.0000183 0.000032 0.000031
+2014 7 17 56855 0.184079 0.397872 -0.3103601 0.0008741 0.000083 -0.000256 0.000053 0.000051 0.0000104 0.0000183 0.000031 0.000031
+2014 7 18 56856 0.184391 0.396246 -0.3111826 0.0007416 0.000090 -0.000233 0.000053 0.000051 0.0000107 0.0000183 0.000030 0.000030
+2014 7 19 56857 0.185390 0.394567 -0.3118750 0.0006218 0.000042 -0.000255 0.000053 0.000051 0.0000110 0.0000183 0.000028 0.000028
+2014 7 20 56858 0.186474 0.393185 -0.3124351 0.0004699 -0.000027 -0.000293 0.000053 0.000051 0.0000111 0.0000183 0.000026 0.000027
+2014 7 21 56859 0.187769 0.391873 -0.3127786 0.0003072 0.000002 -0.000301 0.000053 0.000051 0.0000111 0.0000184 0.000025 0.000026
+2014 7 22 56860 0.188753 0.391086 -0.3129974 0.0001613 0.000035 -0.000307 0.000053 0.000051 0.0000109 0.0000185 0.000024 0.000025
+2014 7 23 56861 0.189334 0.390032 -0.3131121 0.0000722 0.000074 -0.000303 0.000053 0.000051 0.0000107 0.0000186 0.000023 0.000024
+2014 7 24 56862 0.189640 0.389271 -0.3131225 0.0000335 0.000115 -0.000296 0.000053 0.000051 0.0000105 0.0000188 0.000023 0.000024
+2014 7 25 56863 0.190008 0.388135 -0.3131583 0.0000343 0.000156 -0.000290 0.000053 0.000051 0.0000103 0.0000190 0.000023 0.000024
+2014 7 26 56864 0.190391 0.387076 -0.3131772 0.0000312 0.000149 -0.000291 0.000053 0.000051 0.0000101 0.0000193 0.000023 0.000024
+2014 7 27 56865 0.190974 0.385960 -0.3132633 0.0000862 0.000124 -0.000296 0.000054 0.000051 0.0000101 0.0000195 0.000024 0.000024
+2014 7 28 56866 0.191997 0.384965 -0.3134113 0.0002046 0.000100 -0.000301 0.000054 0.000051 0.0000100 0.0000198 0.000024 0.000024
+2014 7 29 56867 0.193138 0.383991 -0.3136698 0.0003182 0.000075 -0.000307 0.000053 0.000051 0.0000099 0.0000200 0.000025 0.000023
+2014 7 30 56868 0.194141 0.382918 -0.3140305 0.0004095 0.000045 -0.000312 0.000053 0.000051 0.0000097 0.0000202 0.000026 0.000024
+2014 7 31 56869 0.194699 0.381742 -0.3144635 0.0004349 0.000015 -0.000317 0.000053 0.000051 0.0000094 0.0000203 0.000027 0.000024
+2014 8 1 56870 0.195488 0.380228 -0.3149182 0.0004241 -0.000016 -0.000322 0.000052 0.000051 0.0000091 0.0000204 0.000028 0.000025
+2014 8 2 56871 0.196059 0.379053 -0.3153248 0.0003616 -0.000025 -0.000347 0.000051 0.000051 0.0000087 0.0000203 0.000030 0.000026
+2014 8 3 56872 0.196656 0.377635 -0.3156566 0.0002911 -0.000027 -0.000380 0.000051 0.000052 0.0000084 0.0000202 0.000032 0.000028
+2014 8 4 56873 0.197587 0.376138 -0.3159315 0.0002340 -0.000029 -0.000413 0.000051 0.000052 0.0000081 0.0000201 0.000034 0.000030
+2014 8 5 56874 0.198589 0.374538 -0.3161114 0.0001770 -0.000030 -0.000446 0.000051 0.000052 0.0000079 0.0000199 0.000036 0.000032
+2014 8 6 56875 0.199846 0.373215 -0.3162507 0.0001105 -0.000050 -0.000405 0.000051 0.000052 0.0000078 0.0000196 0.000037 0.000034
+2014 8 7 56876 0.201159 0.372190 -0.3163214 0.0000620 -0.000070 -0.000340 0.000052 0.000052 0.0000078 0.0000193 0.000039 0.000035
+2014 8 8 56877 0.202153 0.371221 -0.3164116 0.0001605 -0.000071 -0.000262 0.000053 0.000052 0.0000078 0.0000191 0.000040 0.000037
+2014 8 9 56878 0.203137 0.370129 -0.3166555 0.0003461 -0.000069 -0.000176 0.000053 0.000051 0.0000077 0.0000188 0.000040 0.000038
+2014 8 10 56879 0.204271 0.369117 -0.3170684 0.0005045 -0.000046 -0.000094 0.000054 0.000051 0.0000077 0.0000185 0.000040 0.000039
+2014 8 11 56880 0.205468 0.368306 -0.3176686 0.0006516 -0.000010 -0.000108 0.000054 0.000051 0.0000076 0.0000183 0.000039 0.000038
+2014 8 12 56881 0.206550 0.367611 -0.3183718 0.0007662 0.000022 -0.000211 0.000054 0.000050 0.0000076 0.0000181 0.000037 0.000037
+2014 8 13 56882 0.207368 0.366875 -0.3192080 0.0008445 -0.000019 -0.000222 0.000054 0.000050 0.0000077 0.0000180 0.000035 0.000035
+2014 8 14 56883 0.207974 0.366035 -0.3200390 0.0008306 -0.000077 -0.000212 0.000054 0.000050 0.0000079 0.0000180 0.000032 0.000032
+2014 8 15 56884 0.208833 0.364879 -0.3208085 0.0007058 -0.000136 -0.000201 0.000054 0.000050 0.0000081 0.0000180 0.000030 0.000030
+2014 8 16 56885 0.209661 0.363515 -0.3214366 0.0005738 -0.000170 -0.000163 0.000054 0.000050 0.0000085 0.0000181 0.000028 0.000028
+2014 8 17 56886 0.210175 0.362120 -0.3219543 0.0004646 -0.000161 -0.000173 0.000054 0.000050 0.0000088 0.0000182 0.000026 0.000027
+2014 8 18 56887 0.210355 0.360764 -0.3223442 0.0003724 -0.000098 -0.000240 0.000054 0.000050 0.0000091 0.0000183 0.000025 0.000025
+2014 8 19 56888 0.210028 0.359301 -0.3226751 0.0002670 -0.000015 -0.000307 0.000054 0.000050 0.0000094 0.0000183 0.000024 0.000024
+2014 8 20 56889 0.209735 0.357770 -0.3228524 0.0002028 0.000001 -0.000286 0.000054 0.000050 0.0000096 0.0000184 0.000023 0.000023
+2014 8 21 56890 0.209563 0.356134 -0.3230781 0.0001720 -0.000002 -0.000242 0.000054 0.000050 0.0000097 0.0000185 0.000023 0.000023
+2014 8 22 56891 0.209708 0.354414 -0.3232281 0.0001736 -0.000004 -0.000198 0.000054 0.000049 0.0000097 0.0000185 0.000023 0.000022
+2014 8 23 56892 0.209551 0.352545 -0.3234436 0.0002298 -0.000010 -0.000200 0.000053 0.000049 0.0000097 0.0000186 0.000023 0.000022
+2014 8 24 56893 0.209543 0.350682 -0.3237039 0.0002452 -0.000017 -0.000207 0.000053 0.000049 0.0000097 0.0000187 0.000023 0.000022
+2014 8 25 56894 0.209475 0.348842 -0.3239090 0.0002474 -0.000023 -0.000213 0.000053 0.000049 0.0000097 0.0000188 0.000023 0.000023
+2014 8 26 56895 0.209267 0.346963 -0.3242008 0.0003407 -0.000030 -0.000220 0.000053 0.000049 0.0000098 0.0000190 0.000024 0.000023
+2014 8 27 56896 0.209107 0.344999 -0.3245986 0.0004474 0.000026 -0.000244 0.000054 0.000049 0.0000098 0.0000191 0.000025 0.000024
+2014 8 28 56897 0.208963 0.342830 -0.3250684 0.0004737 0.000034 -0.000246 0.000054 0.000049 0.0000098 0.0000193 0.000026 0.000026
+2014 8 29 56898 0.209048 0.340905 -0.3255777 0.0004849 0.000017 -0.000238 0.000054 0.000050 0.0000097 0.0000194 0.000027 0.000027
+2014 8 30 56899 0.209434 0.339465 -0.3260537 0.0004954 -0.000031 -0.000225 0.000055 0.000050 0.0000094 0.0000196 0.000027 0.000028
+2014 8 31 56900 0.209548 0.338221 -0.3266006 0.0004995 -0.000083 -0.000221 0.000055 0.000050 0.0000090 0.0000197 0.000026 0.000028
+2014 9 1 56901 0.209607 0.336852 -0.3270808 0.0005307 -0.000109 -0.000254 0.000054 0.000050 0.0000086 0.0000198 0.000026 0.000027
+2014 9 2 56902 0.209660 0.335219 -0.3276267 0.0005246 -0.000117 -0.000313 0.000054 0.000049 0.0000083 0.0000199 0.000025 0.000027
+2014 9 3 56903 0.209254 0.333379 -0.3281446 0.0005189 -0.000069 -0.000363 0.000054 0.000049 0.0000082 0.0000200 0.000024 0.000026
+2014 9 4 56904 0.209037 0.331518 -0.3286903 0.0005579 -0.000050 -0.000362 0.000053 0.000049 0.0000082 0.0000201 0.000024 0.000026
+2014 9 5 56905 0.209082 0.329809 -0.3292897 0.0006737 -0.000058 -0.000375 0.000053 0.000049 0.0000084 0.0000202 0.000023 0.000025
+2014 9 6 56906 0.209238 0.328265 -0.3300526 0.0008447 -0.000075 -0.000395 0.000053 0.000049 0.0000087 0.0000203 0.000024 0.000026
+2014 9 7 56907 0.209075 0.326903 -0.3309917 0.0010230 -0.000094 -0.000413 0.000053 0.000049 0.0000091 0.0000204 0.000024 0.000027
+2014 9 8 56908 0.208594 0.325623 -0.3321123 0.0011996 -0.000113 -0.000431 0.000054 0.000049 0.0000096 0.0000205 0.000025 0.000028
+2014 9 9 56909 0.207951 0.324033 -0.3333886 0.0013211 -0.000132 -0.000449 0.000054 0.000050 0.0000100 0.0000205 0.000027 0.000030
+2014 9 10 56910 0.207098 0.322101 -0.3346961 0.0012611 -0.000221 -0.000459 0.000054 0.000050 0.0000104 0.0000205 0.000029 0.000031
+2014 9 11 56911 0.205714 0.319840 -0.3359035 0.0011188 -0.000329 -0.000466 0.000054 0.000050 0.0000109 0.0000205 0.000030 0.000032
+2014 9 12 56912 0.204830 0.317418 -0.3369368 0.0009453 -0.000436 -0.000474 0.000054 0.000050 0.0000114 0.0000205 0.000031 0.000031
+2014 9 13 56913 0.203746 0.315472 -0.3377901 0.0007631 -0.000415 -0.000426 0.000054 0.000050 0.0000119 0.0000205 0.000032 0.000029
+2014 9 14 56914 0.203351 0.313633 -0.3385102 0.0006530 -0.000346 -0.000358 0.000054 0.000050 0.0000125 0.0000205 0.000031 0.000028
+2014 9 15 56915 0.203062 0.312329 -0.3391052 0.0006022 -0.000278 -0.000290 0.000053 0.000050 0.0000131 0.0000205 0.000031 0.000027
+2014 9 16 56916 0.202703 0.310813 -0.3396756 0.0006015 -0.000209 -0.000222 0.000053 0.000050 0.0000137 0.0000205 0.000031 0.000026
+2014 9 17 56917 0.201975 0.309541 -0.3402466 0.0006290 -0.000153 -0.000209 0.000053 0.000050 0.0000142 0.0000206 0.000031 0.000026
+2014 9 18 56918 0.201157 0.308055 -0.3409406 0.0006813 -0.000100 -0.000210 0.000053 0.000050 0.0000144 0.0000207 0.000032 0.000027
+2014 9 19 56919 0.200493 0.306730 -0.3416155 0.0007148 -0.000047 -0.000212 0.000053 0.000050 0.0000143 0.0000209 0.000033 0.000028
+2014 9 20 56920 0.199681 0.304945 -0.3423293 0.0007276 -0.000051 -0.000214 0.000053 0.000050 0.0000140 0.0000211 0.000034 0.000029
+2014 9 21 56921 0.198904 0.303294 -0.3430954 0.0007874 -0.000076 -0.000216 0.000053 0.000049 0.0000136 0.0000213 0.000035 0.000030
+2014 9 22 56922 0.198190 0.301444 -0.3438868 0.0008758 -0.000102 -0.000218 0.000053 0.000049 0.0000133 0.0000215 0.000035 0.000031
+2014 9 23 56923 0.197758 0.299623 -0.3448344 0.0009302 -0.000127 -0.000220 0.000053 0.000049 0.0000131 0.0000216 0.000036 0.000032
+2014 9 24 56924 0.196669 0.297934 -0.3456979 0.0009282 -0.000217 -0.000269 0.000053 0.000049 0.0000130 0.0000218 0.000036 0.000032
+2014 9 25 56925 0.196285 0.296429 -0.3466961 0.0009287 -0.000291 -0.000313 0.000053 0.000049 0.0000130 0.0000219 0.000036 0.000033
+2014 9 26 56926 0.195452 0.295342 -0.3475984 0.0008548 -0.000238 -0.000294 0.000053 0.000049 0.0000131 0.0000220 0.000037 0.000033
+2014 9 27 56927 0.194323 0.294143 -0.3483783 0.0007903 -0.000185 -0.000275 0.000053 0.000049 0.0000132 0.0000221 0.000037 0.000034
+2014 9 28 56928 0.193133 0.293124 -0.3491591 0.0007253 -0.000132 -0.000256 0.000053 0.000050 0.0000132 0.0000221 0.000037 0.000035
+2014 9 29 56929 0.192130 0.291847 -0.3498723 0.0006986 -0.000079 -0.000237 0.000053 0.000050 0.0000130 0.0000222 0.000038 0.000036
+2014 9 30 56930 0.190874 0.290408 -0.3505685 0.0007170 -0.000027 -0.000217 0.000053 0.000050 0.0000127 0.0000223 0.000038 0.000037
+2014 10 1 56931 0.189318 0.288872 -0.3512817 0.0007456 -0.000070 -0.000253 0.000054 0.000050 0.0000124 0.0000223 0.000038 0.000038
+2014 10 2 56932 0.187956 0.287386 -0.3520651 0.0008343 -0.000123 -0.000253 0.000054 0.000051 0.0000122 0.0000224 0.000038 0.000039
+2014 10 3 56933 0.186389 0.286356 -0.3529013 0.0009827 -0.000130 -0.000236 0.000054 0.000051 0.0000119 0.0000224 0.000039 0.000040
+2014 10 4 56934 0.184585 0.285100 -0.3540176 0.0011724 -0.000122 -0.000218 0.000055 0.000051 0.0000117 0.0000224 0.000039 0.000041
+2014 10 5 56935 0.182947 0.283920 -0.3553087 0.0013635 -0.000133 -0.000208 0.000055 0.000051 0.0000114 0.0000223 0.000039 0.000042
+2014 10 6 56936 0.180779 0.282637 -0.3567623 0.0014976 -0.000178 -0.000232 0.000055 0.000051 0.0000111 0.0000222 0.000039 0.000043
+2014 10 7 56937 0.178546 0.281129 -0.3583110 0.0015901 -0.000238 -0.000282 0.000055 0.000051 0.0000105 0.0000221 0.000040 0.000042
+2014 10 8 56938 0.176423 0.279499 -0.3599026 0.0015963 -0.000241 -0.000323 0.000055 0.000051 0.0000098 0.0000219 0.000040 0.000042
+2014 10 9 56939 0.174485 0.277995 -0.3614595 0.0014670 -0.000231 -0.000362 0.000055 0.000051 0.0000090 0.0000217 0.000041 0.000042
+2014 10 10 56940 0.172103 0.276889 -0.3628250 0.0012614 -0.000185 -0.000301 0.000055 0.000050 0.0000081 0.0000215 0.000041 0.000041
+2014 10 11 56941 0.169489 0.275710 -0.3640201 0.0011266 -0.000118 -0.000230 0.000055 0.000050 0.0000074 0.0000212 0.000040 0.000040
+2014 10 12 56942 0.167093 0.274277 -0.3650786 0.0010459 -0.000090 -0.000172 0.000054 0.000050 0.0000068 0.0000210 0.000039 0.000039
+2014 10 13 56943 0.164890 0.272948 -0.3660776 0.0009488 -0.000143 -0.000156 0.000054 0.000049 0.0000064 0.0000208 0.000038 0.000037
+2014 10 14 56944 0.163203 0.271598 -0.3670147 0.0008930 -0.000238 -0.000175 0.000054 0.000049 0.0000061 0.0000205 0.000036 0.000036
+2014 10 15 56945 0.161813 0.270633 -0.3679173 0.0009194 -0.000256 -0.000159 0.000054 0.000049 0.0000061 0.0000203 0.000035 0.000034
+2014 10 16 56946 0.160357 0.269562 -0.3688404 0.0009498 -0.000235 -0.000163 0.000054 0.000048 0.0000061 0.0000201 0.000033 0.000033
+2014 10 17 56947 0.158884 0.268422 -0.3698100 0.0009706 -0.000203 -0.000182 0.000053 0.000048 0.0000064 0.0000199 0.000031 0.000031
+2014 10 18 56948 0.157651 0.267426 -0.3707614 0.0010505 -0.000184 -0.000187 0.000053 0.000048 0.0000068 0.0000197 0.000029 0.000030
+2014 10 19 56949 0.156177 0.266392 -0.3718725 0.0011320 -0.000168 -0.000176 0.000052 0.000048 0.0000119 0.0000191 0.000028 0.000029
+2014 10 20 56950 0.154958 0.265161 -0.3730236 0.0012036 -0.000150 -0.000152 0.000051 0.000048 0.0000122 0.0000189 0.000027 0.000028
+2014 10 21 56951 0.153574 0.264153 -0.3742883 0.0012982 -0.000179 -0.000101 0.000050 0.000047 0.0000127 0.0000187 0.000026 0.000027
+2014 10 22 56952 0.152558 0.263215 -0.3756233 0.0013706 -0.000212 -0.000142 0.000050 0.000046 0.0000133 0.0000185 0.000025 0.000026
+2014 10 23 56953 0.151228 0.262577 -0.3770429 0.0013424 -0.000223 -0.000162 0.000049 0.000046 0.0000140 0.0000183 0.000024 0.000026
+2014 10 24 56954 0.149374 0.261563 -0.3782634 0.0012589 -0.000225 -0.000165 0.000049 0.000046 0.0000149 0.0000182 0.000024 0.000026
+2014 10 25 56955 0.147315 0.260313 -0.3794844 0.0011439 -0.000227 -0.000169 0.000049 0.000046 0.0000157 0.0000181 0.000025 0.000026
+2014 10 26 56956 0.144800 0.259081 -0.3805927 0.0010413 -0.000229 -0.000172 0.000049 0.000046 0.0000164 0.0000180 0.000026 0.000027
+2014 10 27 56957 0.142599 0.257845 -0.3816086 0.0009903 -0.000231 -0.000176 0.000049 0.000046 0.0000167 0.0000179 0.000027 0.000028
+2014 10 28 56958 0.140679 0.257127 -0.3825964 0.0009869 -0.000233 -0.000179 0.000050 0.000046 0.0000166 0.0000178 0.000028 0.000028
+2014 10 29 56959 0.138887 0.256743 -0.3835977 0.0010428 -0.000100 -0.000170 0.000050 0.000046 0.0000161 0.0000178 0.000029 0.000029
+2014 10 30 56960 0.137040 0.256321 -0.3846857 0.0011201 -0.000106 -0.000171 0.000051 0.000046 0.0000154 0.0000178 0.000030 0.000028
+2014 10 31 56961 0.134912 0.256031 -0.3858282 0.0012020 -0.000164 -0.000175 0.000051 0.000046 0.0000146 0.0000177 0.000030 0.000028
+2014 11 1 56962 0.132543 0.255442 -0.3870941 0.0013929 -0.000264 -0.000146 0.000051 0.000046 0.0000140 0.0000178 0.000030 0.000027
+2014 11 2 56963 0.130232 0.254603 -0.3886673 0.0016179 -0.000325 -0.000118 0.000050 0.000046 0.0000134 0.0000178 0.000030 0.000027
+2014 11 3 56964 0.128111 0.253639 -0.3903225 0.0017023 -0.000293 -0.000108 0.000050 0.000046 0.0000129 0.0000179 0.000029 0.000026
+2014 11 4 56965 0.126579 0.253032 -0.3920284 0.0016677 -0.000220 -0.000102 0.000049 0.000045 0.0000126 0.0000180 0.000028 0.000025
+2014 11 5 56966 0.125141 0.253027 -0.3936675 0.0015860 -0.000209 -0.000088 0.000048 0.000045 0.0000123 0.0000180 0.000028 0.000025
+2014 11 6 56967 0.123815 0.253026 -0.3951817 0.0014313 -0.000215 -0.000070 0.000047 0.000045 0.0000120 0.0000181 0.000028 0.000025
+2014 11 7 56968 0.122208 0.252696 -0.3965231 0.0012679 -0.000220 -0.000054 0.000047 0.000045 0.0000116 0.0000181 0.000028 0.000026
+2014 11 8 56969 0.120656 0.252119 -0.3977619 0.0011141 -0.000219 -0.000054 0.000047 0.000045 0.0000112 0.0000181 0.000030 0.000027
+2014 11 9 56970 0.118629 0.251863 -0.3987632 0.0009721 -0.000215 -0.000061 0.000047 0.000045 0.0000106 0.0000181 0.000032 0.000030
+2014 11 10 56971 0.116099 0.251414 -0.3996572 0.0008666 -0.000211 -0.000068 0.000047 0.000045 0.0000099 0.0000181 0.000034 0.000032
+2014 11 11 56972 0.113500 0.251104 -0.4005712 0.0008330 -0.000206 -0.000076 0.000048 0.000046 0.0000093 0.0000182 0.000036 0.000034
+2014 11 12 56973 0.111312 0.251020 -0.4013550 0.0008731 -0.000064 -0.000090 0.000049 0.000046 0.0000088 0.0000182 0.000038 0.000036
+2014 11 13 56974 0.110003 0.251216 -0.4022787 0.0009455 -0.000010 -0.000073 0.000049 0.000046 0.0000083 0.0000182 0.000039 0.000036
+2014 11 14 56975 0.108964 0.251454 -0.4032330 0.0009924 -0.000098 -0.000070 0.000050 0.000046 0.0000081 0.0000183 0.000039 0.000036
+2014 11 15 56976 0.107343 0.251845 -0.4042386 0.0010344 -0.000201 -0.000106 0.000050 0.000047 0.0000080 0.0000184 0.000038 0.000036
+2014 11 16 56977 0.105169 0.252103 -0.4053017 0.0010816 -0.000230 -0.000137 0.000051 0.000047 0.0000080 0.0000185 0.000038 0.000035
+2014 11 17 56978 0.103098 0.252264 -0.4064406 0.0011913 -0.000200 -0.000147 0.000051 0.000047 0.0000082 0.0000186 0.000037 0.000034
+2014 11 18 56979 0.101176 0.252904 -0.4076887 0.0012782 -0.000177 -0.000150 0.000051 0.000048 0.0000084 0.0000187 0.000037 0.000034
+2014 11 19 56980 0.098823 0.253529 -0.4089627 0.0012457 -0.000103 -0.000086 0.000052 0.000048 0.0000088 0.0000187 0.000037 0.000035
+2014 11 20 56981 0.096626 0.253739 -0.4101964 0.0011806 -0.000046 -0.000032 0.000052 0.000049 0.0000091 0.0000187 0.000038 0.000035
+2014 11 21 56982 0.094796 0.254068 -0.4113558 0.0011239 -0.000064 -0.000043 0.000052 0.000049 0.0000095 0.0000186 0.000039 0.000036
+2014 11 22 56983 0.093033 0.254309 -0.4124488 0.0010861 -0.000143 -0.000093 0.000052 0.000050 0.0000098 0.0000185 0.000039 0.000037
+2014 11 23 56984 0.091069 0.254329 -0.4135358 0.0010290 -0.000188 -0.000143 0.000051 0.000050 0.0000100 0.0000183 0.000040 0.000038
+2014 11 24 56985 0.089517 0.254009 -0.4145314 0.0009889 -0.000186 -0.000155 0.000051 0.000049 0.0000103 0.0000182 0.000041 0.000039
+2014 11 25 56986 0.088570 0.253867 -0.4155405 0.0009985 -0.000184 -0.000138 0.000050 0.000049 0.0000105 0.0000181 0.000041 0.000039
+2014 11 26 56987 0.087552 0.254012 -0.4165209 0.0010051 -0.000220 -0.000041 0.000050 0.000049 0.0000108 0.0000180 0.000041 0.000039
+2014 11 27 56988 0.086952 0.254412 -0.4175542 0.0010750 -0.000231 -0.000056 0.000049 0.000048 0.0000110 0.0000179 0.000040 0.000038
+2014 11 28 56989 0.086367 0.255252 -0.4187206 0.0012647 -0.000231 -0.000120 0.000048 0.000047 0.0000110 0.0000179 0.000039 0.000037
+2014 11 29 56990 0.085070 0.256037 -0.4200715 0.0014259 -0.000262 -0.000127 0.000048 0.000047 0.0000109 0.0000179 0.000037 0.000035
+2014 11 30 56991 0.083120 0.256681 -0.4215380 0.0014966 -0.000293 -0.000133 0.000047 0.000046 0.0000105 0.0000178 0.000035 0.000034
+2014 12 1 56992 0.080978 0.257672 -0.4230161 0.0014853 -0.000286 -0.000097 0.000047 0.000046 0.0000100 0.0000178 0.000034 0.000033
+2014 12 2 56993 0.078981 0.258716 -0.4244986 0.0014275 -0.000240 -0.000018 0.000047 0.000045 0.0000095 0.0000177 0.000033 0.000033
+2014 12 3 56994 0.076898 0.259439 -0.4258737 0.0013708 -0.000264 -0.000014 0.000047 0.000045 0.0000091 0.0000177 0.000033 0.000033
+2014 12 4 56995 0.074791 0.259882 -0.4272193 0.0012975 -0.000307 -0.000031 0.000047 0.000045 0.0000088 0.0000176 0.000033 0.000033
+2014 12 5 56996 0.073083 0.260106 -0.4284390 0.0011619 -0.000267 -0.000037 0.000047 0.000045 0.0000087 0.0000175 0.000034 0.000034
+2014 12 6 56997 0.072034 0.260884 -0.4295289 0.0010376 -0.000169 -0.000078 0.000047 0.000045 0.0000087 0.0000175 0.000035 0.000034
+2014 12 7 56998 0.070757 0.261940 -0.4304876 0.0009493 -0.000047 -0.000113 0.000047 0.000045 0.0000089 0.0000174 0.000036 0.000035
+2014 12 8 56999 0.069469 0.262554 -0.4314576 0.0009544 -0.000017 -0.000090 0.000047 0.000045 0.0000093 0.0000173 0.000037 0.000035
+2014 12 9 57000 0.067567 0.263597 -0.4324674 0.0010075 -0.000090 -0.000030 0.000047 0.000045 0.0000098 0.0000172 0.000038 0.000036
+2014 12 10 57001 0.065145 0.264300 -0.4334841 0.0010518 -0.000163 0.000029 0.000047 0.000045 0.0000104 0.0000171 0.000039 0.000036
+2014 12 11 57002 0.062825 0.265096 -0.4345153 0.0011051 -0.000241 -0.000014 0.000048 0.000045 0.0000111 0.0000169 0.000040 0.000037
+2014 12 12 57003 0.060561 0.266065 -0.4357137 0.0011878 -0.000319 -0.000085 0.000048 0.000045 0.0000116 0.0000167 0.000041 0.000037
+2014 12 13 57004 0.058293 0.267322 -0.4369425 0.0012474 -0.000501 -0.000113 0.000049 0.000045 0.0000121 0.0000165 0.000042 0.000038
+2014 12 14 57005 0.055679 0.268340 -0.4381775 0.0012208 -0.000610 -0.000077 0.000049 0.000046 0.0000124 0.0000162 0.000042 0.000040
+2014 12 15 57006 0.052986 0.269413 -0.4394006 0.0012083 -0.000461 -0.000011 0.000049 0.000046 0.0000127 0.0000160 0.000043 0.000041
+2014 12 16 57007 0.050226 0.270617 -0.4406638 0.0012955 -0.000179 0.000033 0.000049 0.000046 0.0000128 0.0000157 0.000044 0.000042
+2014 12 17 57008 0.047395 0.271695 -0.4419602 0.0013058 -0.000193 -0.000004 0.000049 0.000045 0.0000128 0.0000155 0.000044 0.000042
+2014 12 18 57009 0.044864 0.272181 -0.4432150 0.0012082 -0.000207 -0.000041 0.000049 0.000045 0.0000126 0.0000153 0.000044 0.000042
+2014 12 19 57010 0.043407 0.272545 -0.4443986 0.0011341 -0.000239 -0.000044 0.000048 0.000045 0.0000121 0.0000151 0.000043 0.000042
+2014 12 20 57011 0.042148 0.273277 -0.4454748 0.0010236 -0.000190 0.000030 0.000048 0.000045 0.0000116 0.0000151 0.000043 0.000041
+2014 12 21 57012 0.040840 0.273577 -0.4464585 0.0009500 -0.000110 0.000131 0.000047 0.000045 0.0000109 0.0000150 0.000042 0.000040
+2014 12 22 57013 0.039590 0.273952 -0.4473797 0.0009382 -0.000162 0.000113 0.000047 0.000044 0.0000103 0.0000151 0.000041 0.000038
+2014 12 23 57014 0.038666 0.274210 -0.4483439 0.0009982 -0.000229 0.000042 0.000045 0.000042 0.0000081 0.0000153 0.000040 0.000037
+2014 12 24 57015 0.037870 0.274918 -0.4494034 0.0011122 -0.000290 0.000011 0.000045 0.000042 0.0000082 0.0000154 0.000040 0.000037
+2014 12 25 57016 0.037163 0.275526 -0.4505958 0.0012892 -0.000294 0.000013 0.000044 0.000042 0.0000083 0.0000156 0.000040 0.000036
+2014 12 26 57017 0.036199 0.276339 -0.4519426 0.0013927 -0.000277 0.000024 0.000044 0.000042 0.0000086 0.0000158 0.000040 0.000037
+2014 12 27 57018 0.035254 0.276908 -0.4533618 0.0014596 -0.000261 0.000034 0.000044 0.000042 0.0000089 0.0000160 0.000042 0.000038
+2014 12 28 57019 0.034671 0.277735 -0.4548710 0.0015214 -0.000244 0.000044 0.000044 0.000043 0.0000093 0.0000161 0.000045 0.000041
+2014 12 29 57020 0.034235 0.278643 -0.4563799 0.0014219 -0.000227 0.000054 0.000044 0.000043 0.0000097 0.0000163 0.000048 0.000044
+2014 12 30 57021 0.033509 0.279530 -0.4577134 0.0012444 -0.000210 0.000065 0.000045 0.000043 0.0000101 0.0000165 0.000051 0.000047
+2014 12 31 57022 0.032209 0.280349 -0.4589043 0.0010847 -0.000128 -0.000017 0.000045 0.000043 0.0000106 0.0000168 0.000054 0.000051
diff --git a/src/test/resources/orekit-data/eopc04_08_IAU2000.15 b/src/test/resources/orekit-data/eopc04_08_IAU2000.15
new file mode 100644
index 0000000000000000000000000000000000000000..e5a75e28bc18719cc4173b3a04766c36537e75ca
--- /dev/null
+++ b/src/test/resources/orekit-data/eopc04_08_IAU2000.15
@@ -0,0 +1,379 @@
+
+
+ INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE
+ EARTH ORIENTATION PARAMETERS
+ EOP (IERS) 08 C04
+
+
+ FORMAT(3(I4),I7,2(F11.6),2(F12.7),2(F11.6),2(F11.6),2(F11.7),2(F12.6))
+##################################################################################
+
+ Date MJD x y UT1-UTC LOD dX dY x Err y Err UT1-UTC Err LOD Err dX Err dY Err
+ " " s s " " " " s s " "
+ (0h UTC)
+
+2015 1 1 57023 0.030755 0.280757 -0.4599141 0.0009645 -0.000125 -0.000016 0.000045 0.000044 0.0000111 0.0000170 0.000056 0.000053
+2015 1 2 57024 0.029642 0.281240 -0.4608362 0.0008627 -0.000156 0.000025 0.000045 0.000044 0.0000116 0.0000172 0.000056 0.000054
+2015 1 3 57025 0.028927 0.281584 -0.4616231 0.0007614 -0.000188 0.000065 0.000045 0.000044 0.0000120 0.0000173 0.000056 0.000054
+2015 1 4 57026 0.028695 0.282072 -0.4623262 0.0006640 -0.000220 0.000105 0.000045 0.000044 0.0000125 0.0000174 0.000055 0.000054
+2015 1 5 57027 0.028436 0.282760 -0.4629914 0.0006480 -0.000251 0.000146 0.000045 0.000043 0.0000128 0.0000174 0.000054 0.000053
+2015 1 6 57028 0.027924 0.283523 -0.4636603 0.0006430 -0.000283 0.000187 0.000046 0.000043 0.0000129 0.0000173 0.000053 0.000052
+2015 1 7 57029 0.027100 0.284477 -0.4643221 0.0007019 -0.000221 0.000168 0.000046 0.000044 0.0000129 0.0000172 0.000052 0.000051
+2015 1 8 57030 0.025860 0.285475 -0.4651370 0.0008367 -0.000134 0.000133 0.000047 0.000044 0.0000126 0.0000170 0.000050 0.000049
+2015 1 9 57031 0.024611 0.286017 -0.4660225 0.0009932 -0.000047 0.000098 0.000047 0.000044 0.0000123 0.0000168 0.000047 0.000047
+2015 1 10 57032 0.023566 0.286671 -0.4670552 0.0010988 -0.000054 0.000086 0.000048 0.000044 0.0000117 0.0000166 0.000044 0.000044
+2015 1 11 57033 0.022566 0.287813 -0.4681949 0.0011100 -0.000096 0.000067 0.000048 0.000045 0.0000112 0.0000165 0.000040 0.000041
+2015 1 12 57034 0.021554 0.288794 -0.4693091 0.0011106 -0.000137 0.000043 0.000048 0.000045 0.0000105 0.0000164 0.000038 0.000038
+2015 1 13 57035 0.020380 0.289829 -0.4703965 0.0011209 -0.000179 0.000018 0.000049 0.000045 0.0000100 0.0000164 0.000035 0.000036
+2015 1 14 57036 0.018920 0.290885 -0.4715306 0.0011408 -0.000220 -0.000007 0.000049 0.000046 0.0000094 0.0000164 0.000034 0.000035
+2015 1 15 57037 0.017150 0.292166 -0.4726903 0.0011301 -0.000205 0.000045 0.000050 0.000046 0.0000089 0.0000165 0.000033 0.000034
+2015 1 16 57038 0.015039 0.293614 -0.4737918 0.0011265 -0.000181 0.000107 0.000050 0.000046 0.0000085 0.0000167 0.000032 0.000033
+2015 1 17 57039 0.012983 0.294524 -0.4749088 0.0010921 -0.000149 0.000196 0.000050 0.000046 0.0000082 0.0000169 0.000031 0.000033
+2015 1 18 57040 0.010821 0.295287 -0.4759788 0.0010651 -0.000090 0.000248 0.000049 0.000045 0.0000078 0.0000171 0.000030 0.000033
+2015 1 19 57041 0.009293 0.296094 -0.4770274 0.0010956 -0.000046 0.000195 0.000049 0.000045 0.0000076 0.0000174 0.000030 0.000032
+2015 1 20 57042 0.008155 0.296838 -0.4781485 0.0011727 -0.000039 0.000083 0.000049 0.000044 0.0000075 0.0000177 0.000029 0.000032
+2015 1 21 57043 0.007383 0.297599 -0.4793840 0.0013175 -0.000134 0.000018 0.000048 0.000044 0.0000075 0.0000179 0.000029 0.000032
+2015 1 22 57044 0.006883 0.298544 -0.4807969 0.0014700 -0.000174 -0.000010 0.000048 0.000044 0.0000076 0.0000181 0.000029 0.000032
+2015 1 23 57045 0.006172 0.299519 -0.4823340 0.0015558 -0.000199 -0.000028 0.000048 0.000044 0.0000078 0.0000182 0.000029 0.000032
+2015 1 24 57046 0.005110 0.300156 -0.4838699 0.0015515 -0.000221 -0.000030 0.000048 0.000044 0.0000082 0.0000182 0.000030 0.000033
+2015 1 25 57047 0.004055 0.301196 -0.4854420 0.0014779 -0.000209 -0.000005 0.000048 0.000044 0.0000086 0.0000183 0.000031 0.000033
+2015 1 26 57048 0.002890 0.302200 -0.4868056 0.0012969 -0.000202 0.000025 0.000048 0.000044 0.0000091 0.0000183 0.000031 0.000033
+2015 1 27 57049 0.002389 0.303074 -0.4880122 0.0011473 -0.000233 0.000040 0.000049 0.000044 0.0000095 0.0000183 0.000032 0.000034
+2015 1 28 57050 0.002280 0.304472 -0.4890704 0.0009855 -0.000210 0.000037 0.000051 0.000044 0.0000106 0.0000184 0.000032 0.000034
+2015 1 29 57051 0.002250 0.306164 -0.4899900 0.0008624 -0.000174 0.000030 0.000050 0.000045 0.0000101 0.0000185 0.000033 0.000034
+2015 1 30 57052 0.002907 0.308446 -0.4908338 0.0008432 -0.000138 0.000085 0.000052 0.000046 0.0000103 0.0000185 0.000033 0.000035
+2015 1 31 57053 0.003734 0.310824 -0.4916590 0.0008530 -0.000132 0.000120 0.000052 0.000046 0.0000106 0.0000184 0.000034 0.000036
+2015 2 1 57054 0.004581 0.313150 -0.4925413 0.0008838 -0.000138 0.000135 0.000052 0.000047 0.0000133 0.0000183 0.000035 0.000037
+2015 2 2 57055 0.004619 0.315536 -0.4934671 0.0009429 -0.000154 0.000097 0.000052 0.000046 0.0000124 0.0000181 0.000035 0.000038
+2015 2 3 57056 0.004217 0.317774 -0.4944232 0.0010524 -0.000170 0.000059 0.000053 0.000046 0.0000116 0.0000180 0.000036 0.000039
+2015 2 4 57057 0.003887 0.319757 -0.4955055 0.0011210 -0.000007 0.000052 0.000056 0.000035 0.0000100 0.0000205 0.000041 0.000049
+2015 2 5 57058 0.003175 0.321289 -0.4966561 0.0011723 0.000077 0.000074 0.000056 0.000031 0.0000095 0.0000205 0.000041 0.000046
+2015 2 6 57059 0.002657 0.322728 -0.4978629 0.0012449 -0.000004 0.000186 0.000054 0.000028 0.0000087 0.0000204 0.000035 0.000039
+2015 2 7 57060 0.002130 0.324406 -0.4991369 0.0013319 -0.000061 0.000223 0.000053 0.000027 0.0000084 0.0000204 0.000035 0.000038
+2015 2 8 57061 0.001897 0.325726 -0.5004974 0.0013735 -0.000078 0.000223 0.000053 0.000027 0.0000081 0.0000204 0.000034 0.000037
+2015 2 9 57062 0.002028 0.327098 -0.5018688 0.0013196 -0.000094 0.000223 0.000052 0.000027 0.0000079 0.0000204 0.000034 0.000036
+2015 2 10 57063 0.002165 0.328334 -0.5031555 0.0012434 -0.000125 0.000291 0.000048 0.000023 0.0000070 0.0000204 0.000033 0.000034
+2015 2 11 57064 0.002226 0.329746 -0.5043648 0.0011767 -0.000071 -0.000024 0.000048 0.000025 0.0000070 0.0000203 0.000033 0.000034
+2015 2 12 57065 0.002247 0.331130 -0.5055317 0.0011622 0.000000 -0.000007 0.000047 0.000045 0.0000067 0.0000201 0.000037 0.000038
+2015 2 13 57066 0.002452 0.332428 -0.5067078 0.0011679 -0.000034 0.000085 0.000046 0.000044 0.0000068 0.0000200 0.000036 0.000036
+2015 2 14 57067 0.002709 0.333441 -0.5078993 0.0011703 -0.000030 0.000078 0.000045 0.000043 0.0000068 0.0000199 0.000034 0.000035
+2015 2 15 57068 0.002772 0.334600 -0.5090558 0.0011846 0.000007 0.000054 0.000045 0.000042 0.0000068 0.0000198 0.000033 0.000034
+2015 2 16 57069 0.002853 0.335660 -0.5102609 0.0012601 0.000044 0.000030 0.000044 0.000041 0.0000068 0.0000198 0.000031 0.000032
+2015 2 17 57070 0.002883 0.337244 -0.5115772 0.0013998 0.000176 -0.000012 0.000042 0.000038 0.0000065 0.0000193 0.000029 0.000030
+2015 2 18 57071 0.002725 0.338391 -0.5130691 0.0015847 -0.000180 0.000039 0.000042 0.000038 0.0000067 0.0000196 0.000028 0.000029
+2015 2 19 57072 0.002801 0.339634 -0.5147528 0.0017207 -0.000192 0.000092 0.000042 0.000037 0.0000068 0.0000205 0.000025 0.000025
+2015 2 20 57073 0.002588 0.341044 -0.5165086 0.0017656 -0.000094 0.000148 0.000042 0.000037 0.0000071 0.0000207 0.000025 0.000025
+2015 2 21 57074 0.002360 0.342683 -0.5182696 0.0017118 -0.000061 0.000158 0.000042 0.000037 0.0000075 0.0000209 0.000025 0.000025
+2015 2 22 57075 0.002437 0.344446 -0.5199491 0.0016270 -0.000054 0.000150 0.000042 0.000038 0.0000079 0.0000211 0.000026 0.000025
+2015 2 23 57076 0.003045 0.346352 -0.5215083 0.0014717 -0.000046 0.000142 0.000042 0.000038 0.0000084 0.0000214 0.000027 0.000026
+2015 2 24 57077 0.003329 0.348503 -0.5228845 0.0012605 -0.000044 0.000117 0.000042 0.000038 0.0000107 0.0000224 0.000035 0.000030
+2015 2 25 57078 0.003149 0.350319 -0.5240254 0.0010829 -0.000011 0.000186 0.000041 0.000038 0.0000106 0.0000224 0.000035 0.000030
+2015 2 26 57079 0.003145 0.351727 -0.5250580 0.0009507 0.000081 0.000391 0.000040 0.000038 0.0000109 0.0000226 0.000035 0.000031
+2015 2 27 57080 0.003314 0.353155 -0.5259543 0.0008523 0.000067 0.000353 0.000040 0.000038 0.0000106 0.0000226 0.000034 0.000031
+2015 2 28 57081 0.003178 0.354806 -0.5268047 0.0008553 0.000053 0.000316 0.000040 0.000038 0.0000103 0.0000227 0.000033 0.000031
+2015 3 1 57082 0.003156 0.356584 -0.5276825 0.0009042 0.000039 0.000279 0.000040 0.000038 0.0000101 0.0000227 0.000033 0.000030
+2015 3 2 57083 0.003458 0.358634 -0.5286064 0.0009424 0.000025 0.000242 0.000040 0.000038 0.0000098 0.0000227 0.000032 0.000030
+2015 3 3 57084 0.003877 0.360608 -0.5295677 0.0010061 -0.000058 0.000194 0.000041 0.000038 0.0000090 0.0000226 0.000030 0.000029
+2015 3 4 57085 0.003917 0.362237 -0.5306013 0.0010955 -0.000015 0.000166 0.000041 0.000038 0.0000090 0.0000224 0.000031 0.000030
+2015 3 5 57086 0.004230 0.363714 -0.5317110 0.0011306 0.000027 0.000138 0.000041 0.000038 0.0000090 0.0000218 0.000032 0.000031
+2015 3 6 57087 0.004793 0.364942 -0.5328663 0.0011797 0.000070 0.000110 0.000041 0.000038 0.0000089 0.0000217 0.000033 0.000031
+2015 3 7 57088 0.004982 0.366149 -0.5340979 0.0012441 0.000075 0.000102 0.000041 0.000038 0.0000087 0.0000216 0.000034 0.000032
+2015 3 8 57089 0.004646 0.367314 -0.5353578 0.0012801 0.000066 0.000103 0.000042 0.000038 0.0000085 0.0000216 0.000035 0.000033
+2015 3 9 57090 0.004016 0.368176 -0.5366638 0.0013469 0.000057 0.000103 0.000042 0.000038 0.0000084 0.0000215 0.000036 0.000034
+2015 3 10 57091 0.003635 0.369248 -0.5380376 0.0013832 0.000015 0.000115 0.000042 0.000038 0.0000079 0.0000214 0.000037 0.000035
+2015 3 11 57092 0.003397 0.370481 -0.5394256 0.0013935 0.000150 0.000065 0.000042 0.000038 0.0000079 0.0000215 0.000038 0.000035
+2015 3 12 57093 0.003195 0.371597 -0.5408538 0.0014178 0.000123 0.000077 0.000042 0.000038 0.0000084 0.0000220 0.000040 0.000038
+2015 3 13 57094 0.002938 0.372683 -0.5422712 0.0013999 0.000011 0.000119 0.000042 0.000038 0.0000083 0.0000220 0.000039 0.000037
+2015 3 14 57095 0.002704 0.373620 -0.5436702 0.0014642 -0.000046 0.000150 0.000042 0.000037 0.0000082 0.0000221 0.000038 0.000036
+2015 3 15 57096 0.002816 0.374562 -0.5452153 0.0015602 0.000024 0.000110 0.000042 0.000037 0.0000080 0.0000223 0.000037 0.000034
+2015 3 16 57097 0.002752 0.375498 -0.5468044 0.0016734 0.000126 0.000115 0.000042 0.000037 0.0000078 0.0000224 0.000035 0.000033
+2015 3 17 57098 0.002856 0.376461 -0.5485375 0.0018229 0.000170 0.000275 0.000043 0.000037 0.0000073 0.0000233 0.000026 0.000024
+2015 3 18 57099 0.002796 0.377477 -0.5504344 0.0020042 0.000121 0.000217 0.000043 0.000037 0.0000072 0.0000235 0.000026 0.000024
+2015 3 19 57100 0.003449 0.378369 -0.5525460 0.0021746 0.000128 -0.000224 0.000044 0.000037 0.0000065 0.0000238 0.000026 0.000024
+2015 3 20 57101 0.004608 0.379521 -0.5547638 0.0022520 0.000035 0.000018 0.000044 0.000037 0.0000066 0.0000238 0.000026 0.000025
+2015 3 21 57102 0.006233 0.381247 -0.5570251 0.0022586 -0.000059 0.000261 0.000044 0.000037 0.0000069 0.0000238 0.000027 0.000025
+2015 3 22 57103 0.007578 0.383336 -0.5593699 0.0021234 -0.000174 0.000482 0.000044 0.000037 0.0000071 0.0000238 0.000028 0.000026
+2015 3 23 57104 0.008506 0.385223 -0.5614147 0.0019474 -0.000154 0.000510 0.000044 0.000037 0.0000073 0.0000238 0.000028 0.000026
+2015 3 24 57105 0.009349 0.387119 -0.5632128 0.0018110 0.000064 0.000332 0.000042 0.000036 0.0000081 0.0000235 0.000027 0.000025
+2015 3 25 57106 0.010087 0.388563 -0.5649964 0.0016983 0.000089 0.000316 0.000042 0.000036 0.0000081 0.0000236 0.000027 0.000026
+2015 3 26 57107 0.010619 0.389763 -0.5666450 0.0015475 0.000130 0.000304 0.000042 0.000036 0.0000082 0.0000235 0.000029 0.000028
+2015 3 27 57108 0.010896 0.390956 -0.5681220 0.0014342 0.000094 0.000266 0.000042 0.000036 0.0000080 0.0000235 0.000031 0.000029
+2015 3 28 57109 0.011090 0.392089 -0.5695382 0.0013906 0.000077 0.000209 0.000042 0.000036 0.0000078 0.0000235 0.000032 0.000030
+2015 3 29 57110 0.011489 0.393192 -0.5709432 0.0013824 0.000101 0.000151 0.000043 0.000036 0.0000076 0.0000234 0.000033 0.000032
+2015 3 30 57111 0.012075 0.394088 -0.5723235 0.0013803 0.000114 0.000129 0.000043 0.000037 0.0000075 0.0000233 0.000035 0.000033
+2015 3 31 57112 0.012636 0.395246 -0.5736668 0.0013763 0.000114 0.000171 0.000044 0.000038 0.0000070 0.0000226 0.000046 0.000040
+2015 4 1 57113 0.013766 0.396398 -0.5750804 0.0013722 -0.000050 0.000050 0.000044 0.000038 0.0000072 0.0000225 0.000046 0.000041
+2015 4 2 57114 0.015717 0.397860 -0.5764163 0.0013572 -0.000006 0.000131 0.000044 0.000038 0.0000091 0.0000218 0.000060 0.000062
+2015 4 3 57115 0.017547 0.399721 -0.5777256 0.0013064 0.000057 0.000180 0.000044 0.000038 0.0000091 0.0000219 0.000056 0.000057
+2015 4 4 57116 0.018546 0.401646 -0.5789910 0.0012401 0.000094 0.000177 0.000044 0.000038 0.0000092 0.0000219 0.000052 0.000053
+2015 4 5 57117 0.019139 0.403443 -0.5801961 0.0011980 0.000131 0.000174 0.000044 0.000038 0.0000093 0.0000219 0.000048 0.000049
+2015 4 6 57118 0.019595 0.404834 -0.5813837 0.0012086 0.000168 0.000171 0.000044 0.000038 0.0000095 0.0000219 0.000046 0.000045
+2015 4 7 57119 0.020228 0.406046 -0.5825963 0.0012583 0.000173 0.000083 0.000043 0.000038 0.0000109 0.0000217 0.000042 0.000041
+2015 4 8 57120 0.020919 0.407009 -0.5838611 0.0012656 0.000236 0.000150 0.000043 0.000038 0.0000104 0.0000215 0.000041 0.000040
+2015 4 9 57121 0.021450 0.407845 -0.5851137 0.0012596 0.000299 0.000216 0.000043 0.000038 0.0000107 0.0000214 0.000041 0.000040
+2015 4 10 57122 0.021563 0.409266 -0.5863913 0.0013083 0.000245 0.000225 0.000042 0.000038 0.0000105 0.0000213 0.000041 0.000039
+2015 4 11 57123 0.021218 0.410692 -0.5877493 0.0014261 0.000187 0.000138 0.000042 0.000038 0.0000103 0.0000211 0.000040 0.000038
+2015 4 12 57124 0.021040 0.411653 -0.5892619 0.0015758 0.000213 0.000052 0.000042 0.000038 0.0000102 0.0000210 0.000039 0.000037
+2015 4 13 57125 0.021201 0.412396 -0.5908944 0.0017187 0.000255 0.000045 0.000042 0.000038 0.0000100 0.0000208 0.000038 0.000036
+2015 4 14 57126 0.021522 0.413139 -0.5926785 0.0018398 0.000249 0.000098 0.000041 0.000037 0.0000096 0.0000199 0.000032 0.000031
+2015 4 15 57127 0.021899 0.414276 -0.5945657 0.0019457 0.000195 0.000088 0.000042 0.000037 0.0000095 0.0000199 0.000033 0.000032
+2015 4 16 57128 0.023284 0.415201 -0.5965793 0.0020217 -0.000058 0.000109 0.000042 0.000037 0.0000090 0.0000200 0.000035 0.000034
+2015 4 17 57129 0.024243 0.417058 -0.5985686 0.0019442 0.000041 0.000076 0.000042 0.000037 0.0000087 0.0000202 0.000035 0.000033
+2015 4 18 57130 0.025253 0.417782 -0.6004342 0.0018111 0.000140 0.000042 0.000042 0.000037 0.0000085 0.0000203 0.000035 0.000033
+2015 4 19 57131 0.026229 0.419020 -0.6022001 0.0016388 0.000168 0.000109 0.000042 0.000037 0.0000083 0.0000203 0.000035 0.000032
+2015 4 20 57132 0.027106 0.419586 -0.6037230 0.0014194 0.000165 0.000209 0.000042 0.000037 0.0000081 0.0000204 0.000035 0.000032
+2015 4 21 57133 0.028116 0.420975 -0.6050414 0.0012042 0.000219 0.000249 0.000043 0.000037 0.0000075 0.0000204 0.000033 0.000029
+2015 4 22 57134 0.028885 0.421699 -0.6061599 0.0010441 0.000198 0.000255 0.000043 0.000037 0.0000077 0.0000203 0.000034 0.000030
+2015 4 23 57135 0.030130 0.422473 -0.6071956 0.0010030 0.000167 0.000274 0.000044 0.000037 0.0000077 0.0000196 0.000040 0.000041
+2015 4 24 57136 0.031197 0.423879 -0.6082112 0.0010141 0.000191 0.000232 0.000044 0.000037 0.0000080 0.0000197 0.000041 0.000041
+2015 4 25 57137 0.032065 0.425071 -0.6092471 0.0011076 0.000276 0.000170 0.000044 0.000037 0.0000083 0.0000198 0.000041 0.000042
+2015 4 26 57138 0.033522 0.426193 -0.6104411 0.0012078 0.000331 0.000199 0.000043 0.000038 0.0000086 0.0000199 0.000041 0.000042
+2015 4 27 57139 0.035361 0.427735 -0.6116804 0.0012836 0.000334 0.000213 0.000043 0.000038 0.0000088 0.0000200 0.000042 0.000043
+2015 4 28 57140 0.036905 0.429331 -0.6129723 0.0013305 0.000345 0.000083 0.000043 0.000038 0.0000094 0.0000208 0.000038 0.000044
+2015 4 29 57141 0.038196 0.430522 -0.6143816 0.0013832 0.000300 0.000087 0.000043 0.000038 0.0000093 0.0000207 0.000039 0.000045
+2015 4 30 57142 0.038947 0.431573 -0.6157310 0.0014129 0.000271 0.000090 0.000043 0.000038 0.0000092 0.0000205 0.000041 0.000047
+2015 5 1 57143 0.039877 0.432280 -0.6171725 0.0013898 0.000167 0.000097 0.000043 0.000038 0.0000092 0.0000204 0.000042 0.000047
+2015 5 2 57144 0.040070 0.433256 -0.6185209 0.0013359 0.000156 0.000102 0.000044 0.000038 0.0000093 0.0000202 0.000044 0.000046
+2015 5 3 57145 0.040241 0.434073 -0.6197888 0.0012406 0.000182 0.000107 0.000044 0.000038 0.0000095 0.0000200 0.000046 0.000046
+2015 5 4 57146 0.040722 0.435565 -0.6209736 0.0011594 0.000208 0.000112 0.000044 0.000038 0.0000097 0.0000199 0.000048 0.000046
+2015 5 5 57147 0.041654 0.436909 -0.6220730 0.0010783 0.000306 0.000080 0.000045 0.000039 0.0000121 0.0000196 0.000053 0.000045
+2015 5 6 57148 0.042183 0.438365 -0.6230821 0.0010132 0.000004 0.000253 0.000045 0.000039 0.0000117 0.0000197 0.000052 0.000045
+2015 5 7 57149 0.043472 0.439555 -0.6241298 0.0010293 -0.000064 0.000289 0.000046 0.000039 0.0000112 0.0000203 0.000055 0.000049
+2015 5 8 57150 0.045056 0.440905 -0.6251640 0.0010796 0.000127 0.000159 0.000045 0.000039 0.0000105 0.0000204 0.000052 0.000047
+2015 5 9 57151 0.047151 0.442141 -0.6262781 0.0011878 0.000382 0.000024 0.000045 0.000039 0.0000100 0.0000204 0.000050 0.000045
+2015 5 10 57152 0.049052 0.443714 -0.6275273 0.0013324 0.000560 -0.000037 0.000044 0.000039 0.0000095 0.0000205 0.000048 0.000044
+2015 5 11 57153 0.050599 0.444604 -0.6289352 0.0015274 0.000514 -0.000013 0.000044 0.000039 0.0000093 0.0000205 0.000046 0.000043
+2015 5 12 57154 0.052199 0.445078 -0.6305801 0.0017196 0.000155 0.000086 0.000043 0.000039 0.0000079 0.0000204 0.000038 0.000036
+2015 5 13 57155 0.053819 0.445646 -0.6324967 0.0018313 0.000615 -0.000084 0.000043 0.000040 0.0000103 0.0000202 0.000039 0.000038
+2015 5 14 57156 0.055439 0.445986 -0.6343671 0.0018857 0.000449 -0.000190 0.000043 0.000039 0.0000106 0.0000202 0.000051 0.000057
+2015 5 15 57157 0.057287 0.446867 -0.6361734 0.0019085 0.000191 0.000020 0.000043 0.000038 0.0000104 0.0000202 0.000052 0.000056
+2015 5 16 57158 0.059007 0.447108 -0.6379890 0.0017892 0.000143 0.000161 0.000042 0.000038 0.0000103 0.0000201 0.000052 0.000057
+2015 5 17 57159 0.061406 0.447172 -0.6397554 0.0016413 0.000203 0.000220 0.000041 0.000038 0.0000102 0.0000200 0.000053 0.000057
+2015 5 18 57160 0.063855 0.448161 -0.6413301 0.0014941 0.000270 0.000245 0.000040 0.000038 0.0000101 0.0000199 0.000053 0.000057
+2015 5 19 57161 0.065734 0.448961 -0.6427435 0.0013674 0.000211 0.000324 0.000038 0.000037 0.0000100 0.0000195 0.000051 0.000056
+2015 5 20 57162 0.067900 0.449237 -0.6440744 0.0012655 0.000536 0.000184 0.000038 0.000037 0.0000097 0.0000193 0.000050 0.000055
+2015 5 21 57163 0.070097 0.449461 -0.6453102 0.0011717 0.000601 0.000123 0.000037 0.000036 0.0000095 0.0000189 0.000052 0.000057
+2015 5 22 57164 0.071713 0.449507 -0.6464266 0.0011047 0.000300 0.000090 0.000038 0.000036 0.0000091 0.0000189 0.000048 0.000051
+2015 5 23 57165 0.074017 0.449700 -0.6475041 0.0010966 0.000226 0.000100 0.000038 0.000036 0.0000088 0.0000188 0.000043 0.000045
+2015 5 24 57166 0.075727 0.450800 -0.6485716 0.0010386 0.000244 0.000089 0.000038 0.000036 0.0000085 0.0000187 0.000039 0.000040
+2015 5 25 57167 0.077445 0.451147 -0.6496066 0.0010336 0.000262 0.000079 0.000038 0.000036 0.0000083 0.0000187 0.000036 0.000036
+2015 5 26 57168 0.079256 0.452140 -0.6506225 0.0010316 0.000384 0.000084 0.000038 0.000035 0.0000077 0.0000185 0.000028 0.000027
+2015 5 27 57169 0.080949 0.452585 -0.6516333 0.0010263 0.000316 0.000062 0.000038 0.000035 0.0000078 0.0000185 0.000028 0.000028
+2015 5 28 57170 0.083136 0.453243 -0.6526491 0.0010319 0.000249 0.000039 0.000037 0.000036 0.0000081 0.0000186 0.000027 0.000028
+2015 5 29 57171 0.085112 0.453899 -0.6536723 0.0009912 0.000181 0.000016 0.000037 0.000036 0.0000081 0.0000185 0.000027 0.000028
+2015 5 30 57172 0.087285 0.454620 -0.6545886 0.0009021 0.000153 0.000003 0.000038 0.000035 0.0000082 0.0000184 0.000026 0.000027
+2015 5 31 57173 0.089059 0.455446 -0.6554638 0.0008105 0.000140 -0.000006 0.000038 0.000035 0.0000082 0.0000182 0.000025 0.000027
+2015 6 1 57174 0.091088 0.455998 -0.6562421 0.0007287 0.000146 0.000026 0.000038 0.000035 0.0000083 0.0000181 0.000024 0.000026
+2015 6 2 57175 0.092430 0.456456 -0.6569172 0.0006741 0.000169 0.000152 0.000039 0.000035 0.0000081 0.0000175 0.000022 0.000025
+2015 6 3 57176 0.093323 0.456862 -0.6575507 0.0006395 0.000209 0.000015 0.000039 0.000035 0.0000083 0.0000175 0.000022 0.000025
+2015 6 4 57177 0.093747 0.457107 -0.6582050 0.0006284 0.000230 -0.000065 0.000039 0.000036 0.0000093 0.0000175 0.000023 0.000027
+2015 6 5 57178 0.094883 0.456873 -0.6588283 0.0006761 0.000210 -0.000009 0.000039 0.000036 0.0000094 0.0000177 0.000023 0.000027
+2015 6 6 57179 0.096134 0.456825 -0.6595690 0.0008052 0.000239 -0.000012 0.000039 0.000036 0.0000094 0.0000178 0.000023 0.000027
+2015 6 7 57180 0.096680 0.456719 -0.6604199 0.0009158 0.000107 0.000044 0.000039 0.000037 0.0000095 0.0000180 0.000023 0.000027
+2015 6 8 57181 0.097075 0.456092 -0.6613820 0.0010382 0.000094 0.000050 0.000039 0.000037 0.0000095 0.0000181 0.000023 0.000027
+2015 6 9 57182 0.098098 0.455588 -0.6624561 0.0010812 0.000224 -0.000023 0.000040 0.000037 0.0000097 0.0000186 0.000024 0.000027
+2015 6 10 57183 0.099062 0.455347 -0.6635237 0.0010403 0.000241 -0.000017 0.000041 0.000037 0.0000097 0.0000186 0.000025 0.000028
+2015 6 11 57184 0.100456 0.455207 -0.6645557 0.0010037 0.000259 -0.000011 0.000041 0.000037 0.0000094 0.0000186 0.000025 0.000029
+2015 6 12 57185 0.102301 0.455181 -0.6655031 0.0009073 0.000222 -0.000049 0.000042 0.000037 0.0000100 0.0000186 0.000029 0.000034
+2015 6 13 57186 0.104680 0.454920 -0.6663246 0.0007428 0.000139 -0.000088 0.000042 0.000037 0.0000100 0.0000185 0.000029 0.000034
+2015 6 14 57187 0.107222 0.454684 -0.6669959 0.0005541 0.000087 -0.000176 0.000042 0.000037 0.0000099 0.0000184 0.000029 0.000035
+2015 6 15 57188 0.109964 0.454471 -0.6674240 0.0003906 0.000129 -0.000144 0.000042 0.000037 0.0000098 0.0000184 0.000030 0.000035
+2015 6 16 57189 0.112548 0.454084 -0.6677546 0.0002888 0.000225 0.000013 0.000042 0.000037 0.0000096 0.0000181 0.000032 0.000037
+2015 6 17 57190 0.115103 0.453606 -0.6679877 0.0001938 0.000247 -0.000037 0.000042 0.000037 0.0000094 0.0000181 0.000030 0.000035
+2015 6 18 57191 0.116994 0.453414 -0.6681856 0.0002150 0.000255 -0.000051 0.000040 0.000036 0.0000091 0.0000182 0.000027 0.000031
+2015 6 19 57192 0.119140 0.453235 -0.6684361 0.0003132 0.000237 -0.000006 0.000040 0.000036 0.0000090 0.0000182 0.000026 0.000031
+2015 6 20 57193 0.121325 0.452998 -0.6688166 0.0004130 0.000262 0.000016 0.000040 0.000036 0.0000088 0.0000183 0.000025 0.000030
+2015 6 21 57194 0.123086 0.452951 -0.6693000 0.0005197 0.000253 -0.000006 0.000040 0.000036 0.0000087 0.0000184 0.000025 0.000029
+2015 6 22 57195 0.125050 0.452964 -0.6698955 0.0006034 0.000227 -0.000018 0.000039 0.000036 0.0000086 0.0000185 0.000025 0.000029
+2015 6 23 57196 0.127121 0.452299 -0.6705445 0.0006970 0.000206 0.000044 0.000038 0.000036 0.0000082 0.0000189 0.000030 0.000038
+2015 6 24 57197 0.129210 0.452009 -0.6713241 0.0007962 0.000151 0.000138 0.000039 0.000036 0.0000082 0.0000189 0.000031 0.000038
+2015 6 25 57198 0.131403 0.451511 -0.6721426 0.0008084 0.000123 0.000025 0.000041 0.000037 0.0000086 0.0000208 0.000033 0.000041
+2015 6 26 57199 0.134091 0.451186 -0.6729611 0.0008103 0.000157 -0.000034 0.000041 0.000037 0.0000081 0.0000208 0.000032 0.000040
+2015 6 27 57200 0.136187 0.450799 -0.6738051 0.0008242 0.000162 -0.000085 0.000041 0.000036 0.0000076 0.0000208 0.000031 0.000039
+2015 6 28 57201 0.137914 0.450451 -0.6746394 0.0007877 0.000150 -0.000150 0.000041 0.000036 0.0000072 0.0000209 0.000029 0.000037
+2015 6 29 57202 0.139464 0.449684 -0.6753678 0.0006927 0.000161 -0.000167 0.000041 0.000036 0.0000068 0.0000210 0.000028 0.000035
+2015 6 30 57203 0.140846 0.448889 -0.6760310 0.0006004 0.000196 -0.000135 0.000041 0.000036 0.0000065 0.0000211 0.000027 0.000034
+2015 7 1 57204 0.142153 0.448180 0.3233763 0.0005848 0.000191 -0.000141 0.000042 0.000036 0.0000063 0.0000212 0.000026 0.000032
+2015 7 2 57205 0.143584 0.447342 0.3227706 0.0006338 0.000176 -0.000156 0.000042 0.000036 0.0000061 0.0000213 0.000025 0.000030
+2015 7 3 57206 0.145011 0.446661 0.3220640 0.0007407 0.000166 -0.000154 0.000042 0.000036 0.0000060 0.0000214 0.000024 0.000028
+2015 7 4 57207 0.146541 0.445610 0.3212606 0.0009149 0.000156 -0.000153 0.000042 0.000036 0.0000059 0.0000215 0.000023 0.000027
+2015 7 5 57208 0.148574 0.444629 0.3202377 0.0011166 0.000145 -0.000151 0.000042 0.000036 0.0000058 0.0000215 0.000022 0.000025
+2015 7 6 57209 0.150893 0.444037 0.3190503 0.0012359 0.000135 -0.000149 0.000042 0.000036 0.0000058 0.0000214 0.000021 0.000024
+2015 7 7 57210 0.152846 0.443796 0.3177631 0.0013056 0.000125 -0.000147 0.000042 0.000037 0.0000058 0.0000213 0.000020 0.000023
+2015 7 8 57211 0.154887 0.443772 0.3164339 0.0013492 0.000131 -0.000152 0.000041 0.000037 0.0000058 0.0000211 0.000020 0.000022
+2015 7 9 57212 0.156784 0.443514 0.3151117 0.0012925 0.000143 -0.000159 0.000041 0.000037 0.0000058 0.0000210 0.000020 0.000022
+2015 7 10 57213 0.158557 0.442832 0.3138450 0.0011777 0.000154 -0.000165 0.000041 0.000037 0.0000059 0.0000210 0.000020 0.000022
+2015 7 11 57214 0.160529 0.441792 0.3127485 0.0010255 0.000144 -0.000155 0.000041 0.000037 0.0000059 0.0000210 0.000020 0.000023
+2015 7 12 57215 0.162971 0.440565 0.3117937 0.0008403 0.000126 -0.000138 0.000041 0.000037 0.0000060 0.0000210 0.000020 0.000023
+2015 7 13 57216 0.165680 0.439427 0.3111093 0.0006380 0.000108 -0.000121 0.000042 0.000037 0.0000061 0.0000211 0.000021 0.000024
+2015 7 14 57217 0.168251 0.438486 0.3105489 0.0004952 0.000091 -0.000104 0.000042 0.000037 0.0000061 0.0000212 0.000021 0.000024
+2015 7 15 57218 0.170435 0.437564 0.3101281 0.0004296 0.000178 -0.000166 0.000042 0.000037 0.0000061 0.0000213 0.000021 0.000024
+2015 7 16 57219 0.172211 0.436343 0.3097057 0.0004346 0.000172 -0.000108 0.000042 0.000037 0.0000060 0.0000215 0.000022 0.000025
+2015 7 17 57220 0.173804 0.434920 0.3092340 0.0004502 0.000172 -0.000073 0.000043 0.000037 0.0000060 0.0000216 0.000022 0.000025
+2015 7 18 57221 0.175731 0.433873 0.3088155 0.0004804 0.000178 -0.000102 0.000043 0.000037 0.0000059 0.0000217 0.000022 0.000025
+2015 7 19 57222 0.177407 0.432895 0.3083276 0.0004764 0.000180 -0.000147 0.000043 0.000037 0.0000058 0.0000218 0.000022 0.000025
+2015 7 20 57223 0.178885 0.432062 0.3078486 0.0004891 0.000183 -0.000192 0.000043 0.000037 0.0000057 0.0000218 0.000023 0.000025
+2015 7 21 57224 0.180124 0.431351 0.3073369 0.0005093 0.000185 -0.000237 0.000043 0.000037 0.0000057 0.0000218 0.000023 0.000026
+2015 7 22 57225 0.181079 0.430400 0.3068048 0.0005285 0.000140 -0.000222 0.000043 0.000037 0.0000056 0.0000219 0.000023 0.000026
+2015 7 23 57226 0.182033 0.429559 0.3062745 0.0005103 0.000082 -0.000191 0.000043 0.000037 0.0000056 0.0000219 0.000024 0.000026
+2015 7 24 57227 0.183025 0.428787 0.3058020 0.0004788 0.000025 -0.000160 0.000043 0.000037 0.0000056 0.0000219 0.000024 0.000027
+2015 7 25 57228 0.184491 0.427885 0.3052924 0.0004843 0.000047 -0.000156 0.000043 0.000037 0.0000057 0.0000220 0.000024 0.000027
+2015 7 26 57229 0.185865 0.426819 0.3048751 0.0004413 0.000098 -0.000162 0.000043 0.000037 0.0000057 0.0000220 0.000024 0.000027
+2015 7 27 57230 0.187283 0.425437 0.3044798 0.0003946 0.000149 -0.000168 0.000043 0.000037 0.0000058 0.0000220 0.000024 0.000027
+2015 7 28 57231 0.189234 0.424094 0.3040866 0.0003796 0.000200 -0.000174 0.000043 0.000037 0.0000059 0.0000219 0.000024 0.000027
+2015 7 29 57232 0.191151 0.422995 0.3037075 0.0004191 0.000168 -0.000190 0.000043 0.000037 0.0000060 0.0000219 0.000025 0.000027
+2015 7 30 57233 0.192957 0.421592 0.3032492 0.0005362 0.000114 -0.000208 0.000043 0.000037 0.0000061 0.0000220 0.000025 0.000028
+2015 7 31 57234 0.194609 0.420207 0.3026492 0.0006933 0.000060 -0.000225 0.000043 0.000037 0.0000061 0.0000221 0.000025 0.000028
+2015 8 1 57235 0.196310 0.418685 0.3018496 0.0008829 -0.000030 -0.000244 0.000043 0.000037 0.0000062 0.0000222 0.000025 0.000028
+2015 8 2 57236 0.198114 0.417357 0.3008662 0.0010790 -0.000135 -0.000264 0.000043 0.000037 0.0000063 0.0000224 0.000025 0.000028
+2015 8 3 57237 0.200104 0.415856 0.2996988 0.0011972 -0.000239 -0.000283 0.000043 0.000037 0.0000063 0.0000227 0.000024 0.000028
+2015 8 4 57238 0.202192 0.414622 0.2984794 0.0012597 -0.000343 -0.000302 0.000043 0.000037 0.0000063 0.0000230 0.000024 0.000027
+2015 8 5 57239 0.204592 0.413481 0.2972208 0.0012302 0.000011 -0.000221 0.000043 0.000037 0.0000063 0.0000232 0.000023 0.000026
+2015 8 6 57240 0.206930 0.412294 0.2960044 0.0011240 0.000051 -0.000188 0.000043 0.000037 0.0000062 0.0000235 0.000023 0.000025
+2015 8 7 57241 0.208764 0.411131 0.2949969 0.0009639 0.000010 -0.000168 0.000043 0.000037 0.0000062 0.0000236 0.000022 0.000024
+2015 8 8 57242 0.210035 0.410097 0.2941193 0.0008248 0.000006 -0.000164 0.000043 0.000037 0.0000062 0.0000237 0.000021 0.000023
+2015 8 9 57243 0.210643 0.408559 0.2933426 0.0007052 0.000016 -0.000166 0.000043 0.000037 0.0000062 0.0000237 0.000021 0.000022
+2015 8 10 57244 0.211293 0.406640 0.2926987 0.0006085 0.000025 -0.000167 0.000043 0.000037 0.0000061 0.0000237 0.000020 0.000021
+2015 8 11 57245 0.212082 0.404949 0.2921211 0.0005560 0.000035 -0.000169 0.000043 0.000037 0.0000061 0.0000235 0.000019 0.000020
+2015 8 12 57246 0.212760 0.403372 0.2915351 0.0005881 0.000045 -0.000170 0.000043 0.000037 0.0000060 0.0000234 0.000019 0.000019
+2015 8 13 57247 0.213726 0.401430 0.2909029 0.0006613 0.000070 -0.000175 0.000043 0.000037 0.0000058 0.0000231 0.000018 0.000018
+2015 8 14 57248 0.215333 0.399594 0.2901809 0.0007464 0.000099 -0.000180 0.000043 0.000036 0.0000057 0.0000229 0.000017 0.000018
+2015 8 15 57249 0.217063 0.398003 0.2894219 0.0007832 0.000106 -0.000174 0.000043 0.000036 0.0000056 0.0000227 0.000017 0.000017
+2015 8 16 57250 0.218471 0.396822 0.2885983 0.0008078 0.000104 -0.000164 0.000043 0.000036 0.0000056 0.0000224 0.000017 0.000017
+2015 8 17 57251 0.219489 0.395483 0.2877663 0.0008399 0.000103 -0.000154 0.000043 0.000036 0.0000055 0.0000222 0.000016 0.000017
+2015 8 18 57252 0.219943 0.394037 0.2869271 0.0008128 0.000101 -0.000144 0.000043 0.000036 0.0000054 0.0000220 0.000016 0.000017
+2015 8 19 57253 0.219466 0.392366 0.2861320 0.0007991 0.000094 -0.000166 0.000043 0.000036 0.0000053 0.0000219 0.000017 0.000017
+2015 8 20 57254 0.219453 0.390450 0.2853066 0.0008118 0.000085 -0.000198 0.000043 0.000036 0.0000053 0.0000219 0.000017 0.000018
+2015 8 21 57255 0.220036 0.388501 0.2844737 0.0008338 0.000076 -0.000229 0.000043 0.000036 0.0000052 0.0000220 0.000018 0.000018
+2015 8 22 57256 0.221255 0.386449 0.2836427 0.0008077 0.000071 -0.000213 0.000043 0.000036 0.0000051 0.0000222 0.000019 0.000019
+2015 8 23 57257 0.222255 0.384660 0.2828631 0.0007619 0.000068 -0.000179 0.000043 0.000037 0.0000050 0.0000225 0.000020 0.000020
+2015 8 24 57258 0.223086 0.382834 0.2821139 0.0007837 0.000065 -0.000145 0.000042 0.000037 0.0000049 0.0000228 0.000021 0.000021
+2015 8 25 57259 0.224080 0.381115 0.2813086 0.0008440 0.000062 -0.000110 0.000042 0.000037 0.0000048 0.0000230 0.000022 0.000022
+2015 8 26 57260 0.225375 0.379172 0.2804279 0.0009201 0.000056 -0.000185 0.000042 0.000037 0.0000048 0.0000233 0.000022 0.000022
+2015 8 27 57261 0.226047 0.377184 0.2794698 0.0010333 0.000102 -0.000259 0.000043 0.000037 0.0000047 0.0000234 0.000023 0.000022
+2015 8 28 57262 0.226137 0.374940 0.2783356 0.0012129 0.000129 -0.000277 0.000043 0.000037 0.0000048 0.0000234 0.000023 0.000023
+2015 8 29 57263 0.226136 0.373230 0.2770368 0.0013994 0.000109 -0.000271 0.000043 0.000037 0.0000048 0.0000234 0.000024 0.000023
+2015 8 30 57264 0.225979 0.371887 0.2755050 0.0016042 0.000075 -0.000261 0.000043 0.000037 0.0000049 0.0000233 0.000024 0.000024
+2015 8 31 57265 0.226105 0.370644 0.2738080 0.0017519 0.000040 -0.000251 0.000043 0.000037 0.0000051 0.0000232 0.000025 0.000024
+2015 9 1 57266 0.226159 0.369688 0.2720088 0.0018065 0.000006 -0.000241 0.000042 0.000037 0.0000052 0.0000231 0.000026 0.000025
+2015 9 2 57267 0.226254 0.368692 0.2702026 0.0017414 -0.000006 -0.000361 0.000042 0.000037 0.0000054 0.0000231 0.000026 0.000026
+2015 9 3 57268 0.226639 0.367229 0.2685163 0.0015875 0.000000 -0.000320 0.000042 0.000037 0.0000055 0.0000231 0.000027 0.000027
+2015 9 4 57269 0.227426 0.365669 0.2670179 0.0014125 0.000008 -0.000221 0.000042 0.000037 0.0000056 0.0000232 0.000027 0.000027
+2015 9 5 57270 0.227931 0.364625 0.2656803 0.0012802 0.000040 -0.000202 0.000042 0.000036 0.0000057 0.0000233 0.000027 0.000027
+2015 9 6 57271 0.227975 0.363324 0.2644683 0.0011842 0.000081 -0.000213 0.000042 0.000036 0.0000057 0.0000234 0.000026 0.000026
+2015 9 7 57272 0.228121 0.361815 0.2633431 0.0011165 0.000122 -0.000222 0.000042 0.000036 0.0000057 0.0000236 0.000025 0.000025
+2015 9 8 57273 0.227918 0.360242 0.2622594 0.0010532 0.000162 -0.000233 0.000042 0.000036 0.0000057 0.0000237 0.000024 0.000024
+2015 9 9 57274 0.227477 0.358366 0.2612482 0.0010457 0.000112 -0.000250 0.000042 0.000036 0.0000056 0.0000238 0.000023 0.000023
+2015 9 10 57275 0.226678 0.356453 0.2601824 0.0010446 0.000067 -0.000222 0.000042 0.000036 0.0000055 0.0000239 0.000022 0.000022
+2015 9 11 57276 0.225685 0.354564 0.2591351 0.0010907 0.000009 -0.000183 0.000042 0.000036 0.0000054 0.0000240 0.000021 0.000021
+2015 9 12 57277 0.224883 0.352314 0.2579741 0.0012093 -0.000012 -0.000174 0.000042 0.000036 0.0000053 0.0000240 0.000020 0.000020
+2015 9 13 57278 0.224834 0.350345 0.2566642 0.0013047 -0.000016 -0.000175 0.000042 0.000036 0.0000052 0.0000240 0.000019 0.000019
+2015 9 14 57279 0.224826 0.348391 0.2553799 0.0013355 -0.000021 -0.000177 0.000042 0.000036 0.0000051 0.0000240 0.000018 0.000018
+2015 9 15 57280 0.224661 0.346558 0.2540488 0.0013116 -0.000026 -0.000178 0.000042 0.000036 0.0000050 0.0000241 0.000018 0.000017
+2015 9 16 57281 0.224285 0.345189 0.2527143 0.0012580 -0.000027 -0.000163 0.000042 0.000036 0.0000049 0.0000241 0.000018 0.000017
+2015 9 17 57282 0.223574 0.343743 0.2514941 0.0012140 -0.000027 -0.000143 0.000042 0.000037 0.0000048 0.0000241 0.000018 0.000017
+2015 9 18 57283 0.222455 0.342330 0.2503085 0.0011814 -0.000028 -0.000122 0.000042 0.000037 0.0000047 0.0000241 0.000018 0.000017
+2015 9 19 57284 0.221417 0.340422 0.2491300 0.0011811 -0.000013 -0.000117 0.000041 0.000037 0.0000047 0.0000242 0.000019 0.000017
+2015 9 20 57285 0.220525 0.338489 0.2479690 0.0011854 0.000007 -0.000116 0.000041 0.000037 0.0000046 0.0000242 0.000019 0.000018
+2015 9 21 57286 0.219470 0.336281 0.2467427 0.0012139 0.000027 -0.000115 0.000040 0.000036 0.0000044 0.0000243 0.000020 0.000019
+2015 9 22 57287 0.218788 0.334067 0.2455169 0.0012940 0.000047 -0.000115 0.000039 0.000036 0.0000044 0.0000244 0.000021 0.000019
+2015 9 23 57288 0.218317 0.332050 0.2441966 0.0013745 0.000049 -0.000161 0.000039 0.000036 0.0000043 0.0000244 0.000021 0.000020
+2015 9 24 57289 0.218149 0.329959 0.2427433 0.0014875 0.000045 -0.000221 0.000038 0.000036 0.0000042 0.0000245 0.000021 0.000020
+2015 9 25 57290 0.218124 0.328219 0.2411798 0.0016980 0.000042 -0.000280 0.000038 0.000036 0.0000042 0.0000246 0.000021 0.000020
+2015 9 26 57291 0.218222 0.326765 0.2393843 0.0019379 0.000047 -0.000089 0.000038 0.000036 0.0000042 0.0000247 0.000021 0.000020
+2015 9 27 57292 0.217700 0.325161 0.2373350 0.0020938 0.000025 0.000012 0.000039 0.000036 0.0000042 0.0000248 0.000020 0.000020
+2015 9 28 57293 0.216363 0.323525 0.2352100 0.0021262 -0.000028 -0.000068 0.000040 0.000036 0.0000043 0.0000249 0.000020 0.000019
+2015 9 29 57294 0.214364 0.321254 0.2331141 0.0020575 -0.000081 -0.000148 0.000040 0.000036 0.0000044 0.0000249 0.000019 0.000019
+2015 9 30 57295 0.212128 0.318772 0.2311423 0.0019043 -0.000127 -0.000175 0.000041 0.000037 0.0000045 0.0000249 0.000019 0.000019
+2015 10 1 57296 0.210154 0.315940 0.2293563 0.0016806 -0.000087 -0.000191 0.000041 0.000037 0.0000047 0.0000248 0.000019 0.000018
+2015 10 2 57297 0.209372 0.313714 0.2277956 0.0014195 -0.000023 -0.000208 0.000042 0.000037 0.0000049 0.0000247 0.000019 0.000018
+2015 10 3 57298 0.209309 0.311983 0.2264605 0.0012729 -0.000005 -0.000191 0.000042 0.000037 0.0000051 0.0000245 0.000019 0.000018
+2015 10 4 57299 0.209040 0.310085 0.2252165 0.0012310 -0.000004 -0.000163 0.000042 0.000037 0.0000053 0.0000243 0.000020 0.000018
+2015 10 5 57300 0.208642 0.307983 0.2240212 0.0012479 -0.000003 -0.000134 0.000042 0.000037 0.0000054 0.0000240 0.000020 0.000018
+2015 10 6 57301 0.208173 0.306267 0.2227485 0.0013025 -0.000002 -0.000106 0.000041 0.000037 0.0000054 0.0000237 0.000020 0.000018
+2015 10 7 57302 0.207405 0.304663 0.2214283 0.0013574 -0.000058 -0.000126 0.000041 0.000037 0.0000054 0.0000234 0.000020 0.000018
+2015 10 8 57303 0.206711 0.303243 0.2200227 0.0013977 -0.000001 -0.000154 0.000041 0.000037 0.0000054 0.0000232 0.000020 0.000018
+2015 10 9 57304 0.205815 0.302033 0.2186103 0.0014645 0.000092 -0.000180 0.000041 0.000037 0.0000053 0.0000229 0.000020 0.000018
+2015 10 10 57305 0.204312 0.300736 0.2170553 0.0015802 0.000093 -0.000183 0.000040 0.000037 0.0000053 0.0000227 0.000019 0.000018
+2015 10 11 57306 0.202086 0.299153 0.2154592 0.0016430 0.000086 -0.000186 0.000040 0.000037 0.0000053 0.0000224 0.000019 0.000017
+2015 10 12 57307 0.199969 0.297463 0.2138035 0.0016608 0.000079 -0.000190 0.000040 0.000037 0.0000052 0.0000222 0.000018 0.000016
+2015 10 13 57308 0.197971 0.295785 0.2121670 0.0016277 0.000072 -0.000193 0.000041 0.000037 0.0000052 0.0000220 0.000017 0.000016
+2015 10 14 57309 0.195980 0.294038 0.2105459 0.0015663 0.000066 -0.000197 0.000041 0.000037 0.0000051 0.0000218 0.000016 0.000015
+2015 10 15 57310 0.193994 0.292082 0.2089934 0.0014524 0.000049 -0.000161 0.000042 0.000037 0.0000050 0.0000216 0.000016 0.000015
+2015 10 16 57311 0.192102 0.290369 0.2076086 0.0013855 0.000030 -0.000115 0.000042 0.000037 0.0000050 0.0000215 0.000015 0.000014
+2015 10 17 57312 0.190068 0.288934 0.2061901 0.0014394 0.000015 -0.000117 0.000043 0.000037 0.0000050 0.0000214 0.000015 0.000014
+2015 10 18 57313 0.188345 0.287223 0.2047215 0.0015264 0.000002 -0.000138 0.000043 0.000037 0.0000051 0.0000215 0.000014 0.000014
+2015 10 19 57314 0.186873 0.285643 0.2031873 0.0015520 -0.000011 -0.000159 0.000043 0.000037 0.0000051 0.0000216 0.000014 0.000014
+2015 10 20 57315 0.185756 0.284233 0.2016303 0.0015486 -0.000024 -0.000179 0.000043 0.000037 0.0000052 0.0000217 0.000014 0.000014
+2015 10 21 57316 0.184816 0.283207 0.2000706 0.0015994 -0.000025 -0.000189 0.000043 0.000037 0.0000052 0.0000220 0.000014 0.000014
+2015 10 22 57317 0.183803 0.282406 0.1983996 0.0017629 -0.000022 -0.000196 0.000043 0.000037 0.0000053 0.0000222 0.000015 0.000014
+2015 10 23 57318 0.182488 0.281529 0.1965325 0.0019635 -0.000020 -0.000203 0.000043 0.000037 0.0000053 0.0000224 0.000015 0.000015
+2015 10 24 57319 0.180780 0.280319 0.1944731 0.0021304 -0.000029 -0.000189 0.000042 0.000037 0.0000053 0.0000226 0.000015 0.000015
+2015 10 25 57320 0.179130 0.278925 0.1922502 0.0022662 -0.000044 -0.000168 0.000042 0.000037 0.0000052 0.0000227 0.000016 0.000016
+2015 10 26 57321 0.178074 0.277767 0.1899642 0.0023219 -0.000058 -0.000146 0.000041 0.000037 0.0000052 0.0000228 0.000016 0.000016
+2015 10 27 57322 0.177441 0.276623 0.1876673 0.0022573 -0.000072 -0.000125 0.000041 0.000037 0.0000051 0.0000228 0.000016 0.000017
+2015 10 28 57323 0.176444 0.275666 0.1854819 0.0021076 -0.000081 -0.000112 0.000041 0.000037 0.0000050 0.0000227 0.000016 0.000017
+2015 10 29 57324 0.174595 0.275010 0.1834392 0.0019114 -0.000089 -0.000101 0.000040 0.000037 0.0000050 0.0000226 0.000017 0.000017
+2015 10 30 57325 0.171943 0.274100 0.1816567 0.0017199 -0.000097 -0.000090 0.000040 0.000037 0.0000050 0.0000224 0.000017 0.000017
+2015 10 31 57326 0.168810 0.272491 0.1800089 0.0015698 -0.000088 -0.000088 0.000040 0.000037 0.0000049 0.0000222 0.000016 0.000017
+2015 11 1 57327 0.166156 0.270723 0.1785290 0.0014971 -0.000073 -0.000090 0.000040 0.000037 0.0000049 0.0000221 0.000016 0.000017
+2015 11 2 57328 0.164208 0.269307 0.1770163 0.0014625 -0.000058 -0.000092 0.000041 0.000037 0.0000049 0.0000220 0.000016 0.000017
+2015 11 3 57329 0.162424 0.268456 0.1755812 0.0014188 -0.000044 -0.000094 0.000041 0.000037 0.0000049 0.0000219 0.000016 0.000017
+2015 11 4 57330 0.161037 0.267840 0.1741809 0.0014232 -0.000029 -0.000095 0.000041 0.000037 0.0000049 0.0000219 0.000016 0.000017
+2015 11 5 57331 0.159896 0.267488 0.1727286 0.0014705 -0.000032 -0.000087 0.000041 0.000037 0.0000049 0.0000219 0.000017 0.000017
+2015 11 6 57332 0.158099 0.267016 0.1712422 0.0015442 -0.000041 -0.000076 0.000040 0.000037 0.0000049 0.0000219 0.000017 0.000018
+2015 11 7 57333 0.156027 0.266152 0.1696467 0.0016051 -0.000046 -0.000085 0.000040 0.000037 0.0000049 0.0000220 0.000018 0.000018
+2015 11 8 57334 0.154445 0.265055 0.1680384 0.0016053 -0.000050 -0.000101 0.000040 0.000037 0.0000049 0.0000220 0.000019 0.000019
+2015 11 9 57335 0.153166 0.264102 0.1664229 0.0015843 -0.000055 -0.000117 0.000039 0.000037 0.0000049 0.0000222 0.000020 0.000019
+2015 11 10 57336 0.151445 0.263446 0.1648753 0.0015328 -0.000059 -0.000133 0.000038 0.000037 0.0000049 0.0000223 0.000020 0.000020
+2015 11 11 57337 0.149754 0.262700 0.1633557 0.0014865 -0.000033 -0.000079 0.000038 0.000037 0.0000049 0.0000225 0.000020 0.000020
+2015 11 12 57338 0.148099 0.261850 0.1618909 0.0014441 -0.000031 -0.000108 0.000037 0.000037 0.0000049 0.0000226 0.000020 0.000019
+2015 11 13 57339 0.146319 0.260967 0.1604690 0.0013756 -0.000064 -0.000127 0.000036 0.000037 0.0000048 0.0000227 0.000019 0.000019
+2015 11 14 57340 0.144456 0.260038 0.1591063 0.0013553 -0.000068 -0.000129 0.000036 0.000037 0.0000048 0.0000228 0.000019 0.000019
+2015 11 15 57341 0.142731 0.259238 0.1577101 0.0013775 -0.000057 -0.000129 0.000036 0.000036 0.0000048 0.0000228 0.000018 0.000018
+2015 11 16 57342 0.140900 0.258808 0.1563522 0.0014333 -0.000046 -0.000130 0.000036 0.000036 0.0000049 0.0000228 0.000018 0.000018
+2015 11 17 57343 0.138907 0.258423 0.1549179 0.0014687 -0.000036 -0.000130 0.000036 0.000036 0.0000049 0.0000226 0.000018 0.000018
+2015 11 18 57344 0.136946 0.257706 0.1534306 0.0015223 -0.000071 -0.000024 0.000037 0.000036 0.0000049 0.0000224 0.000018 0.000018
+2015 11 19 57345 0.134583 0.256998 0.1518710 0.0015940 -0.000114 -0.000023 0.000038 0.000036 0.0000049 0.0000221 0.000019 0.000019
+2015 11 20 57346 0.132128 0.256163 0.1502380 0.0016825 -0.000105 -0.000196 0.000038 0.000036 0.0000050 0.0000218 0.000019 0.000019
+2015 11 21 57347 0.129959 0.255573 0.1485168 0.0017796 -0.000081 -0.000220 0.000039 0.000036 0.0000050 0.0000215 0.000020 0.000020
+2015 11 22 57348 0.127960 0.255413 0.1466887 0.0018310 -0.000059 -0.000174 0.000040 0.000036 0.0000050 0.0000213 0.000021 0.000020
+2015 11 23 57349 0.125630 0.255243 0.1448814 0.0018330 -0.000036 -0.000129 0.000040 0.000036 0.0000051 0.0000212 0.000021 0.000020
+2015 11 24 57350 0.123068 0.254701 0.1430838 0.0017535 -0.000013 -0.000083 0.000040 0.000036 0.0000051 0.0000212 0.000022 0.000021
+2015 11 25 57351 0.120745 0.254087 0.1413886 0.0016554 -0.000031 -0.000118 0.000040 0.000036 0.0000052 0.0000212 0.000022 0.000020
+2015 11 26 57352 0.119468 0.254047 0.1397754 0.0015413 -0.000048 -0.000124 0.000041 0.000036 0.0000052 0.0000212 0.000021 0.000020
+2015 11 27 57353 0.118483 0.254296 0.1383466 0.0013942 -0.000058 -0.000124 0.000041 0.000036 0.0000053 0.0000213 0.000020 0.000019
+2015 11 28 57354 0.117794 0.254320 0.1369809 0.0013553 -0.000068 -0.000129 0.000041 0.000036 0.0000052 0.0000213 0.000019 0.000019
+2015 11 29 57355 0.116456 0.254411 0.1355925 0.0014264 -0.000078 -0.000134 0.000042 0.000036 0.0000052 0.0000214 0.000018 0.000018
+2015 11 30 57356 0.114626 0.254026 0.1341180 0.0014999 -0.000088 -0.000139 0.000042 0.000036 0.0000050 0.0000215 0.000017 0.000017
+2015 12 1 57357 0.112660 0.253834 0.1325841 0.0015767 -0.000098 -0.000144 0.000042 0.000036 0.0000049 0.0000217 0.000016 0.000017
+2015 12 2 57358 0.110582 0.253584 0.1309677 0.0016403 -0.000086 -0.000117 0.000042 0.000036 0.0000048 0.0000218 0.000016 0.000017
+2015 12 3 57359 0.108751 0.253219 0.1292905 0.0016987 -0.000067 -0.000082 0.000042 0.000036 0.0000047 0.0000220 0.000016 0.000016
+2015 12 4 57360 0.107184 0.253277 0.1276066 0.0016938 0.000022 -0.000069 0.000042 0.000036 0.0000047 0.0000222 0.000016 0.000017
+2015 12 5 57361 0.105955 0.253099 0.1259228 0.0016638 0.000023 -0.000075 0.000042 0.000036 0.0000046 0.0000223 0.000016 0.000017
+2015 12 6 57362 0.104973 0.252908 0.1242668 0.0016525 -0.000016 -0.000087 0.000042 0.000036 0.0000046 0.0000223 0.000016 0.000017
+2015 12 7 57363 0.103637 0.252704 0.1226218 0.0016787 -0.000056 -0.000098 0.000042 0.000036 0.0000046 0.0000223 0.000016 0.000017
+2015 12 8 57364 0.102411 0.252173 0.1209561 0.0016652 -0.000095 -0.000109 0.000042 0.000036 0.0000045 0.0000222 0.000016 0.000017
+2015 12 9 57365 0.101167 0.251588 0.1193168 0.0016225 -0.000122 -0.000069 0.000042 0.000037 0.0000045 0.0000220 0.000016 0.000017
+2015 12 10 57366 0.099239 0.251226 0.1177389 0.0015619 -0.000166 -0.000081 0.000042 0.000037 0.0000045 0.0000219 0.000016 0.000017
+2015 12 11 57367 0.096448 0.250751 0.1162064 0.0014793 -0.000215 -0.000113 0.000042 0.000037 0.0000045 0.0000218 0.000016 0.000017
+2015 12 12 57368 0.093870 0.250481 0.1147837 0.0014297 -0.000209 -0.000125 0.000042 0.000037 0.0000046 0.0000218 0.000017 0.000018
+2015 12 13 57369 0.091538 0.250499 0.1133531 0.0013910 -0.000183 -0.000130 0.000042 0.000037 0.0000047 0.0000218 0.000017 0.000018
+2015 12 14 57370 0.089415 0.250557 0.1119732 0.0014111 -0.000156 -0.000135 0.000042 0.000037 0.0000049 0.0000218 0.000017 0.000019
+2015 12 15 57371 0.087128 0.250719 0.1105165 0.0015100 -0.000129 -0.000139 0.000042 0.000037 0.0000052 0.0000218 0.000018 0.000020
+2015 12 16 57372 0.085011 0.250367 0.1089197 0.0016307 -0.000243 0.000062 0.000042 0.000037 0.0000054 0.0000219 0.000018 0.000020
+2015 12 17 57373 0.083503 0.249852 0.1072284 0.0017430 -0.000245 0.000081 0.000042 0.000037 0.0000057 0.0000220 0.000019 0.000021
+2015 12 18 57374 0.082075 0.250115 0.1054011 0.0018760 -0.000144 -0.000109 0.000042 0.000037 0.0000059 0.0000221 0.000019 0.000021
+2015 12 19 57375 0.080164 0.250752 0.1035078 0.0019666 -0.000117 -0.000179 0.000042 0.000037 0.0000060 0.0000222 0.000019 0.000021
+2015 12 20 57376 0.078060 0.251157 0.1015048 0.0020001 -0.000122 -0.000187 0.000042 0.000037 0.0000061 0.0000222 0.000019 0.000021
+2015 12 21 57377 0.075774 0.251412 0.0995028 0.0019250 -0.000128 -0.000196 0.000042 0.000037 0.0000061 0.0000223 0.000019 0.000021
+2015 12 22 57378 0.073426 0.251536 0.0976242 0.0017973 -0.000133 -0.000205 0.000042 0.000037 0.0000061 0.0000223 0.000019 0.000022
+2015 12 23 57379 0.071342 0.251594 0.0958754 0.0016463 -0.000068 -0.000006 0.000042 0.000037 0.0000062 0.0000222 0.000020 0.000022
+2015 12 24 57380 0.069079 0.252097 0.0942958 0.0014966 -0.000050 0.000054 0.000042 0.000037 0.0000062 0.0000221 0.000020 0.000023
+2015 12 25 57381 0.066462 0.252990 0.0927963 0.0014157 -0.000057 0.000043 0.000042 0.000037 0.0000061 0.0000220 0.000021 0.000023
+2015 12 26 57382 0.063962 0.253383 0.0914549 0.0013974 -0.000063 0.000032 0.000042 0.000037 0.0000061 0.0000219 0.000023 0.000025
+2015 12 27 57383 0.061922 0.253786 0.0900983 0.0014389 -0.000069 0.000021 0.000042 0.000037 0.0000060 0.0000218 0.000025 0.000026
+2015 12 28 57384 0.059705 0.254375 0.0885900 0.0015384 -0.000076 0.000010 0.000042 0.000037 0.0000059 0.0000217 0.000027 0.000027
+2015 12 29 57385 0.057554 0.254946 0.0869669 0.0016555 -0.000082 -0.000001 0.000042 0.000037 0.0000057 0.0000215 0.000029 0.000028
+2015 12 30 57386 0.055411 0.255686 0.0852545 0.0017608 -0.000217 0.000064 0.000042 0.000036 0.0000055 0.0000214 0.000030 0.000029
+2015 12 31 57387 0.053426 0.256136 0.0834519 0.0018661 -0.000247 0.000068 0.000042 0.000036 0.0000053 0.0000214 0.000030 0.000029
diff --git a/src/test/resources/orekit-data/eopc04_08_IAU2000.16 b/src/test/resources/orekit-data/eopc04_08_IAU2000.16
new file mode 100644
index 0000000000000000000000000000000000000000..7edac4cf8c76db314c85a372f0f4748c65e5ad40
--- /dev/null
+++ b/src/test/resources/orekit-data/eopc04_08_IAU2000.16
@@ -0,0 +1,380 @@
+
+
+ INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE
+ EARTH ORIENTATION PARAMETERS
+ EOP (IERS) 08 C04
+
+
+ FORMAT(3(I4),I7,2(F11.6),2(F12.7),2(F11.6),2(F11.6),2(F11.7),2(F12.6))
+##################################################################################
+
+ Date MJD x y UT1-UTC LOD dX dY x Err y Err UT1-UTC Err LOD Err dX Err dY Err
+ " " s s " " " " s s " "
+ (0h UTC)
+
+2016 1 1 57388 0.051192 0.256748 0.0815227 0.0019387 -0.000224 0.000043 0.000042 0.000036 0.0000051 0.0000213 0.000030 0.000028
+2016 1 2 57389 0.048884 0.257339 0.0796099 0.0019279 -0.000202 0.000017 0.000042 0.000036 0.0000048 0.0000213 0.000029 0.000027
+2016 1 3 57390 0.047084 0.257651 0.0776974 0.0019252 -0.000180 -0.000009 0.000042 0.000036 0.0000047 0.0000213 0.000027 0.000027
+2016 1 4 57391 0.045708 0.258474 0.0757504 0.0019391 -0.000157 -0.000035 0.000042 0.000036 0.0000045 0.0000214 0.000027 0.000026
+2016 1 5 57392 0.044165 0.260137 0.0738379 0.0018963 -0.000135 -0.000061 0.000042 0.000036 0.0000045 0.0000215 0.000026 0.000025
+2016 1 6 57393 0.042274 0.261816 0.0719566 0.0018716 -0.000116 -0.000118 0.000043 0.000036 0.0000045 0.0000216 0.000025 0.000025
+2016 1 7 57394 0.040643 0.263278 0.0700847 0.0018213 -0.000097 -0.000184 0.000043 0.000036 0.0000046 0.0000217 0.000024 0.000024
+2016 1 8 57395 0.039552 0.265034 0.0682959 0.0017826 -0.000079 -0.000250 0.000043 0.000036 0.0000049 0.0000218 0.000023 0.000023
+2016 1 9 57396 0.037981 0.267190 0.0665817 0.0017632 -0.000097 -0.000217 0.000043 0.000036 0.0000052 0.0000218 0.000022 0.000023
+2016 1 10 57397 0.035902 0.268863 0.0647877 0.0017923 -0.000128 -0.000146 0.000043 0.000036 0.0000055 0.0000218 0.000021 0.000022
+2016 1 11 57398 0.034247 0.270651 0.0629640 0.0018818 -0.000159 -0.000076 0.000043 0.000036 0.0000058 0.0000218 0.000021 0.000021
+2016 1 12 57399 0.032744 0.272516 0.0610230 0.0019880 -0.000170 -0.000048 0.000043 0.000036 0.0000059 0.0000217 0.000020 0.000021
+2016 1 13 57400 0.031082 0.274414 0.0589884 0.0021058 -0.000115 -0.000160 0.000043 0.000036 0.0000059 0.0000214 0.000020 0.000020
+2016 1 14 57401 0.029457 0.275683 0.0569494 0.0022054 -0.000088 -0.000138 0.000043 0.000036 0.0000057 0.0000211 0.000019 0.000020
+2016 1 15 57402 0.028261 0.276662 0.0546535 0.0022000 -0.000161 -0.000136 0.000043 0.000036 0.0000055 0.0000206 0.000019 0.000020
+2016 1 16 57403 0.026706 0.278103 0.0524799 0.0021266 -0.000178 -0.000124 0.000043 0.000036 0.0000052 0.0000201 0.000019 0.000019
+2016 1 17 57404 0.025055 0.279509 0.0503846 0.0020482 -0.000166 -0.000101 0.000043 0.000036 0.0000050 0.0000196 0.000019 0.000019
+2016 1 18 57405 0.023259 0.281313 0.0484094 0.0019464 -0.000153 -0.000079 0.000043 0.000036 0.0000048 0.0000193 0.000019 0.000019
+2016 1 19 57406 0.021331 0.283168 0.0465094 0.0018275 -0.000140 -0.000056 0.000043 0.000037 0.0000047 0.0000192 0.000019 0.000019
+2016 1 20 57407 0.019010 0.285046 0.0447171 0.0016849 -0.000158 -0.000137 0.000043 0.000037 0.0000046 0.0000193 0.000019 0.000019
+2016 1 21 57408 0.016469 0.286452 0.0431279 0.0015859 -0.000133 -0.000113 0.000043 0.000037 0.0000046 0.0000196 0.000019 0.000019
+2016 1 22 57409 0.013864 0.287781 0.0415489 0.0015395 -0.000094 -0.000049 0.000044 0.000037 0.0000047 0.0000200 0.000019 0.000019
+2016 1 23 57410 0.011033 0.288838 0.0400284 0.0015751 -0.000107 -0.000051 0.000044 0.000037 0.0000049 0.0000207 0.000019 0.000020
+2016 1 24 57411 0.008536 0.289377 0.0383959 0.0016290 -0.000138 -0.000078 0.000044 0.000037 0.0000050 0.0000213 0.000019 0.000020
+2016 1 25 57412 0.006775 0.289827 0.0368259 0.0016152 -0.000169 -0.000105 0.000044 0.000038 0.0000052 0.0000218 0.000019 0.000020
+2016 1 26 57413 0.005656 0.290531 0.0351759 0.0016117 -0.000200 -0.000131 0.000044 0.000038 0.0000052 0.0000222 0.000019 0.000020
+2016 1 27 57414 0.004681 0.291717 0.0335796 0.0016125 -0.000103 -0.000106 0.000044 0.000038 0.0000052 0.0000225 0.000019 0.000020
+2016 1 28 57415 0.003500 0.292993 0.0319914 0.0015516 -0.000063 -0.000115 0.000043 0.000038 0.0000051 0.0000226 0.000019 0.000020
+2016 1 29 57416 0.002324 0.294091 0.0304699 0.0015304 -0.000038 -0.000132 0.000043 0.000038 0.0000049 0.0000226 0.000019 0.000020
+2016 1 30 57417 0.000874 0.295737 0.0289247 0.0014487 -0.000055 -0.000124 0.000043 0.000038 0.0000047 0.0000226 0.000019 0.000020
+2016 1 31 57418 -0.001284 0.297543 0.0275506 0.0013186 -0.000087 -0.000106 0.000043 0.000038 0.0000046 0.0000226 0.000020 0.000021
+2016 2 1 57419 -0.003291 0.299538 0.0262812 0.0012871 -0.000119 -0.000088 0.000042 0.000038 0.0000044 0.0000226 0.000021 0.000021
+2016 2 2 57420 -0.004753 0.301342 0.0249960 0.0012581 -0.000151 -0.000070 0.000042 0.000038 0.0000043 0.0000226 0.000021 0.000021
+2016 2 3 57421 -0.005723 0.302650 0.0238278 0.0012101 -0.000125 -0.000070 0.000042 0.000038 0.0000043 0.0000227 0.000022 0.000022
+2016 2 4 57422 -0.006419 0.304497 0.0226256 0.0011848 -0.000105 -0.000080 0.000042 0.000038 0.0000044 0.0000228 0.000022 0.000022
+2016 2 5 57423 -0.007479 0.306467 0.0213895 0.0011833 -0.000090 -0.000092 0.000042 0.000038 0.0000045 0.0000229 0.000023 0.000022
+2016 2 6 57424 -0.008648 0.308133 0.0201540 0.0013129 -0.000103 -0.000100 0.000042 0.000038 0.0000046 0.0000230 0.000023 0.000022
+2016 2 7 57425 -0.009562 0.309800 0.0187240 0.0015112 -0.000126 -0.000107 0.000042 0.000038 0.0000047 0.0000231 0.000023 0.000022
+2016 2 8 57426 -0.009605 0.311454 0.0171274 0.0016999 -0.000148 -0.000112 0.000042 0.000038 0.0000048 0.0000232 0.000023 0.000023
+2016 2 9 57427 -0.009693 0.313159 0.0153236 0.0018830 -0.000171 -0.000119 0.000042 0.000038 0.0000049 0.0000233 0.000023 0.000023
+2016 2 10 57428 -0.009850 0.314970 0.0133076 0.0020455 -0.000187 -0.000050 0.000042 0.000038 0.0000050 0.0000235 0.000024 0.000023
+2016 2 11 57429 -0.010523 0.317115 0.0112435 0.0020899 -0.000215 -0.000053 0.000042 0.000037 0.0000051 0.0000236 0.000024 0.000024
+2016 2 12 57430 -0.011203 0.319000 0.0091456 0.0020529 -0.000247 -0.000084 0.000042 0.000037 0.0000052 0.0000237 0.000025 0.000024
+2016 2 13 57431 -0.011886 0.321069 0.0071327 0.0019533 -0.000247 -0.000082 0.000042 0.000037 0.0000054 0.0000238 0.000026 0.000025
+2016 2 14 57432 -0.012447 0.323270 0.0052530 0.0018166 -0.000235 -0.000070 0.000042 0.000037 0.0000054 0.0000239 0.000027 0.000026
+2016 2 15 57433 -0.013068 0.325382 0.0035053 0.0016672 -0.000224 -0.000057 0.000042 0.000037 0.0000055 0.0000239 0.000028 0.000027
+2016 2 16 57434 -0.013915 0.327075 0.0019129 0.0015250 -0.000212 -0.000044 0.000041 0.000037 0.0000055 0.0000239 0.000029 0.000028
+2016 2 17 57435 -0.014731 0.328473 0.0004621 0.0013770 -0.000220 0.000054 0.000041 0.000037 0.0000055 0.0000238 0.000029 0.000028
+2016 2 18 57436 -0.015932 0.330416 -0.0008748 0.0012882 -0.000149 -0.000010 0.000041 0.000037 0.0000054 0.0000238 0.000029 0.000028
+2016 2 19 57437 -0.017366 0.332402 -0.0021565 0.0012939 -0.000053 -0.000127 0.000041 0.000037 0.0000053 0.0000237 0.000029 0.000028
+2016 2 20 57438 -0.018643 0.334093 -0.0034510 0.0013757 -0.000056 -0.000140 0.000042 0.000037 0.0000051 0.0000236 0.000029 0.000027
+2016 2 21 57439 -0.019326 0.335460 -0.0048802 0.0014925 -0.000096 -0.000113 0.000042 0.000037 0.0000050 0.0000235 0.000028 0.000027
+2016 2 22 57440 -0.019866 0.337622 -0.0064333 0.0015967 -0.000136 -0.000087 0.000042 0.000037 0.0000049 0.0000235 0.000028 0.000027
+2016 2 23 57441 -0.020901 0.339831 -0.0080735 0.0016757 -0.000176 -0.000060 0.000042 0.000036 0.0000048 0.0000235 0.000028 0.000026
+2016 2 24 57442 -0.021620 0.342061 -0.0098282 0.0017449 -0.000380 0.000080 0.000042 0.000036 0.0000047 0.0000235 0.000028 0.000026
+2016 2 25 57443 -0.021906 0.344417 -0.0115525 0.0018338 -0.000315 0.000115 0.000042 0.000036 0.0000046 0.0000235 0.000028 0.000026
+2016 2 26 57444 -0.022015 0.346306 -0.0134217 0.0018335 -0.000202 -0.000010 0.000042 0.000036 0.0000046 0.0000236 0.000027 0.000026
+2016 2 27 57445 -0.022268 0.348403 -0.0152149 0.0017669 -0.000169 -0.000068 0.000042 0.000036 0.0000046 0.0000237 0.000026 0.000025
+2016 2 28 57446 -0.023224 0.350814 -0.0169788 0.0017221 -0.000159 -0.000088 0.000042 0.000036 0.0000045 0.0000238 0.000026 0.000024
+2016 2 29 57447 -0.024248 0.352864 -0.0186919 0.0017159 -0.000149 -0.000107 0.000042 0.000036 0.0000044 0.0000240 0.000025 0.000024
+2016 3 1 57448 -0.024924 0.354450 -0.0203692 0.0016585 -0.000138 -0.000127 0.000042 0.000036 0.0000044 0.0000242 0.000024 0.000023
+2016 3 2 57449 -0.024691 0.355901 -0.0219835 0.0016741 -0.000114 -0.000088 0.000042 0.000036 0.0000043 0.0000244 0.000023 0.000022
+2016 3 3 57450 -0.023997 0.357828 -0.0236783 0.0017145 -0.000086 -0.000033 0.000042 0.000036 0.0000043 0.0000247 0.000023 0.000021
+2016 3 4 57451 -0.023639 0.360189 -0.0254408 0.0017376 -0.000058 0.000021 0.000042 0.000036 0.0000042 0.0000250 0.000022 0.000021
+2016 3 5 57452 -0.023780 0.362634 -0.0272280 0.0018614 -0.000041 0.000011 0.000042 0.000037 0.0000042 0.0000254 0.000022 0.000020
+2016 3 6 57453 -0.023652 0.365027 -0.0292095 0.0020493 -0.000028 -0.000022 0.000043 0.000037 0.0000041 0.0000257 0.000022 0.000020
+2016 3 7 57454 -0.024020 0.367580 -0.0313538 0.0022002 -0.000015 -0.000056 0.000043 0.000037 0.0000041 0.0000259 0.000021 0.000020
+2016 3 8 57455 -0.024453 0.370046 -0.0335645 0.0022925 -0.000002 -0.000089 0.000043 0.000037 0.0000041 0.0000261 0.000021 0.000020
+2016 3 9 57456 -0.024839 0.372514 -0.0359344 0.0023896 -0.000031 -0.000071 0.000043 0.000036 0.0000042 0.0000261 0.000021 0.000020
+2016 3 10 57457 -0.025099 0.374927 -0.0383581 0.0024751 -0.000071 -0.000038 0.000043 0.000036 0.0000043 0.0000259 0.000022 0.000020
+2016 3 11 57458 -0.025070 0.377065 -0.0408637 0.0024456 -0.000111 -0.000006 0.000043 0.000036 0.0000044 0.0000256 0.000022 0.000021
+2016 3 12 57459 -0.025173 0.378947 -0.0432770 0.0023506 -0.000109 0.000007 0.000043 0.000036 0.0000045 0.0000252 0.000023 0.000022
+2016 3 13 57460 -0.025263 0.380807 -0.0455819 0.0022077 -0.000091 0.000013 0.000043 0.000036 0.0000046 0.0000249 0.000023 0.000023
+2016 3 14 57461 -0.024789 0.382604 -0.0477471 0.0020830 -0.000073 0.000019 0.000043 0.000036 0.0000048 0.0000247 0.000024 0.000024
+2016 3 15 57462 -0.024001 0.384765 -0.0497714 0.0019397 -0.000055 0.000025 0.000043 0.000037 0.0000049 0.0000246 0.000025 0.000025
+2016 3 16 57463 -0.022791 0.387141 -0.0516346 0.0018420 -0.000148 0.000080 0.000043 0.000037 0.0000051 0.0000245 0.000026 0.000025
+2016 3 17 57464 -0.020842 0.389449 -0.0534475 0.0018275 -0.000269 0.000146 0.000043 0.000037 0.0000053 0.0000245 0.000027 0.000026
+2016 3 18 57465 -0.018331 0.392014 -0.0552911 0.0018242 -0.000140 0.000116 0.000042 0.000037 0.0000055 0.0000244 0.000028 0.000028
+2016 3 19 57466 -0.016085 0.394476 -0.0571403 0.0018940 -0.000102 0.000075 0.000042 0.000037 0.0000058 0.0000242 0.000030 0.000029
+2016 3 20 57467 -0.014474 0.396975 -0.0590949 0.0019937 -0.000127 0.000041 0.000042 0.000037 0.0000061 0.0000239 0.000033 0.000031
+2016 3 21 57468 -0.013667 0.399504 -0.0611053 0.0020831 -0.000153 0.000008 0.000042 0.000037 0.0000063 0.0000235 0.000035 0.000032
+2016 3 22 57469 -0.013497 0.402067 -0.0631832 0.0021006 -0.000179 -0.000026 0.000041 0.000037 0.0000066 0.0000231 0.000038 0.000034
+2016 3 23 57470 -0.013647 0.404400 -0.0652885 0.0020802 -0.000226 0.000133 0.000041 0.000037 0.0000067 0.0000226 0.000041 0.000036
+2016 3 24 57471 -0.013657 0.406400 -0.0673452 0.0020184 -0.000255 0.000150 0.000040 0.000037 0.0000068 0.0000222 0.000043 0.000037
+2016 3 25 57472 -0.013267 0.408429 -0.0693305 0.0020241 -0.000249 0.000121 0.000040 0.000037 0.0000067 0.0000218 0.000043 0.000038
+2016 3 26 57473 -0.012632 0.410456 -0.0713826 0.0020437 -0.000232 0.000095 0.000040 0.000037 0.0000066 0.0000214 0.000041 0.000037
+2016 3 27 57474 -0.011831 0.412651 -0.0733875 0.0019734 -0.000216 0.000070 0.000040 0.000037 0.0000064 0.0000212 0.000038 0.000035
+2016 3 28 57475 -0.011105 0.414517 -0.0753416 0.0018838 -0.000199 0.000044 0.000040 0.000037 0.0000061 0.0000210 0.000035 0.000033
+2016 3 29 57476 -0.010240 0.416349 -0.0771835 0.0018231 -0.000182 0.000019 0.000040 0.000037 0.0000058 0.0000210 0.000032 0.000031
+2016 3 30 57477 -0.009342 0.418025 -0.0789539 0.0017625 -0.000165 -0.000007 0.000040 0.000037 0.0000055 0.0000211 0.000030 0.000030
+2016 3 31 57478 -0.008698 0.419749 -0.0807084 0.0017400 -0.000133 0.000008 0.000040 0.000037 0.0000053 0.0000213 0.000029 0.000029
+2016 4 1 57479 -0.008411 0.421218 -0.0824621 0.0017695 -0.000098 0.000033 0.000041 0.000037 0.0000052 0.0000215 0.000028 0.000029
+2016 4 2 57480 -0.008084 0.422691 -0.0842463 0.0018530 -0.000087 0.000018 0.000041 0.000037 0.0000051 0.0000218 0.000028 0.000029
+2016 4 3 57481 -0.007601 0.424120 -0.0861539 0.0019491 -0.000084 -0.000011 0.000042 0.000037 0.0000051 0.0000221 0.000028 0.000030
+2016 4 4 57482 -0.006471 0.425825 -0.0881492 0.0020879 -0.000082 -0.000040 0.000042 0.000037 0.0000051 0.0000224 0.000028 0.000031
+2016 4 5 57483 -0.004770 0.427896 -0.0902897 0.0022231 -0.000079 -0.000069 0.000042 0.000038 0.0000052 0.0000226 0.000029 0.000031
+2016 4 6 57484 -0.002512 0.429860 -0.0925838 0.0023292 -0.000111 0.000062 0.000042 0.000038 0.0000053 0.0000228 0.000029 0.000032
+2016 4 7 57485 -0.000718 0.432209 -0.0949386 0.0023391 -0.000076 0.000122 0.000042 0.000038 0.0000054 0.0000231 0.000029 0.000032
+2016 4 8 57486 0.000683 0.434742 -0.0972745 0.0023196 -0.000124 0.000051 0.000042 0.000038 0.0000056 0.0000233 0.000029 0.000033
+2016 4 9 57487 0.002092 0.437126 -0.0995873 0.0022204 -0.000129 0.000046 0.000042 0.000038 0.0000058 0.0000236 0.000028 0.000033
+2016 4 10 57488 0.003351 0.439048 -0.1017375 0.0020369 -0.000104 0.000077 0.000042 0.000038 0.0000060 0.0000239 0.000028 0.000033
+2016 4 11 57489 0.004600 0.440984 -0.1036532 0.0018561 -0.000079 0.000108 0.000042 0.000038 0.0000063 0.0000241 0.000028 0.000033
+2016 4 12 57490 0.006136 0.442704 -0.1054682 0.0017349 -0.000055 0.000139 0.000042 0.000038 0.0000065 0.0000243 0.000028 0.000032
+2016 4 13 57491 0.007806 0.444226 -0.1071712 0.0016287 0.000156 0.000214 0.000042 0.000038 0.0000066 0.0000243 0.000028 0.000032
+2016 4 14 57492 0.009124 0.445648 -0.1087689 0.0015508 0.000137 0.000177 0.000042 0.000038 0.0000066 0.0000241 0.000027 0.000031
+2016 4 15 57493 0.010474 0.447430 -0.1103103 0.0015721 0.000037 0.000103 0.000042 0.000038 0.0000066 0.0000239 0.000027 0.000030
+2016 4 16 57494 0.011955 0.449626 -0.1118877 0.0016227 0.000009 0.000084 0.000042 0.000037 0.0000065 0.0000236 0.000027 0.000028
+2016 4 17 57495 0.013637 0.451920 -0.1135633 0.0016460 0.000007 0.000085 0.000042 0.000037 0.0000064 0.0000233 0.000026 0.000027
+2016 4 18 57496 0.015491 0.454113 -0.1151881 0.0017156 0.000005 0.000087 0.000042 0.000037 0.0000062 0.0000230 0.000026 0.000026
+2016 4 19 57497 0.017083 0.455931 -0.1168915 0.0017489 0.000004 0.000088 0.000042 0.000037 0.0000061 0.0000228 0.000025 0.000025
+2016 4 20 57498 0.018542 0.456814 -0.1186454 0.0017370 0.000011 0.000136 0.000042 0.000037 0.0000060 0.0000225 0.000025 0.000025
+2016 4 21 57499 0.020298 0.457636 -0.1203445 0.0016894 0.000004 0.000097 0.000042 0.000037 0.0000060 0.0000224 0.000025 0.000025
+2016 4 22 57500 0.022064 0.458678 -0.1219740 0.0016452 -0.000007 0.000029 0.000042 0.000037 0.0000060 0.0000222 0.000026 0.000025
+2016 4 23 57501 0.024090 0.460211 -0.1235769 0.0016146 0.000001 0.000029 0.000042 0.000037 0.0000061 0.0000221 0.000027 0.000026
+2016 4 24 57502 0.025818 0.461885 -0.1251333 0.0014828 0.000017 0.000054 0.000042 0.000037 0.0000061 0.0000220 0.000028 0.000027
+2016 4 25 57503 0.027086 0.463485 -0.1265303 0.0013193 0.000032 0.000078 0.000041 0.000037 0.0000061 0.0000219 0.000029 0.000029
+2016 4 26 57504 0.028079 0.465369 -0.1278138 0.0012213 0.000047 0.000103 0.000041 0.000037 0.0000061 0.0000218 0.000030 0.000030
+2016 4 27 57505 0.028863 0.467031 -0.1290307 0.0012383 0.000062 0.000128 0.000041 0.000037 0.0000061 0.0000218 0.000032 0.000032
+2016 4 28 57506 0.029725 0.468559 -0.1303085 0.0013305 0.000084 0.000137 0.000041 0.000037 0.0000060 0.0000218 0.000033 0.000034
+2016 4 29 57507 0.030553 0.469934 -0.1317143 0.0014393 0.000108 0.000142 0.000041 0.000037 0.0000061 0.0000219 0.000033 0.000035
+2016 4 30 57508 0.032131 0.470866 -0.1331825 0.0015612 0.000098 0.000140 0.000041 0.000037 0.0000062 0.0000219 0.000034 0.000035
+2016 5 1 57509 0.034568 0.472259 -0.1348235 0.0017057 0.000075 0.000136 0.000041 0.000037 0.0000063 0.0000219 0.000034 0.000036
+2016 5 2 57510 0.036708 0.474011 -0.1365813 0.0018521 0.000053 0.000131 0.000042 0.000037 0.0000066 0.0000218 0.000035 0.000037
+2016 5 3 57511 0.038586 0.475560 -0.1385302 0.0020445 0.000030 0.000127 0.000042 0.000038 0.0000068 0.0000217 0.000035 0.000038
+2016 5 4 57512 0.040681 0.476852 -0.1406614 0.0021869 0.000008 0.000123 0.000042 0.000038 0.0000071 0.0000216 0.000036 0.000039
+2016 5 5 57513 0.042346 0.478022 -0.1428618 0.0021825 0.000122 0.000088 0.000042 0.000038 0.0000074 0.0000216 0.000037 0.000041
+2016 5 6 57514 0.043440 0.479085 -0.1450110 0.0020885 0.000272 0.000045 0.000042 0.000038 0.0000076 0.0000216 0.000038 0.000043
+2016 5 7 57515 0.044916 0.480217 -0.1470091 0.0019453 0.000277 0.000052 0.000042 0.000038 0.0000078 0.0000216 0.000038 0.000045
+2016 5 8 57516 0.046610 0.481535 -0.1488921 0.0017681 0.000229 0.000077 0.000042 0.000038 0.0000080 0.0000217 0.000039 0.000047
+2016 5 9 57517 0.048358 0.482854 -0.1505476 0.0015860 0.000181 0.000102 0.000042 0.000038 0.0000081 0.0000219 0.000039 0.000049
+2016 5 10 57518 0.050208 0.484136 -0.1520710 0.0014446 0.000133 0.000127 0.000041 0.000037 0.0000082 0.0000219 0.000039 0.000050
+2016 5 11 57519 0.052256 0.485299 -0.1534758 0.0013773 0.000015 0.000148 0.000041 0.000037 0.0000083 0.0000219 0.000038 0.000051
+2016 5 12 57520 0.054310 0.486370 -0.1548622 0.0013825 -0.000121 0.000169 0.000040 0.000037 0.0000083 0.0000218 0.000038 0.000051
+2016 5 13 57521 0.056404 0.487318 -0.1562674 0.0014833 -0.000116 0.000138 0.000040 0.000037 0.0000083 0.0000217 0.000037 0.000050
+2016 5 14 57522 0.058449 0.488227 -0.1578078 0.0015993 -0.000089 0.000111 0.000040 0.000037 0.0000083 0.0000216 0.000037 0.000049
+2016 5 15 57523 0.060489 0.488845 -0.1594425 0.0016889 -0.000070 0.000091 0.000040 0.000037 0.0000082 0.0000215 0.000036 0.000047
+2016 5 16 57524 0.062541 0.489123 -0.1611736 0.0017588 -0.000052 0.000071 0.000040 0.000037 0.0000081 0.0000214 0.000035 0.000046
+2016 5 17 57525 0.064596 0.489631 -0.1629401 0.0017694 -0.000033 0.000052 0.000041 0.000037 0.0000079 0.0000215 0.000035 0.000044
+2016 5 18 57526 0.066405 0.490356 -0.1646544 0.0016973 -0.000015 0.000032 0.000041 0.000037 0.0000078 0.0000215 0.000035 0.000044
+2016 5 19 57527 0.068072 0.491169 -0.1662751 0.0016208 0.000069 0.000113 0.000041 0.000037 0.0000077 0.0000215 0.000035 0.000044
+2016 5 20 57528 0.069465 0.492157 -0.1678518 0.0015314 0.000171 0.000220 0.000042 0.000037 0.0000077 0.0000215 0.000036 0.000044
+2016 5 21 57529 0.070490 0.493108 -0.1693837 0.0014891 0.000182 0.000225 0.000042 0.000037 0.0000077 0.0000215 0.000037 0.000045
+2016 5 22 57530 0.071177 0.493705 -0.1708579 0.0014614 0.000159 0.000193 0.000042 0.000037 0.0000078 0.0000214 0.000038 0.000046
+2016 5 23 57531 0.072365 0.493821 -0.1722878 0.0014738 0.000136 0.000160 0.000042 0.000037 0.0000080 0.0000214 0.000040 0.000047
+2016 5 24 57532 0.074321 0.494178 -0.1737417 0.0014532 0.000113 0.000127 0.000042 0.000037 0.0000082 0.0000213 0.000041 0.000049
+2016 5 25 57533 0.076385 0.494842 -0.1751964 0.0013919 0.000027 0.000154 0.000042 0.000037 0.0000084 0.0000212 0.000042 0.000049
+2016 5 26 57534 0.078772 0.495446 -0.1765603 0.0013722 -0.000076 0.000195 0.000041 0.000037 0.0000086 0.0000212 0.000043 0.000049
+2016 5 27 57535 0.080936 0.496149 -0.1779234 0.0014259 -0.000179 0.000237 0.000041 0.000037 0.0000088 0.0000213 0.000042 0.000048
+2016 5 28 57536 0.082725 0.496557 -0.1794009 0.0015311 -0.000175 0.000226 0.000041 0.000038 0.0000089 0.0000214 0.000041 0.000045
+2016 5 29 57537 0.084953 0.496716 -0.1809563 0.0016745 -0.000132 0.000197 0.000041 0.000038 0.0000089 0.0000216 0.000039 0.000042
+2016 5 30 57538 0.087852 0.496543 -0.1827330 0.0017848 -0.000086 0.000163 0.000041 0.000037 0.0000087 0.0000215 0.000037 0.000044
+2016 5 31 57539 0.090449 0.496520 -0.1845656 0.0018361 -0.000044 0.000135 0.000041 0.000038 0.0000084 0.0000216 0.000034 0.000042
+2016 6 1 57540 0.092811 0.496627 -0.1863573 0.0018505 -0.000002 0.000106 0.000041 0.000038 0.0000082 0.0000217 0.000031 0.000040
+2016 6 2 57541 0.095142 0.496954 -0.1881951 0.0018034 0.000056 0.000082 0.000042 0.000037 0.0000079 0.0000217 0.000027 0.000039
+2016 6 3 57542 0.097085 0.497198 -0.1899368 0.0016599 0.000119 0.000060 0.000042 0.000038 0.0000077 0.0000216 0.000025 0.000037
+2016 6 4 57543 0.098855 0.497407 -0.1914948 0.0014486 0.000132 0.000047 0.000042 0.000038 0.0000076 0.0000216 0.000023 0.000035
+2016 6 5 57544 0.100111 0.497487 -0.1928438 0.0012462 0.000127 0.000039 0.000042 0.000038 0.0000075 0.0000216 0.000021 0.000034
+2016 6 6 57545 0.101542 0.497506 -0.1940884 0.0011521 0.000120 0.000029 0.000042 0.000037 0.0000074 0.0000204 0.000029 0.000034
+2016 6 7 57546 0.102732 0.497897 -0.1951955 0.0010516 0.000115 0.000020 0.000042 0.000037 0.0000072 0.0000208 0.000027 0.000031
+2016 6 8 57547 0.103655 0.497923 -0.1961933 0.0009801 0.000110 0.000012 0.000042 0.000037 0.0000067 0.0000210 0.000026 0.000030
+2016 6 9 57548 0.104843 0.497744 -0.1971955 0.0009288 0.000124 0.000039 0.000042 0.000037 0.0000065 0.0000209 0.000025 0.000029
+2016 6 10 57549 0.106099 0.497199 -0.1981290 0.0009072 0.000143 0.000076 0.000042 0.000037 0.0000063 0.0000210 0.000024 0.000028
+2016 6 11 57550 0.107658 0.496365 -0.1990509 0.0009016 0.000126 0.000078 0.000043 0.000038 0.0000062 0.0000210 0.000023 0.000027
+2016 6 12 57551 0.109472 0.495358 -0.1999818 0.0008965 0.000097 0.000069 0.000043 0.000038 0.0000060 0.0000212 0.000022 0.000026
+2016 6 13 57552 0.112205 0.494198 -0.2008783 0.0008530 0.000065 0.000059 0.000042 0.000038 0.0000059 0.0000211 0.000023 0.000026
+2016 6 14 57553 0.115224 0.493967 -0.2016865 0.0007766 0.000038 0.000049 0.000042 0.000038 0.0000058 0.0000213 0.000022 0.000025
+2016 6 15 57554 0.118004 0.494529 -0.2024448 0.0006857 0.000045 0.000041 0.000042 0.000038 0.0000057 0.0000214 0.000021 0.000024
+2016 6 16 57555 0.120758 0.494841 -0.2030978 0.0005615 0.000062 0.000034 0.000041 0.000038 0.0000056 0.0000216 0.000022 0.000024
+2016 6 17 57556 0.123707 0.494587 -0.2036267 0.0004808 0.000078 0.000026 0.000041 0.000038 0.0000055 0.0000217 0.000022 0.000024
+2016 6 18 57557 0.126322 0.494015 -0.2040509 0.0003784 0.000094 0.000019 0.000041 0.000038 0.0000054 0.0000218 0.000023 0.000024
+2016 6 19 57558 0.128283 0.493229 -0.2043703 0.0002979 0.000110 0.000011 0.000040 0.000038 0.0000054 0.0000219 0.000025 0.000025
+2016 6 20 57559 0.130444 0.492181 -0.2046364 0.0002322 0.000121 0.000005 0.000040 0.000038 0.0000055 0.0000220 0.000029 0.000027
+2016 6 21 57560 0.132244 0.491491 -0.2048536 0.0002252 0.000136 -0.000002 0.000040 0.000038 0.0000056 0.0000220 0.000032 0.000029
+2016 6 22 57561 0.134133 0.490650 -0.2050465 0.0002926 0.000131 0.000083 0.000040 0.000038 0.0000055 0.0000224 0.000035 0.000032
+2016 6 23 57562 0.136462 0.490218 -0.2054330 0.0004073 0.000121 0.000192 0.000040 0.000038 0.0000057 0.0000222 0.000038 0.000035
+2016 6 24 57563 0.138723 0.489571 -0.2058968 0.0005431 0.000107 0.000177 0.000039 0.000038 0.0000059 0.0000220 0.000040 0.000037
+2016 6 25 57564 0.140680 0.488915 -0.2065243 0.0007173 0.000092 0.000121 0.000039 0.000038 0.0000061 0.0000217 0.000040 0.000040
+2016 6 26 57565 0.142536 0.488733 -0.2073158 0.0008896 0.000077 0.000065 0.000040 0.000038 0.0000063 0.0000214 0.000039 0.000040
+2016 6 27 57566 0.144423 0.488176 -0.2083025 0.0010182 0.000071 0.000004 0.000039 0.000038 0.0000065 0.0000207 0.000035 0.000039
+2016 6 28 57567 0.146429 0.487234 -0.2093296 0.0011035 0.000058 -0.000053 0.000039 0.000037 0.0000066 0.0000205 0.000031 0.000035
+2016 6 29 57568 0.148617 0.486283 -0.2104126 0.0011016 0.000051 -0.000064 0.000039 0.000037 0.0000066 0.0000203 0.000037 0.000044
+2016 6 30 57569 0.150282 0.485394 -0.2114899 0.0010147 0.000045 -0.000063 0.000039 0.000037 0.0000067 0.0000201 0.000034 0.000041
+2016 7 1 57570 0.152170 0.483898 -0.2124527 0.0009294 0.000039 -0.000061 0.000039 0.000037 0.0000068 0.0000201 0.000032 0.000037
+2016 7 2 57571 0.154471 0.482588 -0.2133200 0.0008298 0.000033 -0.000060 0.000039 0.000037 0.0000068 0.0000201 0.000029 0.000033
+2016 7 3 57572 0.156598 0.481581 -0.2141277 0.0007178 0.000027 -0.000059 0.000039 0.000037 0.0000069 0.0000202 0.000027 0.000030
+2016 7 4 57573 0.158596 0.480596 -0.2147591 0.0006080 0.000021 -0.000058 0.000039 0.000037 0.0000064 0.0000204 0.000021 0.000023
+2016 7 5 57574 0.160581 0.479565 -0.2153081 0.0005503 0.000015 -0.000057 0.000039 0.000037 0.0000063 0.0000205 0.000020 0.000022
+2016 7 6 57575 0.162496 0.478474 -0.2158672 0.0005186 0.000103 -0.000011 0.000039 0.000037 0.0000063 0.0000207 0.000022 0.000024
+2016 7 7 57576 0.164394 0.477343 -0.2163752 0.0005161 0.000216 0.000047 0.000040 0.000037 0.0000063 0.0000208 0.000022 0.000024
+2016 7 8 57577 0.166448 0.476329 -0.2169021 0.0005582 0.000219 0.000047 0.000040 0.000037 0.0000063 0.0000210 0.000021 0.000023
+2016 7 9 57578 0.168610 0.475172 -0.2175152 0.0006023 0.000186 0.000029 0.000041 0.000038 0.0000063 0.0000211 0.000021 0.000023
+2016 7 10 57579 0.171376 0.473679 -0.2181624 0.0006066 0.000152 0.000010 0.000042 0.000038 0.0000064 0.0000213 0.000021 0.000022
+2016 7 11 57580 0.174133 0.472297 -0.2186829 0.0005217 0.000111 -0.000011 0.000042 0.000037 0.0000065 0.0000213 0.000023 0.000023
+2016 7 12 57581 0.176866 0.471119 -0.2191433 0.0004396 0.000072 -0.000030 0.000042 0.000037 0.0000066 0.0000213 0.000023 0.000022
+2016 7 13 57582 0.179326 0.470253 -0.2195596 0.0003688 0.000071 -0.000041 0.000042 0.000037 0.0000067 0.0000214 0.000025 0.000024
+2016 7 14 57583 0.181011 0.469217 -0.2198827 0.0002382 0.000080 -0.000049 0.000042 0.000037 0.0000068 0.0000214 0.000025 0.000024
+2016 7 15 57584 0.182783 0.468072 -0.2200479 0.0000898 0.000089 -0.000057 0.000042 0.000038 0.0000068 0.0000214 0.000025 0.000023
+2016 7 16 57585 0.184908 0.466714 -0.2200630 0.0000048 0.000097 -0.000065 0.000041 0.000038 0.0000069 0.0000214 0.000025 0.000022
+2016 7 17 57586 0.187160 0.465516 -0.2200451 -0.0000245 0.000106 -0.000073 0.000041 0.000038 0.0000069 0.0000214 0.000023 0.000021
+2016 7 18 57587 0.189629 0.464286 -0.2200336 -0.0000156 0.000114 -0.000082 0.000041 0.000038 0.0000069 0.0000214 0.000026 0.000023
+2016 7 19 57588 0.192218 0.463087 -0.2200072 0.0000503 0.000122 -0.000089 0.000041 0.000038 0.0000068 0.0000215 0.000025 0.000022
+2016 7 20 57589 0.194398 0.461969 -0.2200787 0.0001355 0.000120 -0.000090 0.000042 0.000039 0.0000067 0.0000217 0.000023 0.000021
+2016 7 21 57590 0.196209 0.460950 -0.2202607 0.0002237 0.000116 -0.000089 0.000043 0.000040 0.0000066 0.0000221 0.000020 0.000019
+2016 7 22 57591 0.198086 0.459731 -0.2205736 0.0003584 0.000113 -0.000088 0.000044 0.000042 0.0000064 0.0000226 0.000018 0.000018
+2016 7 23 57592 0.200181 0.458616 -0.2209836 0.0004546 0.000109 -0.000088 0.000046 0.000044 0.0000063 0.0000233 0.000017 0.000016
+2016 7 24 57593 0.202241 0.457580 -0.2214412 0.0005103 0.000105 -0.000087 0.000049 0.000047 0.0000061 0.0000240 0.000015 0.000015
+2016 7 25 57594 0.204257 0.456654 -0.2220002 0.0005638 0.000101 -0.000059 0.000040 0.000037 0.0000058 0.0000206 0.000017 0.000017
+2016 7 26 57595 0.206121 0.455997 -0.2225987 0.0005926 0.000098 -0.000082 0.000040 0.000037 0.0000059 0.0000204 0.000017 0.000017
+2016 7 27 57596 0.207505 0.455132 -0.2232011 0.0005739 0.000097 -0.000078 0.000040 0.000037 0.0000060 0.0000201 0.000016 0.000017
+2016 7 28 57597 0.208804 0.454230 -0.2237757 0.0005478 0.000096 -0.000066 0.000040 0.000037 0.0000062 0.0000198 0.000017 0.000017
+2016 7 29 57598 0.210095 0.453169 -0.2242930 0.0004710 0.000095 -0.000055 0.000040 0.000037 0.0000065 0.0000196 0.000017 0.000018
+2016 7 30 57599 0.211489 0.451842 -0.2247073 0.0003990 0.000094 -0.000044 0.000041 0.000037 0.0000068 0.0000195 0.000019 0.000019
+2016 7 31 57600 0.212567 0.450630 -0.2250793 0.0003475 0.000093 -0.000032 0.000041 0.000037 0.0000071 0.0000196 0.000021 0.000021
+2016 8 1 57601 0.213191 0.449351 -0.2254321 0.0003672 0.000092 -0.000021 0.000041 0.000037 0.0000074 0.0000196 0.000023 0.000022
+2016 8 2 57602 0.213304 0.448071 -0.2258343 0.0004298 0.000092 -0.000010 0.000041 0.000037 0.0000076 0.0000199 0.000023 0.000023
+2016 8 3 57603 0.214358 0.446083 -0.2263575 0.0005436 0.000094 -0.000011 0.000041 0.000037 0.0000073 0.0000204 0.000020 0.000020
+2016 8 4 57604 0.215792 0.444685 -0.2269202 0.0006077 0.000096 -0.000016 0.000041 0.000038 0.0000073 0.0000206 0.000020 0.000020
+2016 8 5 57605 0.217119 0.443279 -0.2275827 0.0006467 0.000099 -0.000021 0.000041 0.000038 0.0000074 0.0000209 0.000020 0.000020
+2016 8 6 57606 0.218386 0.442123 -0.2282619 0.0006955 0.000102 -0.000025 0.000041 0.000038 0.0000074 0.0000212 0.000021 0.000021
+2016 8 7 57607 0.219400 0.440574 -0.2289634 0.0007131 0.000104 -0.000030 0.000042 0.000039 0.0000074 0.0000215 0.000021 0.000021
+2016 8 8 57608 0.220583 0.439103 -0.2296718 0.0006977 0.000118 -0.000036 0.000023 0.000021 0.0000032 0.0000123 0.000018 0.000017
+2016 8 9 57609 0.221589 0.437692 -0.2303625 0.0006534 0.000114 -0.000053 0.000023 0.000021 0.0000033 0.0000124 0.000018 0.000017
+2016 8 10 57610 0.222638 0.436069 -0.2310476 0.0006394 0.000109 -0.000080 0.000031 0.000027 0.0000066 0.0000190 0.000036 0.000035
+2016 8 11 57611 0.223407 0.434281 -0.2316284 0.0005453 0.000101 -0.000111 0.000031 0.000027 0.0000067 0.0000192 0.000037 0.000036
+2016 8 12 57612 0.224367 0.432053 -0.2320804 0.0004180 0.000092 -0.000141 0.000032 0.000027 0.0000068 0.0000195 0.000038 0.000036
+2016 8 13 57613 0.225439 0.429785 -0.2324432 0.0003063 0.000084 -0.000172 0.000033 0.000027 0.0000069 0.0000198 0.000038 0.000037
+2016 8 14 57614 0.225998 0.427451 -0.2327313 0.0002609 0.000076 -0.000202 0.000034 0.000028 0.0000070 0.0000201 0.000039 0.000038
+2016 8 15 57615 0.226133 0.425003 -0.2329816 0.0003008 0.000057 -0.000168 0.000035 0.000029 0.0000069 0.0000200 0.000035 0.000032
+2016 8 16 57616 0.226465 0.422460 -0.2333170 0.0004153 0.000057 -0.000226 0.000035 0.000029 0.0000070 0.0000202 0.000035 0.000033
+2016 8 17 57617 0.226721 0.420211 -0.2337884 0.0005508 0.000058 -0.000284 0.000035 0.000030 0.0000071 0.0000204 0.000037 0.000035
+2016 8 18 57618 0.226917 0.418138 -0.2344143 0.0007058 0.000121 -0.000102 0.000036 0.000030 0.0000072 0.0000206 0.000038 0.000035
+2016 8 19 57619 0.227327 0.416103 -0.2352406 0.0009099 0.000194 -0.000077 0.000036 0.000030 0.0000073 0.0000209 0.000038 0.000035
+2016 8 20 57620 0.227569 0.414253 -0.2362207 0.0010253 0.000193 -0.000085 0.000036 0.000031 0.0000074 0.0000211 0.000038 0.000036
+2016 8 21 57621 0.227662 0.412192 -0.2373304 0.0010963 0.000165 -0.000081 0.000037 0.000031 0.0000075 0.0000214 0.000039 0.000036
+2016 8 22 57622 0.227893 0.410262 -0.2384286 0.0011263 0.000138 -0.000079 0.000035 0.000029 0.0000076 0.0000204 0.000040 0.000038
+2016 8 23 57623 0.228268 0.407929 -0.2395340 0.0010774 0.000109 -0.000074 0.000035 0.000029 0.0000076 0.0000206 0.000041 0.000039
+2016 8 24 57624 0.229234 0.405703 -0.2405792 0.0009961 0.000103 -0.000078 0.000036 0.000029 0.0000077 0.0000208 0.000039 0.000035
+2016 8 25 57625 0.230287 0.403864 -0.2415054 0.0008653 0.000102 -0.000085 0.000036 0.000030 0.0000078 0.0000210 0.000039 0.000036
+2016 8 26 57626 0.231434 0.401955 -0.2423223 0.0007521 0.000102 -0.000092 0.000036 0.000030 0.0000079 0.0000212 0.000040 0.000037
+2016 8 27 57627 0.232515 0.399947 -0.2430489 0.0006702 0.000102 -0.000098 0.000037 0.000030 0.0000080 0.0000214 0.000040 0.000037
+2016 8 28 57628 0.233795 0.397629 -0.2437170 0.0006215 0.000102 -0.000105 0.000037 0.000031 0.0000081 0.0000217 0.000040 0.000038
+2016 8 29 57629 0.234778 0.395756 -0.2443293 0.0006232 0.000102 -0.000112 0.000035 0.000029 0.0000080 0.0000207 0.000040 0.000036
+2016 8 30 57630 0.235414 0.393302 -0.2449645 0.0006893 0.000101 -0.000118 0.000035 0.000029 0.0000080 0.0000209 0.000040 0.000037
+2016 8 31 57631 0.235994 0.391019 -0.2456864 0.0007480 0.000088 -0.000106 0.000035 0.000029 0.0000081 0.0000210 0.000041 0.000037
+2016 9 1 57632 0.236472 0.389221 -0.2464507 0.0007861 0.000070 -0.000087 0.000036 0.000029 0.0000081 0.0000212 0.000041 0.000038
+2016 9 2 57633 0.236917 0.388023 -0.2472648 0.0008437 0.000053 -0.000068 0.000036 0.000030 0.0000082 0.0000215 0.000042 0.000039
+2016 9 3 57634 0.236689 0.387089 -0.2481694 0.0008948 0.000035 -0.000049 0.000036 0.000030 0.0000082 0.0000217 0.000042 0.000040
+2016 9 4 57635 0.236047 0.385769 -0.2491250 0.0009488 0.000018 -0.000031 0.000037 0.000030 0.0000082 0.0000220 0.000043 0.000040
+2016 9 5 57636 0.235162 0.384058 -0.2500891 0.0009590 0.000001 -0.000017 0.000035 0.000029 0.0000077 0.0000213 0.000043 0.000040
+2016 9 6 57637 0.234520 0.382142 -0.2510317 0.0009218 -0.000016 0.000001 0.000035 0.000029 0.0000077 0.0000215 0.000043 0.000041
+2016 9 7 57638 0.234348 0.380143 -0.2519171 0.0008790 -0.000020 0.000027 0.000035 0.000029 0.0000075 0.0000217 0.000042 0.000038
+2016 9 8 57639 0.234472 0.377961 -0.2527518 0.0008008 0.000000 0.000003 0.000035 0.000029 0.0000075 0.0000219 0.000042 0.000039
+2016 9 9 57640 0.234739 0.375707 -0.2535144 0.0007200 0.000029 -0.000032 0.000034 0.000028 0.0000075 0.0000206 0.000043 0.000040
+2016 9 10 57641 0.234677 0.373773 -0.2541955 0.0006835 0.000059 -0.000067 0.000034 0.000028 0.0000075 0.0000208 0.000044 0.000040
+2016 9 11 57642 0.234635 0.371737 -0.2548795 0.0007185 0.000089 -0.000103 0.000034 0.000029 0.0000075 0.0000209 0.000044 0.000041
+2016 9 12 57643 0.235150 0.369842 -0.2556315 0.0007584 0.000118 -0.000138 0.000034 0.000029 0.0000074 0.0000203 0.000045 0.000042
+2016 9 13 57644 0.235702 0.367858 -0.2563977 0.0008143 0.000148 -0.000174 0.000034 0.000029 0.0000074 0.0000204 0.000045 0.000042
+2016 9 14 57645 0.236140 0.366120 -0.2572526 0.0009618 0.000119 -0.000163 0.000035 0.000029 0.0000071 0.0000215 0.000041 0.000038
+2016 9 15 57646 0.236299 0.364419 -0.2583099 0.0011449 0.000071 -0.000138 0.000035 0.000030 0.0000071 0.0000216 0.000041 0.000038
+2016 9 16 57647 0.236935 0.362487 -0.2595654 0.0013206 0.000023 -0.000113 0.000036 0.000030 0.0000071 0.0000218 0.000042 0.000039
+2016 9 17 57648 0.237304 0.360527 -0.2609397 0.0014492 -0.000025 -0.000088 0.000036 0.000030 0.0000070 0.0000219 0.000042 0.000039
+2016 9 18 57649 0.237599 0.358716 -0.2623923 0.0014946 -0.000073 -0.000062 0.000036 0.000031 0.0000070 0.0000221 0.000043 0.000039
+2016 9 19 57650 0.237480 0.357023 -0.2638949 0.0014834 -0.000121 -0.000037 0.000033 0.000028 0.0000069 0.0000181 0.000045 0.000041
+2016 9 20 57651 0.237348 0.355106 -0.2653634 0.0014397 -0.000169 -0.000012 0.000034 0.000028 0.0000069 0.0000180 0.000045 0.000041
+2016 9 21 57652 0.236960 0.353136 -0.2667541 0.0013236 -0.000145 -0.000018 0.000034 0.000029 0.0000069 0.0000157 0.000046 0.000042
+2016 9 22 57653 0.236630 0.350957 -0.2679836 0.0011663 -0.000103 -0.000034 0.000034 0.000029 0.0000069 0.0000155 0.000047 0.000043
+2016 9 23 57654 0.236354 0.348962 -0.2691070 0.0010850 -0.000061 -0.000049 0.000034 0.000029 0.0000070 0.0000153 0.000047 0.000044
+2016 9 24 57655 0.235756 0.346910 -0.2701936 0.0010763 -0.000018 -0.000064 0.000035 0.000029 0.0000070 0.0000151 0.000048 0.000045
+2016 9 25 57656 0.235125 0.344548 -0.2712425 0.0011034 0.000024 -0.000080 0.000035 0.000029 0.0000070 0.0000148 0.000048 0.000046
+2016 9 26 57657 0.234841 0.342161 -0.2723752 0.0011514 0.000082 -0.000091 0.000033 0.000028 0.0000061 0.0000197 0.000040 0.000037
+2016 9 27 57658 0.234186 0.339769 -0.2735790 0.0012251 0.000122 -0.000106 0.000033 0.000028 0.0000062 0.0000197 0.000040 0.000038
+2016 9 28 57659 0.233624 0.336981 -0.2748204 0.0012919 0.000122 -0.000114 0.000032 0.000027 0.0000063 0.0000191 0.000041 0.000039
+2016 9 29 57660 0.233922 0.334418 -0.2761489 0.0013810 0.000112 -0.000120 0.000032 0.000027 0.0000064 0.0000191 0.000042 0.000040
+2016 9 30 57661 0.234157 0.332598 -0.2775772 0.0014116 0.000102 -0.000126 0.000033 0.000027 0.0000065 0.0000191 0.000043 0.000041
+2016 10 1 57662 0.233710 0.331033 -0.2789856 0.0013849 0.000092 -0.000132 0.000033 0.000028 0.0000066 0.0000191 0.000043 0.000042
+2016 10 2 57663 0.232703 0.329531 -0.2803453 0.0013189 0.000081 -0.000138 0.000033 0.000028 0.0000067 0.0000192 0.000044 0.000043
+2016 10 3 57664 0.231388 0.327920 -0.2816152 0.0012207 0.000073 -0.000142 0.000033 0.000028 0.0000064 0.0000178 0.000044 0.000043
+2016 10 4 57665 0.229633 0.326142 -0.2827883 0.0011388 0.000062 -0.000149 0.000033 0.000028 0.0000064 0.0000177 0.000044 0.000044
+2016 10 5 57666 0.227445 0.324728 -0.2839001 0.0010772 0.000048 -0.000158 0.000032 0.000027 0.0000063 0.0000189 0.000040 0.000040
+2016 10 6 57667 0.225248 0.322950 -0.2849592 0.0010297 0.000042 -0.000118 0.000032 0.000027 0.0000063 0.0000189 0.000040 0.000040
+2016 10 7 57668 0.223420 0.321404 -0.2859455 0.0009849 0.000037 -0.000065 0.000033 0.000028 0.0000064 0.0000190 0.000041 0.000041
+2016 10 8 57669 0.221736 0.319559 -0.2869081 0.0009555 0.000059 -0.000055 0.000033 0.000028 0.0000065 0.0000190 0.000041 0.000042
+2016 10 9 57670 0.220903 0.317727 -0.2878658 0.0010113 0.000090 -0.000062 0.000033 0.000028 0.0000065 0.0000190 0.000042 0.000042
+2016 10 10 57671 0.220796 0.315984 -0.2889328 0.0011552 0.000112 -0.000065 0.000033 0.000028 0.0000062 0.0000172 0.000031 0.000032
+2016 10 11 57672 0.220783 0.314038 -0.2901511 0.0013332 0.000140 -0.000071 0.000034 0.000028 0.0000063 0.0000172 0.000031 0.000032
+2016 10 12 57673 0.220486 0.312507 -0.2915676 0.0015189 0.000175 -0.000079 0.000034 0.000029 0.0000064 0.0000174 0.000033 0.000033
+2016 10 13 57674 0.220125 0.311194 -0.2931858 0.0017253 0.000169 -0.000070 0.000034 0.000029 0.0000064 0.0000173 0.000033 0.000033
+2016 10 14 57675 0.219087 0.310363 -0.2950257 0.0019249 0.000154 -0.000057 0.000034 0.000029 0.0000064 0.0000173 0.000033 0.000033
+2016 10 15 57676 0.217450 0.309273 -0.2970388 0.0020662 0.000138 -0.000044 0.000035 0.000030 0.0000064 0.0000172 0.000033 0.000034
+2016 10 16 57677 0.215478 0.307920 -0.2991251 0.0020963 0.000123 -0.000030 0.000035 0.000030 0.0000064 0.0000172 0.000034 0.000034
+2016 10 17 57678 0.213493 0.306154 -0.3011774 0.0019872 0.000092 -0.000035 0.000034 0.000029 0.0000054 0.0000191 0.000027 0.000027
+2016 10 18 57679 0.211726 0.304035 -0.3031004 0.0018485 0.000088 -0.000012 0.000034 0.000029 0.0000055 0.0000192 0.000027 0.000027
+2016 10 19 57680 0.210013 0.302114 -0.3048682 0.0016679 0.000080 -0.000011 0.000035 0.000029 0.0000055 0.0000194 0.000029 0.000026
+2016 10 20 57681 0.208059 0.300051 -0.3064760 0.0015069 0.000087 -0.000016 0.000035 0.000030 0.0000056 0.0000196 0.000030 0.000026
+2016 10 21 57682 0.206220 0.298124 -0.3079303 0.0014439 0.000093 -0.000020 0.000036 0.000030 0.0000056 0.0000198 0.000030 0.000027
+2016 10 22 57683 0.204234 0.296491 -0.3093373 0.0014158 0.000099 -0.000024 0.000036 0.000030 0.0000056 0.0000200 0.000030 0.000027
+2016 10 23 57684 0.202737 0.294748 -0.3107499 0.0014213 0.000105 -0.000028 0.000037 0.000031 0.0000056 0.0000202 0.000031 0.000027
+2016 10 24 57685 0.201485 0.293563 -0.3121853 0.0014284 0.000020 -0.000328 0.000035 0.000029 0.0000057 0.0000195 0.000030 0.000025
+2016 10 25 57686 0.199996 0.291844 -0.3136034 0.0014675 0.000098 -0.000100 0.000035 0.000029 0.0000057 0.0000197 0.000030 0.000025
+2016 10 26 57687 0.198817 0.289847 -0.3150837 0.0014806 0.000130 -0.000032 0.000036 0.000030 0.0000058 0.0000196 0.000033 0.000031
+2016 10 27 57688 0.197049 0.288207 -0.3165577 0.0014575 0.000134 -0.000039 0.000036 0.000030 0.0000059 0.0000197 0.000034 0.000032
+2016 10 28 57689 0.194877 0.286749 -0.3180238 0.0014750 0.000137 -0.000046 0.000037 0.000030 0.0000059 0.0000199 0.000034 0.000032
+2016 10 29 57690 0.192868 0.285462 -0.3195011 0.0014976 0.000141 -0.000053 0.000037 0.000031 0.0000059 0.0000200 0.000035 0.000033
+2016 10 30 57691 0.191533 0.284560 -0.3209768 0.0014901 0.000144 -0.000060 0.000038 0.000031 0.0000060 0.0000202 0.000035 0.000033
+2016 10 31 57692 0.190141 0.283654 -0.3224586 0.0013961 0.000147 -0.000073 0.000036 0.000029 0.0000058 0.0000198 0.000036 0.000031
+2016 11 1 57693 0.188741 0.282469 -0.3238253 0.0013523 0.000151 -0.000080 0.000036 0.000029 0.0000058 0.0000200 0.000037 0.000032
+2016 11 2 57694 0.187251 0.281561 -0.3251438 0.0013031 0.000162 -0.000136 0.000036 0.000030 0.0000058 0.0000165 0.000037 0.000031
+2016 11 3 57695 0.185888 0.280438 -0.3264000 0.0012215 0.000184 -0.000213 0.000037 0.000030 0.0000059 0.0000164 0.000038 0.000032
+2016 11 4 57696 0.185057 0.279384 -0.3276237 0.0012340 0.000206 -0.000290 0.000037 0.000030 0.0000059 0.0000162 0.000038 0.000033
+2016 11 5 57697 0.183910 0.278993 -0.3288929 0.0013017 0.000228 -0.000367 0.000037 0.000031 0.0000060 0.0000161 0.000039 0.000034
+2016 11 6 57698 0.182076 0.278910 -0.3302459 0.0014064 0.000250 -0.000444 0.000038 0.000031 0.0000060 0.0000160 0.000039 0.000035
+2016 11 7 57699 0.179463 0.278804 -0.3317062 0.0015241 0.000269 -0.000518 0.000038 0.000032 0.0000059 0.0000211 0.000033 0.000030
+2016 11 8 57700 0.176446 0.278331 -0.3332821 0.0016384 0.000022 -0.000302 0.000039 0.000032 0.0000059 0.0000213 0.000033 0.000030
+2016 11 9 57701 0.173555 0.277697 -0.3350135 0.0018134 -0.000032 -0.000243 0.000036 0.000029 0.0000060 0.0000202 0.000032 0.000030
+2016 11 10 57702 0.171310 0.277035 -0.3369133 0.0019826 -0.000022 -0.000239 0.000037 0.000030 0.0000060 0.0000203 0.000033 0.000031
+2016 11 11 57703 0.169401 0.276436 -0.3389563 0.0020983 -0.000011 -0.000234 0.000037 0.000030 0.0000060 0.0000205 0.000033 0.000031
+2016 11 12 57704 0.167426 0.275398 -0.3411185 0.0021562 0.000000 -0.000230 0.000038 0.000030 0.0000060 0.0000207 0.000034 0.000031
+2016 11 13 57705 0.165552 0.274273 -0.3432557 0.0021221 0.000011 -0.000225 0.000038 0.000031 0.0000059 0.0000209 0.000034 0.000032
+2016 11 14 57706 0.163590 0.273281 -0.3452758 0.0019493 0.000115 -0.000151 0.000004 0.000004 0.0000112 0.0000032 0.000035 0.000030
+2016 11 15 57707 0.161315 0.272206 -0.3471023 0.0017217 0.000129 -0.000142 0.000004 0.000004 0.0000113 0.0000033 0.000035 0.000030
+2016 11 16 57708 0.158957 0.271395 -0.3487222 0.0014955 0.000131 -0.000154 0.000004 0.000004 0.0000076 0.0000033 0.000028 0.000029
+2016 11 17 57709 0.156640 0.270774 -0.3500768 0.0013363 0.000138 -0.000154 0.000004 0.000004 0.0000080 0.0000033 0.000028 0.000029
+2016 11 18 57710 0.155065 0.270416 -0.3513702 0.0012606 0.000146 -0.000153 0.000004 0.000005 0.0000083 0.0000033 0.000029 0.000030
+2016 11 19 57711 0.153312 0.270252 -0.3526213 0.0013009 0.000154 -0.000153 0.000005 0.000005 0.0000086 0.0000033 0.000029 0.000030
+2016 11 20 57712 0.151082 0.270002 -0.3539606 0.0013752 0.000161 -0.000153 0.000005 0.000005 0.0000089 0.0000033 0.000030 0.000031
+2016 11 21 57713 0.148289 0.269509 -0.3553341 0.0014326 0.000168 -0.000152 0.000005 0.000005 0.0000094 0.0000033 0.000029 0.000033
+2016 11 22 57714 0.146001 0.268959 -0.3567960 0.0015127 0.000176 -0.000154 0.000005 0.000005 0.0000097 0.0000033 0.000030 0.000034
+2016 11 23 57715 0.144034 0.268665 -0.3583384 0.0015707 0.000064 -0.000164 0.000003 0.000004 0.0000083 0.0000034 0.000029 0.000031
+2016 11 24 57716 0.142531 0.268381 -0.3599235 0.0016032 -0.000079 -0.000176 0.000003 0.000004 0.0000086 0.0000034 0.000030 0.000032
+2016 11 25 57717 0.141273 0.268400 -0.3616385 0.0015676 -0.000223 -0.000188 0.000004 0.000004 0.0000089 0.0000034 0.000030 0.000032
+2016 11 26 57718 0.140279 0.268329 -0.3630973 0.0015113 -0.000197 -0.000166 0.000004 0.000004 0.0000092 0.0000034 0.000031 0.000033
+2016 11 27 57719 0.139103 0.268540 -0.3645137 0.0014463 -0.000095 -0.000129 0.000004 0.000004 0.0000095 0.0000034 0.000031 0.000033
+2016 11 28 57720 0.137064 0.268762 -0.3659093 0.0013474 0.000007 -0.000093 0.000004 0.000004 0.0000078 0.0000034 0.000028 0.000029
+2016 11 29 57721 0.134436 0.268375 -0.3672144 0.0012561 0.000109 -0.000057 0.000004 0.000004 0.0000078 0.0000034 0.000028 0.000029
+2016 11 30 57722 0.132038 0.267901 -0.3684802 0.0012267 0.000116 -0.000081 0.000004 0.000004 0.0000077 0.0000033 0.000027 0.000026
+2016 12 1 57723 0.129858 0.267382 -0.3697225 0.0012334 0.000102 -0.000126 0.000004 0.000004 0.0000077 0.0000033 0.000028 0.000026
+2016 12 2 57724 0.127974 0.266993 -0.3709021 0.0012125 0.000086 -0.000129 0.000004 0.000004 0.0000076 0.0000033 0.000028 0.000026
+2016 12 3 57725 0.126040 0.266855 -0.3721236 0.0012161 0.000068 -0.000119 0.000004 0.000005 0.0000075 0.0000033 0.000028 0.000027
+2016 12 4 57726 0.124161 0.266484 -0.3733167 0.0012461 0.000050 -0.000109 0.000004 0.000005 0.0000074 0.0000032 0.000029 0.000028
+2016 12 5 57727 0.122463 0.266303 -0.3746454 0.0013295 0.000033 -0.000098 0.000003 0.000004 0.0000075 0.0000033 0.000031 0.000029
+2016 12 6 57728 0.120687 0.266003 -0.3760474 0.0014348 0.000011 -0.000088 0.000003 0.000004 0.0000074 0.0000033 0.000031 0.000030
+2016 12 7 57729 0.119514 0.265689 -0.3775610 0.0015512 0.000011 -0.000094 0.000004 0.000004 0.0000078 0.0000033 0.000033 0.000029
+2016 12 8 57730 0.118630 0.265515 -0.3791750 0.0016703 0.000000 -0.000102 0.000004 0.000004 0.0000077 0.0000033 0.000034 0.000029
+2016 12 9 57731 0.118249 0.265578 -0.3809296 0.0017654 -0.000010 -0.000110 0.000004 0.000004 0.0000076 0.0000034 0.000034 0.000030
+2016 12 10 57732 0.118049 0.265938 -0.3827302 0.0017945 -0.000020 -0.000118 0.000004 0.000004 0.0000074 0.0000034 0.000035 0.000030
+2016 12 11 57733 0.118091 0.266269 -0.3845245 0.0017381 -0.000030 -0.000126 0.000004 0.000004 0.0000073 0.0000034 0.000035 0.000031
+2016 12 12 57734 0.117668 0.266845 -0.3861946 0.0016206 -0.000037 -0.000135 0.000004 0.000004 0.0000071 0.0000033 0.000037 0.000033
+2016 12 13 57735 0.116437 0.267264 -0.3877013 0.0014125 -0.000047 -0.000143 0.000004 0.000004 0.0000068 0.0000033 0.000037 0.000034
+2016 12 14 57736 0.114709 0.267418 -0.3890154 0.0012512 -0.000077 -0.000209 0.000004 0.000004 0.0000068 0.0000034 0.000026 0.000024
+2016 12 15 57737 0.113031 0.267402 -0.3902468 0.0012505 -0.000106 -0.000277 0.000004 0.000004 0.0000071 0.0000034 0.000026 0.000025
+2016 12 16 57738 0.111752 0.267236 -0.3915298 0.0012590 -0.000100 -0.000275 0.000004 0.000004 0.0000073 0.0000034 0.000027 0.000025
+2016 12 17 57739 0.110836 0.266516 -0.3927593 0.0012788 -0.000080 -0.000247 0.000004 0.000004 0.0000076 0.0000034 0.000027 0.000026
+2016 12 18 57740 0.109761 0.266078 -0.3940294 0.0012696 -0.000060 -0.000220 0.000004 0.000004 0.0000079 0.0000034 0.000028 0.000026
+2016 12 19 57741 0.108487 0.265822 -0.3953003 0.0012667 -0.000051 -0.000173 0.000003 0.000004 0.0000072 0.0000033 0.000033 0.000031
+2016 12 20 57742 0.106552 0.266044 -0.3965651 0.0012727 -0.000031 -0.000146 0.000003 0.000004 0.0000073 0.0000033 0.000033 0.000031
+2016 12 21 57743 0.103678 0.265896 -0.3978405 0.0012808 -0.000011 -0.000119 0.000004 0.000004 0.0000073 0.0000032 0.000036 0.000032
+2016 12 22 57744 0.100759 0.265703 -0.3990977 0.0012498 -0.000014 -0.000107 0.000004 0.000004 0.0000075 0.0000032 0.000036 0.000033
+2016 12 23 57745 0.098049 0.265183 -0.4003418 0.0012025 -0.000021 -0.000099 0.000004 0.000004 0.0000078 0.0000031 0.000037 0.000035
+2016 12 24 57746 0.095596 0.264626 -0.4014906 0.0011215 -0.000029 -0.000090 0.000004 0.000004 0.0000080 0.0000031 0.000038 0.000036
+2016 12 25 57747 0.093343 0.264470 -0.4025437 0.0010550 -0.000037 -0.000082 0.000004 0.000004 0.0000082 0.0000031 0.000038 0.000037
+2016 12 26 57748 0.091182 0.264608 -0.4035274 0.0009454 -0.000014 -0.000045 0.000004 0.000004 0.0000084 0.0000030 0.000034 0.000035
+2016 12 27 57749 0.089160 0.264588 -0.4044647 0.0008639 -0.000020 -0.000035 0.000004 0.000004 0.0000086 0.0000030 0.000038 0.000036
+2016 12 28 57750 0.086807 0.264711 -0.4052870 0.0008207 -0.000025 -0.000024 0.000004 0.000004 0.0000088 0.0000030 0.000038 0.000037
+2016 12 29 57751 0.084589 0.264175 -0.4060935 0.0008091 -0.000024 -0.000029 0.000004 0.000004 0.0000090 0.0000030 0.000039 0.000038
+2016 12 30 57752 0.082924 0.263518 -0.4069106 0.0008507 -0.000023 -0.000038 0.000004 0.000004 0.0000091 0.0000030 0.000039 0.000039
+2016 12 31 57753 0.081318 0.262990 -0.4077600 0.0009208 -0.000021 -0.000048 0.000004 0.000004 0.0000093 0.0000030 0.000040 0.000039
diff --git a/src/test/resources/replay/replay-direct-loc-01.txt b/src/test/resources/replay/replay-direct-loc-01.txt
index 605137c074b2847a80a86373678b8ecd2a286155..b66094af394ae6eded8700e7a78e228eefcbe3aa 100644
--- a/src/test/resources/replay/replay-direct-loc-01.txt
+++ b/src/test/resources/replay/replay-direct-loc-01.txt
@@ -1,6 +1,6 @@
# Rugged library dump file, created on 2015-02-11T14:08:32Z
# all units are SI units (m, m/s, rad ...)
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.547095802227720e-01 6.560590289905073e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.547095802227720e-01 6.560590289905073e-01 lightTime true aberration true refraction false
span: minDate 2012-01-01T12:29:59.85000000000000Z maxDate 2012-01-01T12:30:00.15000000000000Z tStep 1.000000000000000e-03 tolerance 5.000000000000000e+00 inertialFrame EME2000
transform: index 150 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.384771423708159e+04 3.157872644483112e+03 -7.179504513218164e+06 v -3.193269831348565e+01 -8.025700179158079e+00 8.276060585645734e+00 a -9.306388141791047e-01 -8.320023410534990e+00 1.352798021525103e-03 r -6.828948932066574e-01 4.142451147005848e-01 -3.878489669799004e-01 4.600312256701621e-01 Ω -1.009835959093257e-03 1.982938126604663e-04 1.645927204535755e-04 ΩDot -3.647403055483546e-07 2.008714378022283e-07 -1.257148591486377e-06
ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
@@ -30,7 +30,7 @@ DEM cell: t0 latIndex 99 lonIndex 50 elevation 4.265142906455210e+01
DEM cell: t0 latIndex 97 lonIndex 50 elevation 4.500756443755694e+01
DEM cell: t0 latIndex 97 lonIndex 51 elevation 7.421501844304876e+01
direct location result: latitude -3.947445425992010e-01 longitude 2.499243584750142e+00 elevation 8.434706922629509e+01
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.548246479094037e-01 6.559266353095021e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.548246479094037e-01 6.559266353095021e-01 lightTime true aberration true refraction false
DEM cell: t0 latIndex 96 lonIndex 52 elevation 1.110753711365716e+02
DEM cell: t0 latIndex 97 lonIndex 52 elevation 8.027308091623061e+01
DEM cell: t0 latIndex 96 lonIndex 53 elevation 1.950053829821900e+02
@@ -40,7 +40,7 @@ DEM cell: t0 latIndex 98 lonIndex 49 elevation -2.653137720265925e+01
DEM cell: t0 latIndex 97 lonIndex 48 elevation -9.460844691182658e+01
DEM cell: t0 latIndex 98 lonIndex 48 elevation -6.303622859747302e+01
direct location result: latitude -3.947611273580563e-01 longitude 2.499133846389992e+00 elevation -4.295871413137783e+01
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.595223858294946e-01 6.504811645419663e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.595223858294946e-01 6.504811645419663e-01 lightTime true aberration true refraction false
DEM cell: t0 latIndex 91 lonIndex 0 elevation -4.644285910379659e+02
DEM cell: t0 latIndex 92 lonIndex 0 elevation -6.361521230433466e+02
DEM cell: t0 latIndex 91 lonIndex 1 elevation -6.695324221432916e+02
@@ -62,7 +62,7 @@ DEM cell: t0 latIndex 90 lonIndex 2 elevation -7.924361301694835e+02
DEM cell: t0 latIndex 91 lonIndex 2 elevation -7.590003401646543e+02
DEM cell: t0 latIndex 90 lonIndex 0 elevation -5.786400093316511e+02
direct location result: latitude -3.952555711362365e-01 longitude 2.495847653590435e+00 elevation -5.905034290161145e+02
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.596364750290255e-01 6.503479267326657e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.596364750290255e-01 6.503479267326657e-01 lightTime true aberration true refraction false
DEM tile: t1 latMin -4.014257279586958e-01 latStep 6.817692390602850e-05 latRows 257 lonMin 2.478367537831948e+00 lonStep 6.817692390602850e-05 lonCols 257
DEM cell: t1 latIndex 192 lonIndex 0 elevation -1.282721242683617e+03
DEM cell: t1 latIndex 80 lonIndex 192 elevation 3.211682285355159e+03
@@ -74,7 +74,7 @@ DEM cell: t1 latIndex 92 lonIndex 256 elevation -6.361521230433466e+02
DEM cell: t1 latIndex 91 lonIndex 257 elevation -6.361521230433466e+02
DEM cell: t1 latIndex 92 lonIndex 257 elevation -5.119072938899205e+02
direct location result: latitude -3.952672865845636e-01 longitude 2.495769458919830e+00 elevation -5.923807760050810e+02
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.597505408555608e-01 6.502146689130315e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.597505408555608e-01 6.502146689130315e-01 lightTime true aberration true refraction false
DEM cell: t1 latIndex 92 lonIndex 248 elevation -1.470524675650724e+02
DEM cell: t1 latIndex 93 lonIndex 248 elevation -1.448837787295385e+02
DEM cell: t1 latIndex 92 lonIndex 249 elevation -2.503632800423777e+02
diff --git a/src/test/resources/replay/replay-direct-loc-02.txt b/src/test/resources/replay/replay-direct-loc-02.txt
index e79f13b9f2f044202f61dde120642515aef11a7d..a8197128955232ca3701f71abb03816d57d0d745 100644
--- a/src/test/resources/replay/replay-direct-loc-02.txt
+++ b/src/test/resources/replay/replay-direct-loc-02.txt
@@ -1,6 +1,6 @@
# Rugged library dump file, created on 2015-04-23T15:12:38Z
# all units are SI units (m, m/s, rad ...)
-direct location: date 2013-07-09T08:04:01.64555485306736Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los -2.397859534323394e-02 1.069618325126766e-01 9.939739399066714e-01 lightTime false aberration false
+direct location: date 2013-07-09T08:04:01.64555485306736Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los -2.397859534323394e-02 1.069618325126766e-01 9.939739399066714e-01 lightTime false aberration false refraction false
span: minDate 2013-07-09T07:44:31.00000000000000Z maxDate 2013-07-09T08:13:29.00000000000000Z tStep 1.000000000000000e-01 tolerance 1.000000000000000e+01 inertialFrame EME2000
transform: index 11706 body r -9.126227111915787e-01 2.903948203646350e-04 6.031760832458322e-04 4.088023224821415e-01 Ω -9.759363848525831e-08 2.685469893129743e-09 -7.292108611062513e-05 ΩDot -2.894633518922737e-16 -1.401923338483166e-16 3.822089661987461e-19 spacecraft p -9.813172457506880e-01 -2.293861089274287e-01 -7.170114055550980e+06 v 1.721804626498136e-02 -5.160520845023520e-02 -8.541224850640113e+00 a -3.826063343921664e-01 -2.431259446863342e+00 6.594385725102986e-03 r -5.316321568749174e-01 5.693171838660510e-01 4.158849079021506e-01 -4.693452218895723e-01 Ω 1.024382530168276e-03 -9.422884774760976e-05 1.535223674917447e-04 ΩDot -1.147097938604457e-08 1.286556172365012e-07 3.416768201783130e-07
algorithm: DUVENHAGE
diff --git a/src/test/resources/replay/replay-direct-loc-03.txt b/src/test/resources/replay/replay-direct-loc-03.txt
index 1643cd1aff495591786d629e13e1c6c5c1ce9336..19a942f3459951bf74cd16669baa77f3df853b87 100644
--- a/src/test/resources/replay/replay-direct-loc-03.txt
+++ b/src/test/resources/replay/replay-direct-loc-03.txt
@@ -1,6 +1,6 @@
# Rugged library dump file, created on 2015-06-17T12:40:59Z
# all units are SI units (m, m/s, rad ...)
-direct location: date 2009-12-10T19:49:15.69409696600003Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los -2.222227735527040e-02 -9.103563670459193e-02 9.955996601239552e-01 lightTime false aberration false
+direct location: date 2009-12-10T19:49:15.69409696600003Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los -2.222227735527040e-02 -9.103563670459193e-02 9.955996601239552e-01 lightTime false aberration false refraction false
span: minDate 2009-12-10T19:43:11.00000000000000Z maxDate 2009-12-10T19:54:00.00000000000000Z tStep 1.000000000000000e-01 tolerance 1.000000000000000e+01 inertialFrame EME2000
transform: index 3647 body r -9.892006943727071e-01 6.548538144006332e-05 4.928252940714298e-04 1.465665005635631e-01 Ω -7.256918583080753e-08 -1.041477941363816e-09 -7.292111444123439e-05 ΩDot -1.633367752479824e-16 1.747255489539140e-16 1.600518399853031e-19 spacecraft p 1.915468890219927e-01 -8.990556518547237e-01 -7.156923547128990e+06 v -2.488758510805678e-02 8.481932866150421e-02 -4.020837052430704e+00 a -2.066722296571628e-01 -2.090489712840085e+00 -7.003752909213540e-03 r -1.763451310531075e-01 -4.315699021299694e-01 8.655337192606597e-01 1.830333170551214e-01 Ω -8.737537450216512e-04 5.311070290168704e-04 2.103617306756347e-04 ΩDot 1.145446212396803e-07 1.919398959490098e-07 6.635983002829190e-08
algorithm: DUVENHAGE
diff --git a/src/test/resources/replay/replay-direct-loc-04.txt b/src/test/resources/replay/replay-direct-loc-04.txt
index c0f72295b154107887802b1190c2c0558d78df94..5468b6887025efc71866a6ac66a771d3f068d5be 100644
--- a/src/test/resources/replay/replay-direct-loc-04.txt
+++ b/src/test/resources/replay/replay-direct-loc-04.txt
@@ -3,15 +3,15 @@
sensor: sensorName s0 nbPixels 200 position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01
sensor datation: sensorName s0 lineNumber 1.000000000000000e+02 date 2012-01-01T12:30:00.00000000000000Z
sensor LOS: sensorName s0 date 2012-01-01T12:30:00.00000000000000Z pixelNumber 0 los 0.000000000000000e+00 -7.547095802227720e-01 6.560590289905073e-01
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.547095802227720e-01 6.560590289905073e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.547095802227720e-01 6.560590289905073e-01 lightTime true aberration true refraction false
span: minDate 2012-01-01T12:29:59.85000000000000Z maxDate 2012-01-01T12:30:00.15000000000000Z tStep 1.000000000000000e-03 tolerance 5.000000000000000e+00 inertialFrame EME2000
transform: index 150 body r -8.085963389171905e-01 -3.465415132634738e-04 4.896468952577882e-04 -5.883634938068593e-01 Ω -8.740475539607400e-08 1.215132816692757e-09 -7.292109805268452e-05 ΩDot -1.641702845856317e-16 8.967282378770661e-17 1.982686818602039e-19 spacecraft p 1.384771423699730e+04 3.157872644810937e+03 -7.179504513218164e+06 v -3.193269795630194e+01 -8.025701643721955e+00 8.276060585691415e+00 a -9.306383564355984e-01 -8.320024052654388e+00 1.352798609222994e-03 r -6.828948932119083e-01 4.142451147050121e-01 -3.878489669751732e-01 4.600312256623658e-01 Ω -1.009835943938631e-03 1.982939067387613e-04 1.645926841490188e-04 ΩDot -3.647402648477413e-07 2.008713174452711e-07 -1.257148546282535e-06
ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
algorithm: CONSTANT_ELEVATION_OVER_ELLIPSOID elevation 1.000000000000000e+02
direct location result: latitude -3.947439031048142e-01 longitude 2.499247813392400e+00 elevation 1.000000008142965e+02
sensor LOS: sensorName s0 date 2012-01-01T12:30:00.00000000000000Z pixelNumber 1 los 0.000000000000000e+00 -7.548246479094037e-01 6.559266353095021e-01
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.548246479094037e-01 6.559266353095021e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.548246479094037e-01 6.559266353095021e-01 lightTime true aberration true refraction false
direct location result: latitude -3.947552846081879e-01 longitude 2.499172490136166e+00 elevation 1.000000008170387e+02
sensor LOS: sensorName s0 date 2012-01-01T12:30:00.00000000000000Z pixelNumber 2 los 0.000000000000000e+00 -7.549396923710934e-01 6.557942214465139e-01
-direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.549396923710934e-01 6.557942214465139e-01 lightTime true aberration true
+direct location: date 2012-01-01T12:30:00.00000000000000Z position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01 los 0.000000000000000e+00 -7.549396923710934e-01 6.557942214465139e-01 lightTime true aberration true refraction false
direct location result: latitude -3.947666718219440e-01 longitude 2.499097114958829e+00 elevation 1.000000008196107e+02
diff --git a/src/test/resources/replay/replay-direct-loc-Issue376-01.txt b/src/test/resources/replay/replay-direct-loc-Issue376-01.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8d3a0975b33115277140dea55a7c5e7a273c50a2
--- /dev/null
+++ b/src/test/resources/replay/replay-direct-loc-Issue376-01.txt
@@ -0,0 +1,49 @@
+# Rugged library dump file, created on 2019-02-12T13:28:19Z
+# all units are SI units (m, m/s, rad ...)
+sensor: sensorName s0 nbPixels 6992 position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
+sensor datation: sensorName s0 lineNumber 1.093179500000000e+04 date 2018-11-17T09:28:13.50738549333433Z
+direct location: date 2018-11-17T09:28:13.50738549333433Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.766362001712258e-03 -7.071346636500928e-03 9.999734376572147e-01 lightTime false aberration true refraction false
+span: minDate 2018-11-17T09:28:09.75815400000000Z maxDate 2018-11-17T09:28:24.37500000000000Z tStep 1.000000000000000e-03 tolerance 1.000000000000000e+00 inertialFrame EME2000
+transform: index 3749 body r -1.582419730578572e-01 -8.877875020391763e-04 1.556906340657658e-04 -9.873999521756794e-01 Ω -1.314379576583188e-07 1.929883563714465e-09 -7.292103298515694e-05 ΩDot -1.238204383721699e-16 -4.429578390177184e-17 2.220234885205757e-19 spacecraft p -2.043780763621181e+06 2.649055676516346e+06 -6.230074460056063e+06 v 8.500193464365886e+03 -1.120156363674237e+04 -7.562611889558547e+03 a -7.774014494482032e+02 -2.165448216679694e+02 2.038618372832540e+02 r -4.471787778551135e-01 -2.556359378108412e-01 7.875656535717214e-01 3.382628404801900e-01 Ω 1.895876683374440e-03 6.208707436271533e-04 6.748857995964048e-04 ΩDot 2.850236048816703e-06 1.374797997377696e-04 -1.976120196823438e-05
+algorithm: DUVENHAGE
+ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
+DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 1850 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 2950
+DEM cell: t0 latIndex 1051 lonIndex 2937 elevation 1.309400956268308e+01
+DEM cell: t0 latIndex 1809 lonIndex 653 elevation 3.915338283287048e+03
+DEM cell: t0 latIndex 1743 lonIndex 2713 elevation 3.241641450760227e+03
+DEM cell: t0 latIndex 1744 lonIndex 2713 elevation 3.183645801580853e+03
+DEM cell: t0 latIndex 1743 lonIndex 2714 elevation 3.205639259625923e+03
+DEM cell: t0 latIndex 1744 lonIndex 2714 elevation 3.139643613453759e+03
+DEM cell: t0 latIndex 1744 lonIndex 2704 elevation 2.730665494724698e+03
+DEM cell: t0 latIndex 1745 lonIndex 2704 elevation 2.724669818480428e+03
+DEM cell: t0 latIndex 1744 lonIndex 2705 elevation 2.812663306597604e+03
+DEM cell: t0 latIndex 1745 lonIndex 2705 elevation 2.789667633360545e+03
+DEM cell: t0 latIndex 1744 lonIndex 2694 elevation 2.449679932277680e+03
+DEM cell: t0 latIndex 1745 lonIndex 2694 elevation 2.324684218138123e+03
+DEM cell: t0 latIndex 1744 lonIndex 2695 elevation 2.408678984770245e+03
+DEM cell: t0 latIndex 1745 lonIndex 2695 elevation 2.377683274941762e+03
+DEM cell: t0 latIndex 1747 lonIndex 2695 elevation 2.284691855284797e+03
+DEM cell: t0 latIndex 1748 lonIndex 2695 elevation 2.230696145456314e+03
+DEM cell: t0 latIndex 1747 lonIndex 2696 elevation 2.312690920710585e+03
+DEM cell: t0 latIndex 1748 lonIndex 2696 elevation 2.265695215193176e+03
+DEM cell: t0 latIndex 1749 lonIndex 2696 elevation 2.213699509675768e+03
+DEM cell: t0 latIndex 1748 lonIndex 2697 elevation 2.299694284930039e+03
+DEM cell: t0 latIndex 1749 lonIndex 2697 elevation 2.243698583723704e+03
+DEM cell: t0 latIndex 1748 lonIndex 2694 elevation 2.204697075719452e+03
+DEM cell: t0 latIndex 1749 lonIndex 2694 elevation 2.151701361579895e+03
+DEM cell: t0 latIndex 1749 lonIndex 2695 elevation 2.179700435627831e+03
+DEM cell: t0 latIndex 1750 lonIndex 2692 elevation 2.065707490722317e+03
+DEM cell: t0 latIndex 1751 lonIndex 2692 elevation 2.019711767960612e+03
+DEM cell: t0 latIndex 1750 lonIndex 2693 elevation 2.084706569081327e+03
+DEM cell: t0 latIndex 1751 lonIndex 2693 elevation 2.051710850630697e+03
+DEM cell: t0 latIndex 1750 lonIndex 2690 elevation 2.054709334004296e+03
+DEM cell: t0 latIndex 1751 lonIndex 2690 elevation 2.052713602620443e+03
+DEM cell: t0 latIndex 1750 lonIndex 2691 elevation 2.046708412363307e+03
+DEM cell: t0 latIndex 1751 lonIndex 2691 elevation 1.988712685290527e+03
+DEM cell: t0 latIndex 1752 lonIndex 2690 elevation 1.767717871236589e+03
+DEM cell: t0 latIndex 1752 lonIndex 2691 elevation 1.932716958217748e+03
+DEM cell: t0 latIndex 1751 lonIndex 2689 elevation 1.977714519950358e+03
+DEM cell: t0 latIndex 1752 lonIndex 2689 elevation 1.812718784255430e+03
+DEM cell: t0 latIndex 1753 lonIndex 2689 elevation 1.752723048560503e+03
+DEM cell: t0 latIndex 1753 lonIndex 2690 elevation 1.771722139852736e+03
+direct location result: latitude 8.108879611499973e-01 longitude 2.136511932240912e-01 elevation 1.806659334316842e+03
diff --git a/src/test/resources/replay/replay-direct-loc-Issue376-02.txt b/src/test/resources/replay/replay-direct-loc-Issue376-02.txt
new file mode 100644
index 0000000000000000000000000000000000000000..193745fddbfa4d98d78071fc45317320c9394464
--- /dev/null
+++ b/src/test/resources/replay/replay-direct-loc-Issue376-02.txt
@@ -0,0 +1,50 @@
+# Rugged library dump file, created on 2019-02-12T13:32:28Z
+# all units are SI units (m, m/s, rad ...)
+sensor: sensorName s0 nbPixels 6992 position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
+sensor datation: sensorName s0 lineNumber 1.555651300000000e+04 date 2018-11-17T09:28:15.00578210106806Z
+direct location: date 2018-11-17T09:28:15.00578210106806Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.630437590029585e-03 -1.988452149915022e-02 9.998009539287460e-01 lightTime false aberration true refraction false
+span: minDate 2018-11-17T09:28:09.75815400000000Z maxDate 2018-11-17T09:28:24.37500000000000Z tStep 1.000000000000000e-03 tolerance 1.000000000000000e+00 inertialFrame EME2000
+transform: index 5248 body r -1.582959385747423e-01 -8.877789928041023e-04 1.557391550098440e-04 -9.873913020806478e-01 Ω -1.314379578439253e-07 1.929883497315641e-09 -7.292103298515672e-05 ΩDot -1.238198063406674e-16 -4.429504278953000e-17 2.220223692809437e-19 spacecraft p -2.031142024066962e+06 2.632378682422574e+06 -6.241283006704280e+06 v 8.397013991525502e+03 -1.122240538848754e+04 -7.476888804772309e+03 a -5.680029219465155e+02 -2.953217064872529e+02 9.484900057803327e+01 r -4.473594211185816e-01 -2.560156449934148e-01 7.879614096264105e-01 3.368120466886735e-01 Ω 1.874199110824172e-03 6.297218887138226e-04 6.941311311658171e-04 ΩDot 2.110863271348145e-05 1.094333236463635e-04 -6.188132051280828e-06
+algorithm: DUVENHAGE
+ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
+DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 1850 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 2950
+DEM cell: t0 latIndex 1051 lonIndex 2937 elevation 1.309400956268308e+01
+DEM cell: t0 latIndex 1809 lonIndex 653 elevation 3.915338283287048e+03
+DEM cell: t0 latIndex 1611 lonIndex 2905 elevation 2.683570229905023e+03
+DEM cell: t0 latIndex 1612 lonIndex 2905 elevation 2.659575158110089e+03
+DEM cell: t0 latIndex 1611 lonIndex 2906 elevation 2.640567641818916e+03
+DEM cell: t0 latIndex 1612 lonIndex 2906 elevation 2.617572573031192e+03
+DEM cell: t0 latIndex 1595 lonIndex 2880 elevation 2.623557283660889e+03
+DEM cell: t0 latIndex 1596 lonIndex 2880 elevation 2.576562136685689e+03
+DEM cell: t0 latIndex 1595 lonIndex 2881 elevation 2.647554647459412e+03
+DEM cell: t0 latIndex 1596 lonIndex 2881 elevation 2.594559503491423e+03
+DEM cell: t0 latIndex 1592 lonIndex 2872 elevation 2.390563886371358e+03
+DEM cell: t0 latIndex 1593 lonIndex 2872 elevation 2.289568715338474e+03
+DEM cell: t0 latIndex 1592 lonIndex 2873 elevation 2.342561241148249e+03
+DEM cell: t0 latIndex 1593 lonIndex 2873 elevation 2.331566073122576e+03
+DEM cell: t0 latIndex 1594 lonIndex 2876 elevation 2.458562987470839e+03
+DEM cell: t0 latIndex 1595 lonIndex 2876 elevation 2.494567828466797e+03
+DEM cell: t0 latIndex 1594 lonIndex 2877 elevation 2.475560348262151e+03
+DEM cell: t0 latIndex 1595 lonIndex 2877 elevation 2.528565192265320e+03
+DEM cell: t0 latIndex 1596 lonIndex 2872 elevation 2.190583202239821e+03
+DEM cell: t0 latIndex 1597 lonIndex 2872 elevation 2.147588031206936e+03
+DEM cell: t0 latIndex 1596 lonIndex 2873 elevation 2.264580569045554e+03
+DEM cell: t0 latIndex 1597 lonIndex 2873 elevation 2.203585401019881e+03
+DEM cell: t0 latIndex 1596 lonIndex 2868 elevation 2.121593735016887e+03
+DEM cell: t0 latIndex 1597 lonIndex 2868 elevation 2.114598551955160e+03
+DEM cell: t0 latIndex 1596 lonIndex 2869 elevation 2.106591101822620e+03
+DEM cell: t0 latIndex 1597 lonIndex 2869 elevation 2.110595921768104e+03
+DEM cell: t0 latIndex 1596 lonIndex 2864 elevation 2.166604267793952e+03
+DEM cell: t0 latIndex 1597 lonIndex 2864 elevation 2.083609072703383e+03
+DEM cell: t0 latIndex 1596 lonIndex 2865 elevation 2.144601634599685e+03
+DEM cell: t0 latIndex 1597 lonIndex 2865 elevation 2.076606442516327e+03
+DEM cell: t0 latIndex 1596 lonIndex 2867 elevation 2.148596368211153e+03
+DEM cell: t0 latIndex 1597 lonIndex 2867 elevation 2.111601182142215e+03
+DEM cell: t0 latIndex 1598 lonIndex 2865 elevation 2.042611250432968e+03
+DEM cell: t0 latIndex 1597 lonIndex 2866 elevation 2.091603812329271e+03
+DEM cell: t0 latIndex 1598 lonIndex 2866 elevation 2.054608623253123e+03
+DEM cell: t0 latIndex 1599 lonIndex 2865 elevation 1.847616058349609e+03
+DEM cell: t0 latIndex 1599 lonIndex 2866 elevation 1.838613434176975e+03
+DEM cell: t0 latIndex 1598 lonIndex 2864 elevation 1.985613877612813e+03
+DEM cell: t0 latIndex 1599 lonIndex 2864 elevation 1.872618682522244e+03
+direct location result: latitude 8.086569515781713e-01 longitude 2.161986944259714e-01 elevation 1.912154442728379e+03
diff --git a/src/test/resources/replay/replay-direct-loc-Issue376-03.txt b/src/test/resources/replay/replay-direct-loc-Issue376-03.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7853cc5c920c3805fe49cc2e9f9efa6e979c0ad2
--- /dev/null
+++ b/src/test/resources/replay/replay-direct-loc-Issue376-03.txt
@@ -0,0 +1,319 @@
+# Rugged library dump file, created on 2019-02-08T16:07:07Z
+# all units are SI units (m, m/s, rad ...)
+sensor: sensorName s0 nbPixels 6992 position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
+sensor datation: sensorName s0 lineNumber -6.400000000000001e+02 date 2018-11-17T09:28:09.75815400000000Z
+sensor datation: sensorName s0 lineNumber 4.447408424880824e+04 date 2018-11-17T09:28:24.37500000000000Z
+sensor datation: sensorName s0 lineNumber 2.826900000000000e+04 date 2018-11-17T09:28:19.12459483660332Z
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+span: minDate 2018-11-17T09:28:09.75815400000000Z maxDate 2018-11-17T09:28:24.37500000000000Z tStep 1.000000000000000e-03 tolerance 1.000000000000000e+00 inertialFrame EME2000
+transform: index 9366 body r -1.584446506666181e-01 -8.881578177468675e-04 1.564888965877765e-04 -9.873674490087516e-01 Ω -1.314379583538120e-07 1.929883314912744e-09 -7.292103298515580e-05 ΩDot -1.238180701885198e-16 -4.429300681876970e-17 2.220189200053709e-19 spacecraft p -1.997175450486062e+06 2.586441579861389e+06 -6.271423934028421e+06 v 8.113280864301501e+03 -1.114024972785023e+04 -7.189075879755639e+03 a -1.053681313757033e+03 -1.503500666930414e+03 -2.459309668330822e+02 r -4.479168627946637e-01 -2.570042078686272e-01 7.890099484043995e-01 3.328402356700476e-01 Ω 1.817311260304385e-03 6.600167203271428e-04 7.119941113907730e-04 ΩDot 4.061126512029496e-05 1.694535855585867e-04 2.046888666103640e-04
+algorithm: DUVENHAGE
+ellipsoid: ae 6.378137000000000e+06 f 3.352810664747481e-03 frame ITRF_CIO_CONV_2010_SIMPLE_EOP
+DEM tile: t0 latMin 7.854054356026650e-01 latStep 1.454441043328608e-05 latRows 1850 lonMin 1.745401974046496e-01 lonStep 1.454441043328608e-05 lonCols 2950
+DEM cell: t0 latIndex 1051 lonIndex 2937 elevation 1.309400956268308e+01
+DEM cell: t0 latIndex 1809 lonIndex 653 elevation 3.915338283287048e+03
+DEM cell: t0 latIndex 1248 lonIndex 2816 elevation 1.597661494047886e+03
+DEM cell: t0 latIndex 1249 lonIndex 2816 elevation 1.603667936647203e+03
+DEM cell: t0 latIndex 1248 lonIndex 2817 elevation 1.604658335707728e+03
+DEM cell: t0 latIndex 1249 lonIndex 2817 elevation 1.605664779237111e+03
+DEM cell: t0 latIndex 1231 lonIndex 2793 elevation 8.766249753387451e+02
+DEM cell: t0 latIndex 1232 lonIndex 2793 elevation 8.306313965465546e+02
+DEM cell: t0 latIndex 1231 lonIndex 2794 elevation 8.766218011874729e+02
+DEM cell: t0 latIndex 1232 lonIndex 2794 elevation 8.436282233253479e+02
+DEM cell: t0 latIndex 1248 lonIndex 2800 elevation 1.355712027490404e+03
+DEM cell: t0 latIndex 1249 lonIndex 2800 elevation 1.409718455208672e+03
+DEM cell: t0 latIndex 1248 lonIndex 2801 elevation 1.375708869150247e+03
+DEM cell: t0 latIndex 1249 lonIndex 2801 elevation 1.425715297798581e+03
+DEM cell: t0 latIndex 1240 lonIndex 2793 elevation 9.406827662090301e+02
+DEM cell: t0 latIndex 1241 lonIndex 2793 elevation 1.012689187416840e+03
+DEM cell: t0 latIndex 1240 lonIndex 2794 elevation 9.406796004283481e+02
+DEM cell: t0 latIndex 1241 lonIndex 2794 elevation 1.007686022566223e+03
+DEM cell: t0 latIndex 1240 lonIndex 2784 elevation 9.277112582351684e+02
+DEM cell: t0 latIndex 1241 lonIndex 2784 elevation 9.847176710723877e+02
+DEM cell: t0 latIndex 1240 lonIndex 2785 elevation 9.287080924544864e+02
+DEM cell: t0 latIndex 1241 lonIndex 2785 elevation 9.967145062217712e+02
+DEM cell: t0 latIndex 1240 lonIndex 2786 elevation 9.207049266738044e+02
+DEM cell: t0 latIndex 1241 lonIndex 2786 elevation 9.997113413711547e+02
+DEM cell: t0 latIndex 1242 lonIndex 2784 elevation 9.297240839096070e+02
+DEM cell: t0 latIndex 1242 lonIndex 2785 elevation 1.020720919989056e+03
+DEM cell: t0 latIndex 1240 lonIndex 2783 elevation 9.097144240158505e+02
+DEM cell: t0 latIndex 1241 lonIndex 2783 elevation 8.897208359230041e+02
+DEM cell: t0 latIndex 1241 lonIndex 2782 elevation 8.387240007736206e+02
+DEM cell: t0 latIndex 1242 lonIndex 2782 elevation 8.257304117507088e+02
+DEM cell: t0 latIndex 1242 lonIndex 2783 elevation 8.767272478301578e+02
+DEM cell: t0 latIndex 1243 lonIndex 2784 elevation 9.347304967468261e+02
+DEM cell: t0 latIndex 1244 lonIndex 2784 elevation 9.137369095840454e+02
+DEM cell: t0 latIndex 1243 lonIndex 2785 elevation 9.877273337563408e+02
+DEM cell: t0 latIndex 1244 lonIndex 2785 elevation 9.537337475236257e+02
+DEM cell: t0 latIndex 1243 lonIndex 2782 elevation 8.687368227277967e+02
+DEM cell: t0 latIndex 1243 lonIndex 2783 elevation 8.967336597373114e+02
+DEM cell: t0 latIndex 1244 lonIndex 2782 elevation 7.297432337048849e+02
+DEM cell: t0 latIndex 1244 lonIndex 2783 elevation 8.807400716444652e+02
+DEM cell: t0 latIndex 1242 lonIndex 2780 elevation 6.947367395918104e+02
+DEM cell: t0 latIndex 1243 lonIndex 2780 elevation 6.547431487087673e+02
+DEM cell: t0 latIndex 1242 lonIndex 2781 elevation 7.347335756712596e+02
+DEM cell: t0 latIndex 1243 lonIndex 2781 elevation 6.997399857182820e+02
+DEM cell: t0 latIndex 1244 lonIndex 2780 elevation 6.207495578257243e+02
+DEM cell: t0 latIndex 1244 lonIndex 2781 elevation 6.667463957653046e+02
+direct location result: latitude 8.034866377791225e-01 longitude 2.149826025000848e-01 elevation 6.766765876031756e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034863471945004e-01 longitude 2.149835637695512e-01 elevation 6.803274355079967e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034860569079852e-01 longitude 2.149845245803098e-01 elevation 6.839735377672140e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+DEM cell: t0 latIndex 1242 lonIndex 2786 elevation 1.042717756068505e+03
+DEM cell: t0 latIndex 1243 lonIndex 2786 elevation 1.034724170765855e+03
+DEM cell: t0 latIndex 1242 lonIndex 2787 elevation 1.053714592147954e+03
+DEM cell: t0 latIndex 1243 lonIndex 2787 elevation 1.076721007775370e+03
+direct location result: latitude 8.034857669188987e-01 longitude 2.149854849334069e-01 elevation 6.876149051242718e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+DEM cell: t0 latIndex 1243 lonIndex 2779 elevation 6.157463116992526e+02
+DEM cell: t0 latIndex 1244 lonIndex 2779 elevation 5.807527198861440e+02
+direct location result: latitude 8.034854772265824e-01 longitude 2.149864448298378e-01 elevation 6.912515480966839e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034781401708480e-01 longitude 2.149980710325160e-01 elevation 8.070092894686161e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034766451042998e-01 longitude 2.150008551040355e-01 elevation 8.298238649580798e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034756953353469e-01 longitude 2.150028138458636e-01 elevation 8.439627365661802e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034755257729028e-01 longitude 2.150035917614869e-01 elevation 8.456884143626966e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034753542091236e-01 longitude 2.150043727022487e-01 elevation 8.474459228337357e+02
+direct location: date 2018-11-17T09:28:19.12459483660332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034751805962782e-01 longitude 2.150051567402929e-01 elevation 8.492360215613375e+02
+sensor datation: sensorName s0 lineNumber 2.827000000000000e+04 date 2018-11-17T09:28:19.12491883400332Z
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+transform: index 9367 body r -1.584446866682885e-01 -8.881578120866489e-04 1.564889289424889e-04 -9.873674432314973e-01 Ω -1.314379583539358e-07 1.929883314868440e-09 -7.292103298515577e-05 ΩDot -1.238180697668843e-16 -4.429300632436523e-17 2.220189192587132e-19 spacecraft p -1.997167340633883e+06 2.586430434855095e+06 -6.271431123986675e+06 v 8.093431637307245e+03 -1.116772142469675e+04 -7.194252862198937e+03 a -1.116003951062058e+03 -1.540338922892465e+03 -2.412844583841287e+02 r -4.479170084500233e-01 -2.570044435935310e-01 7.890101945163001e-01 3.328392742206238e-01 Ω 1.817282407156245e-03 6.626536544364022e-04 7.166540889464018e-04 ΩDot 3.596261918459965e-05 1.762501149190991e-04 2.132352467042442e-04
+direct location result: latitude 8.034861115536909e-01 longitude 2.149827595350881e-01 elevation 6.783715396658736e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034858212636020e-01 longitude 2.149837203567396e-01 elevation 6.820177172318605e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034855312710353e-01 longitude 2.149846807205700e-01 elevation 6.856591585036738e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034852415753052e-01 longitude 2.149856406276390e-01 elevation 6.892958742637608e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034849521757428e-01 longitude 2.149866000789734e-01 elevation 6.929278751330255e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034779039700788e-01 longitude 2.149977891017566e-01 elevation 8.040903082873930e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034764271073798e-01 longitude 2.150005456251370e-01 elevation 8.266152946789650e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034754231341417e-01 longitude 2.150025864059567e-01 elevation 8.416165884873407e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034751905258215e-01 longitude 2.150034597399208e-01 elevation 8.443453426151726e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034750171426467e-01 longitude 2.150042434351802e-01 elevation 8.461318032601336e+02
+direct location: date 2018-11-17T09:28:19.12491883400332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034748416752459e-01 longitude 2.150050302808785e-01 elevation 8.479514137281045e+02
+sensor datation: sensorName s0 lineNumber 2.827100000000000e+04 date 2018-11-17T09:28:19.12524283140332Z
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034855854619085e-01 longitude 2.149829168583992e-01 elevation 6.800662978562299e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034852954660465e-01 longitude 2.149838772326810e-01 elevation 6.837078100397765e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034850057670984e-01 longitude 2.149848371500809e-01 elevation 6.873445954856186e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034847163643943e-01 longitude 2.149857966116262e-01 elevation 6.909766648201133e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034844272572674e-01 longitude 2.149867556183403e-01 elevation 6.946040286302061e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034776503522245e-01 longitude 2.149975340220436e-01 elevation 8.014503496617313e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034761982247219e-01 longitude 2.150002531119613e-01 elevation 8.235818314577672e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034752047351187e-01 longitude 2.150022780290727e-01 elevation 8.384163523875080e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034748559822209e-01 longitude 2.150033271441628e-01 elevation 8.429929974173764e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034746807741404e-01 longitude 2.150041136022667e-01 elevation 8.448084979820026e+02
+direct location: date 2018-11-17T09:28:19.12524283140332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034745034462479e-01 longitude 2.150049032646113e-01 elevation 8.466577147154819e+02
+sensor datation: sensorName s0 lineNumber 2.827200000000000e+04 date 2018-11-17T09:28:19.12556682880332Z
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034850594593131e-01 longitude 2.149830740537422e-01 elevation 6.817596725910751e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034847697572988e-01 longitude 2.149840339812393e-01 elevation 6.853965253139291e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034844803516044e-01 longitude 2.149849934527626e-01 elevation 6.890286607118401e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034841912415632e-01 longitude 2.149859524693356e-01 elevation 6.926560893741186e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034838980952460e-01 longitude 2.149869175875534e-01 elevation 6.963477300883122e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034773811105287e-01 longitude 2.149973025827283e-01 elevation 7.990591927384747e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034759590857122e-01 longitude 2.149999761285500e-01 elevation 8.207115658936996e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034749781958609e-01 longitude 2.150019819791355e-01 elevation 8.353456457015349e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034745221121821e-01 longitude 2.150031935361046e-01 elevation 8.416299581679682e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034743450741185e-01 longitude 2.150039827647494e-01 elevation 8.434745795160588e+02
+direct location: date 2018-11-17T09:28:19.12556682880332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034741658802406e-01 longitude 2.150047752520647e-01 elevation 8.453534899946595e+02
+sensor datation: sensorName s0 lineNumber 2.827300000000000e+04 date 2018-11-17T09:28:19.12589082620332Z
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+transform: index 9368 body r -1.584447226656651e-01 -8.881578064271043e-04 1.564889612933425e-04 -9.873674374549306e-01 Ω -1.314379583540596e-07 1.929883314824150e-09 -7.292103298515575e-05 ΩDot -1.238180693452490e-16 -4.429300582996081e-17 2.220189185120558e-19 spacecraft p -1.997159247754292e+06 2.586419266380107e+06 -6.271438318355227e+06 v 8.092333508739787e+03 -1.116921194570312e+04 -7.194479291258267e+03 a -1.080253304207286e+03 -1.440703052233391e+03 -2.115737164041393e+02 r -4.479171556600077e-01 -2.570046781213964e-01 7.890104406288291e-01 3.328383115986899e-01 Ω 1.817316212887617e-03 6.628269035324033e-04 7.168600329624706e-04 ΩDot 3.164883823458545e-05 1.702480831396255e-04 1.986527941775519e-04
+direct location result: latitude 8.034845335439709e-01 longitude 2.149832311290860e-01 elevation 6.834516941253315e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034842441354411e-01 longitude 2.149841906103497e-01 elevation 6.870838931412167e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034839509473890e-01 longitude 2.149851558047580e-01 elevation 6.907762192663471e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034836567014476e-01 longitude 2.149861225927678e-01 elevation 6.944853731187388e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034833639821339e-01 longitude 2.149870870625394e-01 elevation 6.981702363457604e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034770969999045e-01 longitude 2.149970936721582e-01 elevation 7.969044247220546e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034757098800366e-01 longitude 2.149997143928589e-01 elevation 8.180014804468951e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034747435786753e-01 longitude 2.150016981668857e-01 elevation 8.324034773648349e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034741889202773e-01 longitude 2.150030589138596e-01 elevation 8.402561516723064e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034740100472242e-01 longitude 2.150038509206318e-01 elevation 8.421299735198463e+02
+direct location: date 2018-11-17T09:28:19.12589082620332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034738289819376e-01 longitude 2.150046462411378e-01 elevation 8.440386641183494e+02
+sensor datation: sensorName s0 lineNumber 2.827400000000000e+04 date 2018-11-17T09:28:19.12621482360332Z
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034840043074890e-01 longitude 2.149833932328766e-01 elevation 6.851965881007317e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034837085182460e-01 longitude 2.149843623698809e-01 elevation 6.889303164468179e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034834142749974e-01 longitude 2.149853291592384e-01 elevation 6.926394462134429e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034831215601124e-01 longitude 2.149862936277078e-01 elevation 6.963242577232501e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034828303562845e-01 longitude 2.149872558015554e-01 elevation 6.999850261487917e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034767992755202e-01 longitude 2.149969053676118e-01 elevation 7.949662719291899e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034754508877961e-01 longitude 2.149994674704398e-01 elevation 8.154471195087370e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034745010011134e-01 longitude 2.150014264038878e-01 elevation 8.295879778091600e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034738564144045e-01 longitude 2.150029232549413e-01 elevation 8.388714522666150e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034736757014795e-01 longitude 2.150037180472429e-01 elevation 8.407745523850105e+02
+direct location: date 2018-11-17T09:28:19.12621482360332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034734927594821e-01 longitude 2.150045162089748e-01 elevation 8.427131075345702e+02
+sensor datation: sensorName s0 lineNumber 2.827500000000000e+04 date 2018-11-17T09:28:19.12653882100332Z
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034834650470514e-01 longitude 2.149835705156732e-01 elevation 6.871009929198575e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034831708104887e-01 longitude 2.149845373003178e-01 elevation 6.908100351139315e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034828781039869e-01 longitude 2.149855017614823e-01 elevation 6.944947320382794e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034825869102004e-01 longitude 2.149864639254930e-01 elevation 6.981553594849091e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034822972121003e-01 longitude 2.149874238181954e-01 elevation 7.017921882113734e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034764891090868e-01 longitude 2.149967359008398e-01 elevation 7.932260930306617e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034751824156783e-01 longitude 2.149992349022573e-01 elevation 8.130436040854728e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034742505918092e-01 longitude 2.150011665005881e-01 elevation 8.268971007924486e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034735245992095e-01 longitude 2.150027865574396e-01 elevation 8.374757857096932e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034733420416067e-01 longitude 2.150035841425556e-01 elevation 8.394082406366659e+02
+direct location: date 2018-11-17T09:28:19.12653882100332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034731572176724e-01 longitude 2.150043851534342e-01 elevation 8.413767435665499e+02
+sensor datation: sensorName s0 lineNumber 2.827600000000000e+04 date 2018-11-17T09:28:19.12686281840332Z
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+transform: index 9369 body r -1.584447586673350e-01 -8.881578007668832e-04 1.564889936480546e-04 -9.873674316776738e-01 Ω -1.314379583541834e-07 1.929883314779866e-09 -7.292103298515577e-05 ΩDot -1.238180689236135e-16 -4.429300533555636e-17 2.220189177653981e-19 spacecraft p -1.997151155954951e+06 2.586408096464416e+06 -6.271445512935354e+06 v 8.091271130266433e+03 -1.117060283063097e+04 -7.194676009643846e+03 a -1.044503457528476e+03 -1.341066578308776e+03 -1.818631308446282e+02 r -4.479173029656718e-01 -2.570049126060395e-01 7.890106867331848e-01 3.328373488975490e-01 Ω 1.817345704800610e-03 6.629941506377007e-04 7.170513945397830e-04 ΩDot 2.733498444375428e-05 1.642460865486166e-04 1.840703496106509e-04
+direct location result: latitude 8.034829263055876e-01 longitude 2.149837470159440e-01 elevation 6.889971765945945e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034826336114423e-01 longitude 2.149847114637728e-01 elevation 6.926816957627383e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034823424316320e-01 longitude 2.149856736119741e-01 elevation 6.963421196761177e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034820527490903e-01 longitude 2.149866334864504e-01 elevation 6.999787196835825e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034817645470610e-01 longitude 2.149875911126339e-01 elevation 7.035917622113589e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034761677048545e-01 longitude 2.149965834455797e-01 elevation 7.916647288555585e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034749048302526e-01 longitude 2.149990161298855e-01 elevation 8.107851023370356e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034739925202281e-01 longitude 2.150009181968722e-01 elevation 8.243281503278567e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034732535744913e-01 longitude 2.150025578599207e-01 elevation 8.351129417466944e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034730090742463e-01 longitude 2.150034491928779e-01 elevation 8.380309321979194e+02
+direct location: date 2018-11-17T09:28:19.12686281840332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034728223632561e-01 longitude 2.150042530606624e-01 elevation 8.400294644407792e+02
+sensor datation: sensorName s0 lineNumber 2.827700000000000e+04 date 2018-11-17T09:28:19.12718681580332Z
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034823880765704e-01 longitude 2.149839227504206e-01 elevation 6.908852429504817e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034820969147108e-01 longitude 2.149848848767784e-01 elevation 6.945454001321826e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034818072516638e-01 longitude 2.149858447270533e-01 elevation 6.981817088394623e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034815190706375e-01 longitude 2.149868023267313e-01 elevation 7.017944360609551e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034812323551419e-01 longitude 2.149877577008400e-01 elevation 7.053838439770665e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034758362031313e-01 longitude 2.149964462828335e-01 elevation 7.902640378623594e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034746185371490e-01 longitude 2.149988105416534e-01 elevation 8.086652340027457e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034737269686929e-01 longitude 2.150006812236585e-01 elevation 8.218782262415143e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034730011002850e-01 longitude 2.150023010970906e-01 elevation 8.324549700724398e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034726768037741e-01 longitude 2.150033131984376e-01 elevation 8.366425574495763e+02
+direct location: date 2018-11-17T09:28:19.12718681580332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034724882006824e-01 longitude 2.150041199307748e-01 elevation 8.386711993450938e+02
+sensor datation: sensorName s0 lineNumber 2.827800000000000e+04 date 2018-11-17T09:28:19.12751081320332Z
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+DEM cell: t0 latIndex 1241 lonIndex 2781 elevation 7.737271656242370e+02
+direct location result: latitude 8.034818503571547e-01 longitude 2.149840977198244e-01 elevation 6.927652369134296e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034815607175569e-01 longitude 2.149850575398944e-01 elevation 6.964011914450123e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034812725614497e-01 longitude 2.149860151071217e-01 elevation 7.000135410976690e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034809858723084e-01 longitude 2.149869704465865e-01 elevation 7.036025485941086e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034779956693721e-01 longitude 2.149920176475284e-01 elevation 7.502040425837138e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034754957031464e-01 longitude 2.149963227453380e-01 elevation 7.890065316861063e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034743239202250e-01 longitude 2.149986175620463e-01 elevation 8.066777501202871e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034734541552684e-01 longitude 2.150004552473356e-01 elevation 8.195438593706660e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034727421461642e-01 longitude 2.150020541475587e-01 elevation 8.299001135596468e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034723452368835e-01 longitude 2.150031761455188e-01 elevation 8.352430095654670e+02
+direct location: date 2018-11-17T09:28:19.12751081320332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034721547367586e-01 longitude 2.150039857498851e-01 elevation 8.373018396690280e+02
+sensor datation: sensorName s0 lineNumber 2.827900000000000e+04 date 2018-11-17T09:28:19.12783481060332Z
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675073979757700e-03 -1.455869843117481e-02 9.998926134476405e-01 lightTime false aberration false refraction false
+transform: index 9370 body r -1.584447946689907e-01 -8.881577951066632e-04 1.564890260027538e-04 -9.873674259004180e-01 Ω -1.314379583543072e-07 1.929883314735572e-09 -7.292103298515577e-05 ΩDot -1.238180685019781e-16 -4.429300484115192e-17 2.220189170187407e-19 spacecraft p -1.997143065200118e+06 2.586396925207659e+06 -6.271452707697343e+06 v 8.090244501492019e+03 -1.117189407867757e+04 -7.194843017558988e+03 a -1.008754382913370e+03 -1.241429493725617e+03 -1.521527079090525e+02 r -4.479174503627756e-01 -2.570051470512479e-01 7.890109328281188e-01 3.328363861229399e-01 Ω 1.817370882825691e-03 6.631553957239936e-04 7.172281736707170e-04 ΩDot 2.302105874949273e-05 1.582441209968415e-04 1.694879125788701e-04
+direct location result: latitude 8.034813131445031e-01 longitude 2.149842719248564e-01 elevation 6.946372031899516e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675042663896624e-03 -1.456183361787985e-02 9.998925678460457e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034810250172490e-01 longitude 2.149852294536607e-01 elevation 6.982491127248313e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.675011353747724e-03 -1.456496881978930e-02 9.998925222343867e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034807383583591e-01 longitude 2.149861847525656e-01 elevation 7.018376578533130e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674980049311240e-03 -1.456810403689894e-02 9.998924766126629e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034804531515740e-01 longitude 2.149871378462499e-01 elevation 7.054030970968001e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674948750587419e-03 -1.457123926920459e-02 9.998924309808744e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034772479117380e-01 longitude 2.149925105079432e-01 elevation 7.554259544974287e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674917457576505e-03 -1.457437451670205e-02 9.998923853390211e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034751472160672e-01 longitude 2.149962112990982e-01 elevation 7.878761228217490e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674886170278741e-03 -1.457750977938711e-02 9.998923396871029e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034740214410198e-01 longitude 2.149984364845999e-01 elevation 8.048153762291109e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674854888694373e-03 -1.458064505725559e-02 9.998922940251196e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034731743163441e-01 longitude 2.150002399065484e-01 elevation 8.173212888576050e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674823612823641e-03 -1.458378035030327e-02 9.998922483530713e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034724768554609e-01 longitude 2.150018167908085e-01 elevation 8.274460918626510e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674792342666794e-03 -1.458691565852597e-02 9.998922026709579e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034720143803415e-01 longitude 2.150030380202833e-01 elevation 8.338321804411532e+02
+direct location: date 2018-11-17T09:28:19.12783481060332Z position 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 los 1.674761078224073e-03 -1.459005098191950e-02 9.998921569787793e-01 lightTime false aberration false refraction false
+direct location result: latitude 8.034718219783675e-01 longitude 2.150038505039797e-01 elevation 8.359212754610172e+02
diff --git a/src/test/resources/replay/replay-inverse-loc-01.txt b/src/test/resources/replay/replay-inverse-loc-01.txt
index 85aee42d45f15fe07ab85a8b0615cddcce8ee7b3..686cf1d8415055aee86f9a4d39f5fea52a5da4d2 100644
--- a/src/test/resources/replay/replay-inverse-loc-01.txt
+++ b/src/test/resources/replay/replay-inverse-loc-01.txt
@@ -8,7 +8,7 @@ DEM cell: t0 latIndex 122 lonIndex 99 elevation 1.778606495649060e+03
DEM cell: t0 latIndex 122 lonIndex 100 elevation 1.809481571226391e+03
DEM cell: t0 latIndex 123 lonIndex 99 elevation 1.772149770526270e+03
DEM cell: t0 latIndex 123 lonIndex 100 elevation 1.804520334312959e+03
-inverse location: sensorName s0 latitude -3.930524233859007e-01 longitude 2.502596047891660e+00 elevation 1.785429914217195e+03 minLine 0 maxLine 2000 lightTime true aberration true
+inverse location: sensorName s0 latitude -3.930524233859007e-01 longitude 2.502596047891660e+00 elevation 1.785429914217195e+03 minLine 0 maxLine 2000 lightTime true aberration true refraction false
sensor: sensorName s0 nbPixels 2000 position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01
sensor mean plane: sensorName s0 minLine 0 maxLine 2000 maxEval 50 accuracy 1.000000000000000e-02 normal 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 cachedResults 0
sensor datation: sensorName s0 lineNumber 1.000000000000000e+03 date 2012-01-01T12:30:00.00000000000000Z
diff --git a/src/test/resources/replay/replay-inverse-loc-02.txt b/src/test/resources/replay/replay-inverse-loc-02.txt
index e2ebff4d4a23f456e8c3db690eda99d01b3fe8c3..82f1859129890bce96a8823e3b9a1eef38c1ea20 100644
--- a/src/test/resources/replay/replay-inverse-loc-02.txt
+++ b/src/test/resources/replay/replay-inverse-loc-02.txt
@@ -9,7 +9,7 @@ DEM cell: t0 latIndex 123 lonIndex 102 elevation 1.870339491485550e+03
DEM cell: t0 latIndex 124 lonIndex 101 elevation 1.832853313250435e+03
DEM cell: t0 latIndex 124 lonIndex 102 elevation 1.866819199623890e+03
sensor: sensorName s0 nbPixels 2000 position 1.500000000000000e+00 0.000000000000000e+00 -2.000000000000000e-01
-inverse location: sensorName s0 latitude -3.930305027145593e-01 longitude 2.502739578717502e+00 elevation 1.853045504720662e+03 minLine 0 maxLine 2000 lightTime true aberration true
+inverse location: sensorName s0 latitude -3.930305027145593e-01 longitude 2.502739578717502e+00 elevation 1.853045504720662e+03 minLine 0 maxLine 2000 lightTime true aberration true refraction false
sensor mean plane: sensorName s0 minLine 0 maxLine 2000 maxEval 50 accuracy 1.000000000000000e-02 normal 1.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 cachedResults 5 lineNumber 1.753079999999941e+03 date 2012-01-01T12:30:01.12961999999991Z target -4.733584770718903e+06 3.515842173828561e+06 -2.428300713188566e+06 targetDirection 4.440892098500626e-16 -7.496646388847980e-01 6.618178973144536e-01 -1.357198500050715e-08 -1.198160098465607e-08 -1.357198500050715e-08 lineNumber 1.753079999999936e+03 date 2012-01-01T12:30:01.12961999999990Z target -4.733634454810624e+06 3.515791377291927e+06 -2.428292161157289e+06 targetDirection 1.221245327087672e-15 -7.496479456645485e-01 6.618368058373009e-01 -1.357209409884309e-08 -1.198230643978911e-08 -1.357209409884309e-08 lineNumber 1.753080000000098e+03 date 2012-01-01T12:30:01.12962000000015Z target -4.733684171891571e+06 3.515740571824192e+06 -2.428283613116900e+06 targetDirection 2.664535259100376e-15 -7.496312519673904e-01 6.618557139390744e-01 -1.357220357852602e-08 -1.198301226854942e-08 -1.357220357852602e-08 lineNumber 1.753080000000016e+03 date 2012-01-01T12:30:01.12962000000002Z target -4.733734047015606e+06 3.515689711809538e+06 -2.428275079609979e+06 targetDirection 1.110223024625157e-15 -7.496145577933011e-01 6.618746216197999e-01 -1.357231495356307e-08 -1.198371980774984e-08 -1.357231495356307e-08 lineNumber 1.753080000000124e+03 date 2012-01-01T12:30:01.12962000000019Z target -4.733783920649958e+06 3.515638855451895e+06 -2.428266547191616e+06 targetDirection 1.665334536937735e-15 -7.495978631423109e-01 6.618935288794415e-01 -1.357242629275803e-08 -1.198442735245515e-08 -1.357242629275803e-08
sensor datation: sensorName s0 lineNumber 1.000000000000000e+03 date 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
@@ -28,14 +28,14 @@ sensor LOS: sensorName s0 date 2012-01-01T12:30:01.12961999999997Z pixelNumber 5
sensor LOS: sensorName s0 date 2012-01-01T12:30:01.12961999999997Z pixelNumber 6 los 0.000000000000000e+00 -7.496980238944815e-01 6.617800790056386e-01
sensor datation: sensorName s0 lineNumber 1.753079999999893e+03 date 2012-01-01T12:30:01.12961999999984Z
inverse location result: lineNumber 1.753079999999893e+03 pixelNumber 5.000000000428289e+00
-inverse location: sensorName s0 latitude -3.930323254721546e-01 longitude 2.502727645691323e+00 elevation 1.847490708944211e+03 minLine 0 maxLine 2000 lightTime true aberration true
+inverse location: sensorName s0 latitude -3.930323254721546e-01 longitude 2.502727645691323e+00 elevation 1.847490708944211e+03 minLine 0 maxLine 2000 lightTime true aberration true refraction false
sensor datation: sensorName s0 lineNumber 1.753080000000180e+03 date 2012-01-01T12:30:01.12962000000027Z
sensor rate: sensorName s0 lineNumber 1.753080000000180e+03 rate 6.666666666666666e+02
sensor datation: sensorName s0 lineNumber 1.753080000000150e+03 date 2012-01-01T12:30:01.12962000000022Z
sensor LOS: sensorName s0 date 2012-01-01T12:30:01.12962000000022Z pixelNumber 7 los 0.000000000000000e+00 -7.497147156838981e-01 6.617611692196904e-01
sensor datation: sensorName s0 lineNumber 1.753080000000120e+03 date 2012-01-01T12:30:01.12962000000018Z
inverse location result: lineNumber 1.753080000000120e+03 pixelNumber 6.000000000570598e+00
-inverse location: sensorName s0 latitude -3.930341476421113e-01 longitude 2.502715716159622e+00 elevation 1.841953904196975e+03 minLine 0 maxLine 2000 lightTime true aberration true
+inverse location: sensorName s0 latitude -3.930341476421113e-01 longitude 2.502715716159622e+00 elevation 1.841953904196975e+03 minLine 0 maxLine 2000 lightTime true aberration true refraction false
sensor datation: sensorName s0 lineNumber 1.753080000000450e+03 date 2012-01-01T12:30:01.12962000000067Z
sensor rate: sensorName s0 lineNumber 1.753080000000450e+03 rate 6.666666666666666e+02
sensor LOS: sensorName s0 date 2012-01-01T12:30:01.12962000000027Z pixelNumber 8 los 0.000000000000000e+00 -7.497314069963494e-01 6.617422590127325e-01
diff --git a/src/test/resources/replay/replay-inverse-loc-03.txt b/src/test/resources/replay/replay-inverse-loc-03.txt
index dcdf6eef877cc5fdfc108b153aaa41a27843216b..98f827d8f015d619365ce5bcd9399a5cab0cd2ff 100644
--- a/src/test/resources/replay/replay-inverse-loc-03.txt
+++ b/src/test/resources/replay/replay-inverse-loc-03.txt
@@ -1,7 +1,7 @@
# 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
+inverse location: sensorName s0 latitude 1.426113542156674e+00 longitude -8.868185262195961e-01 elevation 3.102209319249422e+01 minLine -23040 maxLine 39851 lightTime false aberration false refraction 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
diff --git a/src/tutorials/java/fr/cs/examples/AtmosphericRefractionExamples.java b/src/tutorials/java/fr/cs/examples/AtmosphericRefractionExamples.java
new file mode 100644
index 0000000000000000000000000000000000000000..f4c527984df37b0b4fa7759dcda6cb1c106b0217
--- /dev/null
+++ b/src/tutorials/java/fr/cs/examples/AtmosphericRefractionExamples.java
@@ -0,0 +1,252 @@
+package fr.cs.examples;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.hipparchus.geometry.euclidean.threed.Rotation;
+import org.hipparchus.geometry.euclidean.threed.Vector3D;
+import org.hipparchus.stat.descriptive.DescriptiveStatistics;
+import org.hipparchus.util.FastMath;
+import org.orekit.bodies.GeodeticPoint;
+import org.orekit.data.DataProvidersManager;
+import org.orekit.data.DirectoryCrawler;
+import org.orekit.frames.Frame;
+import org.orekit.frames.FramesFactory;
+import org.orekit.frames.Transform;
+import org.orekit.rugged.api.AlgorithmId;
+import org.orekit.rugged.api.BodyRotatingFrameId;
+import org.orekit.rugged.api.EllipsoidId;
+import org.orekit.rugged.api.InertialFrameId;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.api.RuggedBuilder;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.LinearLineDatation;
+import org.orekit.rugged.linesensor.SensorPixel;
+import org.orekit.rugged.los.FixedRotation;
+import org.orekit.rugged.los.LOSBuilder;
+import org.orekit.rugged.los.TimeDependentLOS;
+import org.orekit.rugged.refraction.AtmosphericRefraction;
+import org.orekit.rugged.refraction.MultiLayerModel;
+import org.orekit.time.AbsoluteDate;
+import org.orekit.time.TimeScale;
+import org.orekit.time.TimeScalesFactory;
+import org.orekit.utils.AngularDerivativesFilter;
+import org.orekit.utils.CartesianDerivativesFilter;
+import org.orekit.utils.IERSConventions;
+import org.orekit.utils.PVCoordinates;
+import org.orekit.utils.TimeStampedAngularCoordinates;
+import org.orekit.utils.TimeStampedPVCoordinates;
+
+/** A simple example of how to use the atmospheric refraction correction.
+ */
+public class AtmosphericRefractionExamples {
+
+
+ public static void main(String[] args) throws URISyntaxException {
+
+ // Initialize Orekit, assuming an orekit-data folder is in user home directory
+ File home = new File(System.getProperty("user.home"));
+ File orekitData = new File(home, "orekit-data");
+ DataProvidersManager.getInstance().addProvider(new DirectoryCrawler(orekitData));
+
+ // Sensor's definition
+ // ===================
+ // Line of sight
+ // -------------
+ // The raw viewing direction of pixel i with respect to the instrument is defined by the vector:
+ List<Vector3D> rawDirs = new ArrayList<Vector3D>();
+ for (int i = 0; i < 2000; i++) {
+ // 20° field of view, 2000 pixels
+ rawDirs.add(new Vector3D(0., i*FastMath.toRadians(20.)/2000., 1.));
+ }
+
+ // The instrument is oriented 10° off nadir around the X-axis, we need to rotate the viewing
+ // direction to obtain the line of sight in the satellite frame
+ LOSBuilder losBuilder = new LOSBuilder(rawDirs);
+ losBuilder.addTransform(new FixedRotation("10-degrees-rotation", Vector3D.PLUS_I, FastMath.toRadians(10.)));
+
+ TimeDependentLOS lineOfSight = losBuilder.build();
+
+ // Datation model
+ // --------------
+ // We use Orekit for handling time and dates, and Rugged for defining the datation model:
+ TimeScale gps = TimeScalesFactory.getGPS();
+ AbsoluteDate absDate = new AbsoluteDate("2009-12-11T16:59:30.0", gps);
+ LinearLineDatation lineDatation = new LinearLineDatation(absDate, 1., 20.);
+
+ // Line sensor
+ // -----------
+ // With the LOS and the datation now define, we can initialize a line sensor object in Rugged:
+ LineSensor lineSensor = new LineSensor("mySensor", lineDatation, Vector3D.ZERO, lineOfSight);
+
+ // Satellite position, velocity and attitude
+ // =========================================
+ // Reference frames
+ // ----------------
+ // In our application, we simply need to know the name of the frames we are working with. Positions and
+ // velocities are given in the ITRF terrestrial frame, while the quaternions are given in EME2000
+ // inertial frame.
+ Frame eme2000 = FramesFactory.getEME2000();
+ boolean simpleEOP = true; // we don't want to compute tiny tidal effects at millimeter level
+ Frame itrf = FramesFactory.getITRF(IERSConventions.IERS_2010, simpleEOP);
+
+ // Satellite attitude
+ // ------------------
+ ArrayList<TimeStampedAngularCoordinates> satelliteQList = new ArrayList<TimeStampedAngularCoordinates>();
+
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:58:42.592937", -0.340236, 0.333952, -0.844012, -0.245684);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:59:06.592937", -0.354773, 0.329336, -0.837871, -0.252281);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:59:30.592937", -0.369237, 0.324612, -0.831445, -0.258824);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T16:59:54.592937", -0.3836, 0.319792, -0.824743, -0.265299);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:00:18.592937", -0.397834, 0.314883, -0.817777, -0.271695);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:00:42.592937", -0.411912, 0.309895, -0.810561, -0.278001);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:01:06.592937", -0.42581, 0.304838, -0.803111, -0.284206);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:01:30.592937", -0.439505, 0.299722, -0.795442, -0.290301);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:01:54.592937", -0.452976, 0.294556, -0.787571, -0.296279);
+ addSatelliteQ(gps, satelliteQList, "2009-12-11T17:02:18.592937", -0.466207, 0.28935, -0.779516, -0.302131);
+
+ // Positions and velocities
+ // ------------------------
+ ArrayList<TimeStampedPVCoordinates> satellitePVList = new ArrayList<TimeStampedPVCoordinates>();
+
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:58:42.592937", -726361.466, -5411878.485, 4637549.599, -2463.635, -4447.634, -5576.736);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:59:04.192937", -779538.267, -5506500.533, 4515934.894, -2459.848, -4312.676, -5683.906);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:59:25.792937", -832615.368, -5598184.195, 4392036.13, -2454.395, -4175.564, -5788.201);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T16:59:47.392937", -885556.748, -5686883.696, 4265915.971, -2447.273, -4036.368, -5889.568);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:00:08.992937", -938326.32, -5772554.875, 4137638.207, -2438.478, -3895.166, -5987.957);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:00:30.592937", -990887.942, -5855155.21, 4007267.717, -2428.011, -3752.034, -6083.317);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:00:52.192937", -1043205.448, -5934643.836, 3874870.441, -2415.868, -3607.05, -6175.600);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:01:13.792937", -1095242.669, -6010981.571, 3740513.34, -2402.051, -3460.291, -6264.760);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:01:35.392937", -1146963.457, -6084130.93, 3604264.372, -2386.561, -3311.835, -6350.751);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:01:56.992937", -1198331.706, -6154056.146, 3466192.446, -2369.401, -3161.764, -6433.531);
+ addSatellitePV(gps, eme2000, itrf, satellitePVList, "2009-12-11T17:02:18.592937", -1249311.381, -6220723.191, 3326367.397, -2350.574, -3010.159, -6513.056);
+
+ // Rugged initialization
+ // ---------------------
+ RuggedBuilder builder = new RuggedBuilder().
+ setAlgorithm(AlgorithmId.IGNORE_DEM_USE_ELLIPSOID).
+ setEllipsoid(EllipsoidId.WGS84, BodyRotatingFrameId.ITRF).
+ setTimeSpan(absDate, absDate.shiftedBy(60.0), 0.01, 5. / lineSensor.getRate(0.)).
+ setTrajectory(InertialFrameId.EME2000,
+ satellitePVList, 4, CartesianDerivativesFilter.USE_P,
+ satelliteQList, 4, AngularDerivativesFilter.USE_R).
+ addLineSensor(lineSensor);
+
+ // Build Rugged without atmospheric refraction model
+ Rugged ruggedWithout = builder.build();
+
+ // Defines atmospheric refraction model (with the default multi layers model)
+ AtmosphericRefraction atmosphericRefraction = new MultiLayerModel(ruggedWithout.getEllipsoid());
+ // One can use its own atmospheric model that must extend the abstract refraction.AtmosphericRefraction class.
+
+ // Set the optional grid steps, for the inverse location computation. Useless for direct location computation.
+ // This setting is optional as default values exist. But can be useful for instance to improve results by given smaller steps
+ // or to speed up the computation bigger steps.
+ int pixelStep = 100;
+ int lineStep = 100;
+ atmosphericRefraction.setGridSteps(pixelStep, lineStep);
+
+ // Build Rugged with atmospheric refraction model
+ builder.setRefractionCorrection(atmosphericRefraction);
+ Rugged ruggedWith = builder.build();
+
+ // Direct location on a line WITHOUT and WITH atmospheric correction
+ // -----------------------------------------------------------------
+ double chosenLine = 200.;
+ // Without atmosphere
+ GeodeticPoint[] gpWithoutAtmosphericRefractionCorrection = ruggedWithout.directLocation("mySensor", chosenLine);
+ // With atmosphere
+ GeodeticPoint[] gpWithAtmosphericRefractionCorrection = ruggedWith.directLocation("mySensor", chosenLine);
+
+ double earthRadius = ruggedWithout.getEllipsoid().getEquatorialRadius();
+ DescriptiveStatistics statDistance = new DescriptiveStatistics();
+
+ for (int i = 0; i < gpWithAtmosphericRefractionCorrection.length; i++) {
+ double currentRadius = earthRadius + (gpWithAtmosphericRefractionCorrection[i].getAltitude()+ gpWithoutAtmosphericRefractionCorrection[i].getAltitude())/2.;
+ double distance = computeDistanceInMeter(currentRadius, gpWithAtmosphericRefractionCorrection[i], gpWithoutAtmosphericRefractionCorrection[i]);
+ statDistance.addValue(distance);
+ }
+
+ System.out.format("Distance must be > 0 and < 2m:" +
+ " Max = " + DFS.format(statDistance.getMax()) +
+ " Min = " + DFS.format(statDistance.getMin()) +
+ " Median = " + DFS.format(statDistance.getPercentile(50.)) +
+ " Mean = " + DFS.format(statDistance.getMean()) +
+ " Std deviation= " + DFS.format(statDistance.getStandardDeviation()) +
+ "\n");
+
+ // Inverse loc WITH atmospheric correction
+ // ==========================================================================
+ final double epsilonPixel = 1.e-3;
+ final double epsilonLine = 1.1e-2;
+
+ int minLine = (int) FastMath.floor(lineSensor.getLine(ruggedWithout.getMinDate()));
+ int maxLine = (int) FastMath.ceil(lineSensor.getLine(ruggedWithout.getMaxDate()));
+
+ for (int i = 0; i < gpWithAtmosphericRefractionCorrection.length; i++) {
+
+ // to check if we go back to the initial point when taking the geodetic point with atmospheric correction
+ GeodeticPoint gpWith = gpWithAtmosphericRefractionCorrection[i];
+ SensorPixel sensorPixelReverseWith = ruggedWith.inverseLocation("mySensor", gpWith, minLine, maxLine);
+
+ if (sensorPixelReverseWith != null) {
+ // Compare the computed pixel vs expected
+ if (FastMath.abs(i - sensorPixelReverseWith.getPixelNumber()) > epsilonPixel) {
+ System.out.format("Problem with pixel " + i + " . Delta pixel= " + DFS.format((i - sensorPixelReverseWith.getPixelNumber())) + "\n");
+ }
+ // Compare the computed line vs the expected
+ if (FastMath.abs(chosenLine - sensorPixelReverseWith.getLineNumber())> epsilonLine) {
+ System.out.format("Probem with line, for pixel " + i + ". Delta line= " + DFS.format((chosenLine - sensorPixelReverseWith.getLineNumber())) + "\n");
+ }
+ } else {
+ System.out.println("Inverse location failed for pixel " + i + " with atmospheric refraction correction for geodetic point computed with" );
+ }
+ } // end loop on pixel i
+ System.out.format("Inverse location gave same pixel and line as direct location input for" +
+ " epsilon pixel= " + DFS.format(epsilonPixel) +
+ " and epsilon line= " + DFS.format(epsilonLine) +
+ "\n");
+ }
+
+
+ private static void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
+ ArrayList<TimeStampedPVCoordinates> satellitePVList,
+ String absDate,
+ double px, double py, double pz, double vx, double vy, double vz) {
+
+ AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
+ Vector3D position = new Vector3D(px, py, pz); // in ITRF, unit: m
+ Vector3D velocity = new Vector3D(vx, vy, vz); // in ITRF, unit: m/s
+ PVCoordinates pvITRF = new PVCoordinates(position, velocity);
+ Transform transform = itrf.getTransformTo(eme2000, ephemerisDate);
+ PVCoordinates pvEME2000 = transform.transformPVCoordinates(pvITRF);
+ satellitePVList.add(new TimeStampedPVCoordinates(ephemerisDate, pvEME2000.getPosition(), pvEME2000.getVelocity(), Vector3D.ZERO));
+ }
+
+ private static void addSatelliteQ(TimeScale gps, ArrayList<TimeStampedAngularCoordinates> satelliteQList, String absDate,
+ double q0, double q1, double q2, double q3) {
+ AbsoluteDate attitudeDate = new AbsoluteDate(absDate, gps);
+ Rotation rotation = new Rotation(q0, q1, q2, q3, true); // q0 is the scalar term
+ TimeStampedAngularCoordinates pair =
+ new TimeStampedAngularCoordinates(attitudeDate, rotation, Vector3D.ZERO, Vector3D.ZERO);
+ satelliteQList.add(pair);
+ }
+
+ private static double computeDistanceInMeter(double earthRadius, final GeodeticPoint gp1, final GeodeticPoint gp2) {
+
+ // get vectors on unit sphere from angular coordinates
+ final Vector3D p1 = new Vector3D(gp1.getLongitude(), gp1.getLatitude());
+ final Vector3D p2 = new Vector3D(gp2.getLongitude(), gp2.getLatitude());
+ return earthRadius * Vector3D.angle(p1, p2);
+ }
+
+ /** Definition of print format. */
+ private static final DecimalFormatSymbols SYMBOLS = new DecimalFormatSymbols(Locale.US);
+ /** Defined of number of digit after the point. */
+ private static final DecimalFormat DFS = new DecimalFormat("#.#####", SYMBOLS);
+}
diff --git a/src/tutorials/java/fr/cs/examples/DirectLocation.java b/src/tutorials/java/fr/cs/examples/DirectLocation.java
index be4f57b9339ac79c5eac16c17195f218ac78b355..dbc1d63c99e04d667453158ae7b5742d485a897d 100644
--- a/src/tutorials/java/fr/cs/examples/DirectLocation.java
+++ b/src/tutorials/java/fr/cs/examples/DirectLocation.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -173,8 +173,8 @@ public class DirectLocation {
private static void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
ArrayList<TimeStampedPVCoordinates> satellitePVList,
String absDate,
- double px, double py, double pz, double vx, double vy, double vz)
- throws OrekitException {
+ double px, double py, double pz, double vx, double vy, double vz) {
+
AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
Vector3D position = new Vector3D(px, py, pz); // in ITRF, unit: m
Vector3D velocity = new Vector3D(vx, vy, vz); // in ITRF, unit: m/s
diff --git a/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java b/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java
index 83ae31997bc8710f59c2ce75196c484d3a4c8b63..48fc8da974a582fff279e7d6b1428837facb2d83 100644
--- a/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java
+++ b/src/tutorials/java/fr/cs/examples/DirectLocationWithDEM.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -182,8 +182,8 @@ public class DirectLocationWithDEM {
private static void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
ArrayList<TimeStampedPVCoordinates> satellitePVList,
String absDate,
- double px, double py, double pz, double vx, double vy, double vz)
- throws OrekitException {
+ double px, double py, double pz, double vx, double vy, double vz) {
+
AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
Vector3D position = new Vector3D(px, py, pz); // in ITRF, unit: m
Vector3D velocity = new Vector3D(vx, vy, vz); // in ITRF, unit: m/s
@@ -221,8 +221,8 @@ public class DirectLocationWithDEM {
}
@Override
- public void updateTile(double latitude, double longitude, UpdatableTile tile)
- throws RuggedException {
+ public void updateTile(double latitude, double longitude, UpdatableTile tile) {
+
double step = size / (n - 1);
double minLatitude = size * FastMath.floor(latitude / size);
double minLongitude = size * FastMath.floor(longitude / size);
diff --git a/src/tutorials/java/fr/cs/examples/InverseLocation.java b/src/tutorials/java/fr/cs/examples/InverseLocation.java
index 01dd414d94ed993fff76edf3b663e62fb07f8ac1..b03bee91722c232692e9fb8f845ce3cf71440cfc 100644
--- a/src/tutorials/java/fr/cs/examples/InverseLocation.java
+++ b/src/tutorials/java/fr/cs/examples/InverseLocation.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -225,8 +225,8 @@ public class InverseLocation {
private static void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
ArrayList<TimeStampedPVCoordinates> satellitePVList,
String absDate,
- double px, double py, double pz, double vx, double vy, double vz)
- throws OrekitException {
+ double px, double py, double pz, double vx, double vy, double vz) {
+
AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
Vector3D position = new Vector3D(px, py, pz); // in ITRF, unit: m
Vector3D velocity = new Vector3D(vx, vy, vz); // in ITRF, unit: m/s
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java
index ea7e36a07f5ed6eb615b324f1dc16f861d5615bb..0b35215a14785be729de97f0b7d3eaef00c03149 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/GroundRefining.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -52,7 +52,7 @@ import fr.cs.examples.refiningPleiades.models.OrbitModel;
import fr.cs.examples.refiningPleiades.models.PleiadesViewingModel;
/**
- * Class for testing refining (fulcrum points study)
+ * Class for testing refining (Ground Control Points GCP study)
* with or without noisy measurements
* @author Jonathan Guinet
* @author Lucie Labat-Allee
@@ -232,7 +232,7 @@ public class GroundRefining extends Refining {
}
/** Constructor */
- public GroundRefining() throws RuggedException, OrekitException {
+ private GroundRefining() {
sensorName = "line";
pleiadesViewingModel = new PleiadesViewingModel(sensorName);
@@ -243,7 +243,7 @@ public class GroundRefining extends Refining {
* @param LineSensor line sensor
* @return the GSD
*/
- private double[] computeGSD(final Rugged rugged, final LineSensor lineSensor) throws RuggedException {
+ private double[] computeGSD(final Rugged rugged, final LineSensor lineSensor) {
// Get number of line
int dimension = pleiadesViewingModel.getDimension();
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java
index c0f9354ce5ea7ba279fee47749b78786fb2b5744..5c6516bcc2e4ce1a309b2b1de366f435581610c3 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/InterRefining.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,7 +28,6 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.data.DataProvidersManager;
import org.orekit.data.DirectoryCrawler;
import org.orekit.errors.OrekitException;
-import org.orekit.forces.gravity.potential.NormalizedSphericalHarmonicsProvider;
import org.orekit.orbits.Orbit;
import org.orekit.rugged.api.AlgorithmId;
import org.orekit.rugged.api.BodyRotatingFrameId;
@@ -42,6 +41,7 @@ import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.AngularDerivativesFilter;
import org.orekit.utils.CartesianDerivativesFilter;
+import org.orekit.utils.Constants;
import org.orekit.utils.PVCoordinates;
import org.orekit.utils.TimeStampedAngularCoordinates;
import org.orekit.utils.TimeStampedPVCoordinates;
@@ -54,7 +54,7 @@ import fr.cs.examples.refiningPleiades.models.OrbitModel;
import fr.cs.examples.refiningPleiades.models.PleiadesViewingModel;
/**
- * Class for testing refining (liaison points study)
+ * Class for testing refining (tie points study)
* with or without noisy measurements
* @author Jonathan Guinet
* @author Lucie Labat-Allee
@@ -108,8 +108,7 @@ public class InterRefining extends Refining {
// ----Satellite position, velocity and attitude: create orbit model A
OrbitModel orbitmodelA = new OrbitModel();
BodyShape earthA = orbitmodelA.createEarth();
- NormalizedSphericalHarmonicsProvider gravityFieldA = orbitmodelA.createGravityField();
- Orbit orbitA = orbitmodelA.createOrbit(gravityFieldA.getMu(), refDateA);
+ Orbit orbitA = orbitmodelA.createOrbit(Constants.EIGEN5C_EARTH_MU, refDateA);
// ----If no LOF Transform Attitude Provider is Nadir Pointing Yaw Compensation
final double [] rollPoly = {0.0,0.0,0.0};
@@ -166,8 +165,7 @@ public class InterRefining extends Refining {
// ----Satellite position, velocity and attitude: create orbit model B
OrbitModel orbitmodelB = new OrbitModel();
BodyShape earthB = orbitmodelB.createEarth();
- NormalizedSphericalHarmonicsProvider gravityFieldB = orbitmodelB.createGravityField();
- Orbit orbitB = orbitmodelB.createOrbit(gravityFieldB.getMu(), refDateB);
+ Orbit orbitB = orbitmodelB.createOrbit(Constants.EIGEN5C_EARTH_MU, refDateB);
// ----Satellite attitude
List<TimeStampedAngularCoordinates> satelliteQListB = orbitmodelB.orbitToQ(orbitB, earthB, minDateB.shiftedBy(-0.0), maxDateB.shiftedBy(+0.0), 0.25);
@@ -292,6 +290,7 @@ public class InterRefining extends Refining {
// ------------------
System.out.format("\n**** Compute Statistics **** %n");
refining.computeMetrics(measurements.getInterMapping(), ruggedA, ruggedB, false);
+
} catch (OrekitException oe) {
System.err.println(oe.getLocalizedMessage());
@@ -303,7 +302,7 @@ public class InterRefining extends Refining {
}
/** Constructor */
- public InterRefining() throws RuggedException, OrekitException {
+ private InterRefining() {
sensorNameA = "SensorA";
final double incidenceAngleA = -5.0;
@@ -325,7 +324,7 @@ public class InterRefining extends Refining {
* @return GSD
*/
private double computeDistanceBetweenLOS(final Rugged ruggedA, final LineSensor lineSensorA,
- final Rugged ruggedB, final LineSensor lineSensorB) throws RuggedException {
+ final Rugged ruggedB, final LineSensor lineSensorB) {
// Get number of line of sensors
int dimensionA = pleiadesViewingModelA.getDimension();
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java
index a0f7c02549ad4fb23228586eadc98fd00d87bf7d..9fe09bae06923963ff98bc283fb33db8c6509be3 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/Refining.java
@@ -22,15 +22,13 @@ import java.util.Collections;
import java.util.List;
import org.hipparchus.optim.nonlinear.vector.leastsquares.LeastSquaresOptimizer.Optimum;
-import org.orekit.errors.OrekitException;
-import org.orekit.errors.OrekitExceptionWrapper;
import org.orekit.rugged.adjustment.AdjustmentContext;
-import org.orekit.rugged.api.Rugged;
-import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.adjustment.measurements.Observables;
import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
+import org.orekit.rugged.api.Rugged;
+import org.orekit.rugged.errors.RuggedException;
+import org.orekit.rugged.errors.RuggedMessages;
import fr.cs.examples.refiningPleiades.generators.GroundMeasurementGenerator;
import fr.cs.examples.refiningPleiades.generators.InterMeasurementGenerator;
@@ -53,7 +51,7 @@ public class Refining {
/**
* Constructor
*/
- public Refining() throws RuggedException {
+ public Refining() {
}
/** Apply disruptions on acquisition for roll, pitch and scale factor
@@ -62,11 +60,9 @@ public class Refining {
* @param rollValue rotation on roll value
* @param pitchValue rotation on pitch value
* @param factorValue scale factor
- * @throws RuggedException
*/
public void applyDisruptions(final Rugged rugged, final String sensorName,
- final double rollValue, final double pitchValue, final double factorValue)
- throws OrekitException, RuggedException {
+ final double rollValue, final double pitchValue, final double factorValue) {
rugged.
getLineSensor(sensorName).
@@ -94,11 +90,10 @@ public class Refining {
* @param sensorName line sensor name
* @param dimension number of line of the sensor
* @return ground measurements generator (sensor to ground mapping)
- * @throws RuggedException
*/
public GroundMeasurementGenerator generatePoints(final int lineSampling, final int pixelSampling,
final Rugged rugged, final String sensorName,
- final int dimension) throws RuggedException {
+ final int dimension) {
GroundMeasurementGenerator measurements = new GroundMeasurementGenerator(rugged, sensorName, dimension);
@@ -122,12 +117,10 @@ public class Refining {
* @param sensorNameB line sensor name B
* @param dimensionB dimension for acquisition B
* @return inter measurements generator (sensor to sensor mapping)
- * @throws RuggedException
*/
public InterMeasurementGenerator generatePoints(final int lineSampling, final int pixelSampling,
final Rugged ruggedA, final String sensorNameA, final int dimensionA,
- final Rugged ruggedB, final String sensorNameB, final int dimensionB)
- throws RuggedException {
+ final Rugged ruggedB, final String sensorNameB, final int dimensionB) {
// Outliers control
final double outlierValue = 1e+2;
@@ -158,11 +151,10 @@ public class Refining {
* @param dimension dimension
* @param noise Noise structure to generate noisy measurements
* @return ground measurements generator (sensor to ground mapping)
- * @throws RuggedException
*/
public GroundMeasurementGenerator generateNoisyPoints(final int lineSampling, final int pixelSampling,
final Rugged rugged, final String sensorName, final int dimension,
- final Noise noise) throws RuggedException {
+ final Noise noise) {
// Generate ground measurements
GroundMeasurementGenerator measurements = new GroundMeasurementGenerator(rugged, sensorName, dimension);
@@ -188,12 +180,11 @@ public class Refining {
* @param dimensionB dimension for acquisition B
* @param noise noise structure to generate noisy measurements
* @return inter-measurements generator (sensor to sensor mapping)
- * @throws RuggedException
*/
public InterMeasurementGenerator generateNoisyPoints(final int lineSampling, final int pixelSampling,
final Rugged ruggedA, final String sensorNameA, final int dimensionA,
final Rugged ruggedB, final String sensorNameB, final int dimensionB,
- final Noise noise) throws RuggedException {
+ final Noise noise) {
// Outliers control
final double outlierValue = 1.e+2;
@@ -217,14 +208,13 @@ public class Refining {
}
/** Compute metrics to evaluate geometric performances in location,
- * for fulcrum points study.
+ * for Ground Control Points GCP study.
* @param groundMapping sensor to ground mapping
* @param rugged Rugged instance
* @param unit flag to know if distance is computed in meters (false) or with angular (true)
- * @throws RuggedException
*/
public void computeMetrics(final SensorToGroundMapping groundMapping,
- final Rugged rugged, final boolean unit) throws RuggedException {
+ final Rugged rugged, final boolean unit) {
String stUnit = null;
if(unit) {
@@ -238,16 +228,15 @@ public class Refining {
}
/** Compute metrics to evaluate geometric performances in location,
- * for liaison points study.
+ * for tie points study.
* @param interMapping sensor to sensor mapping
* @param ruggedA Rugged instance A
* @param ruggedB Rugged instance B
* @param unit flag to know if distance is computed in meters (false) or with angular (true)
- * @throws RuggedException
*/
public void computeMetrics(final SensorToSensorMapping interMapping,
final Rugged ruggedA, final Rugged ruggedB,
- final boolean unit) throws RuggedException {
+ final boolean unit) {
String stUnit = null;
if(unit) stUnit="degrees";
@@ -263,22 +252,17 @@ public class Refining {
* @param rugged Rugged instance
* @param sensorName line sensor name
* @param isSelected flag to known if factor parameter is selected or not
- * @throws RuggedException
*/
- public void resetModel(final Rugged rugged, final String sensorName, final boolean isSelected) throws RuggedException {
+ public void resetModel(final Rugged rugged, final String sensorName, final boolean isSelected) {
rugged.
getLineSensor(sensorName).
getParametersDrivers().
filter(driver -> driver.getName().equals(sensorName + rollSuffix)
- || driver.getName().equals(sensorName + pitchSuffix)).
+ || driver.getName().equals(sensorName + pitchSuffix)).
forEach(driver -> {
- try {
- driver.setSelected(true);
- driver.setValue(0.0);
- } catch (OrekitException e) {
- throw new OrekitExceptionWrapper(e);
- }
+ driver.setSelected(true);
+ driver.setValue(0.0);
});
rugged.
@@ -286,26 +270,21 @@ public class Refining {
getParametersDrivers().
filter(driver -> driver.getName().equals(factorName)).
forEach(driver -> {
- try {
- driver.setSelected(isSelected);
-
- // default value: no Z scale factor applied
- driver.setValue(1.0);
- } catch (OrekitException e) {
- throw new OrekitExceptionWrapper(e);
- }
+ driver.setSelected(isSelected);
+
+ // default value: no Z scale factor applied
+ driver.setValue(1.0);
});
}
- /** Start optimization to adjust parameters (fulcrum points study).
+ /** Start optimization to adjust parameters (Ground Control Points GCP study).
* @param maxIterations iterations max
* @param convergenceThreshold threshold of convergence
* @param measurements ground measurements
* @param rugged Rugged instance
- * @throws RuggedException
*/
public void optimization(final int maxIterations, final double convergenceThreshold,
- final Observables measurements, final Rugged rugged) throws RuggedException {
+ final Observables measurements, final Rugged rugged) {
System.out.format("Iterations max: %d\tconvergence threshold: %3.6e \n", maxIterations, convergenceThreshold);
@@ -314,20 +293,20 @@ public class Refining {
// Print statistics
System.out.format("Max value: %3.6e %n", optimum.getResiduals().getMaxValue());
- System.out.format("Optimization performed in %d iterations \n", optimum.getEvaluations());
+ System.out.format("Optimization performed in %d iterations \n", optimum.getIterations());
+ System.out.format("Optimization performed with %d evaluations of model (objective) function \n", optimum.getEvaluations());
System.out.format("RMSE: %f \n", optimum.getRMS());
}
- /** Start optimization to adjust parameters (liaison points study).
+ /** Start optimization to adjust parameters (tie points study).
* @param maxIterations iterations max
* @param convergenceThreshold threshold of convergence
* @param measurements measurements
* @param ruggeds Rugged instances A and B
- * @throws RuggedException
*/
public void optimization(final int maxIterations, final double convergenceThreshold,
final Observables measurements,
- final Collection<Rugged> ruggeds) throws RuggedException {
+ final Collection<Rugged> ruggeds) {
System.out.format("Iterations max: %d\tconvergence threshold: %3.6e \n", maxIterations, convergenceThreshold);
@@ -346,7 +325,8 @@ public class Refining {
// Print statistics
System.out.format("Max value: %3.6e %n", optimum.getResiduals().getMaxValue());
- System.out.format("Optimization performed in %d iterations \n", optimum.getEvaluations());
+ System.out.format("Optimization performed in %d iterations \n", optimum.getIterations());
+ System.out.format("Optimization performed with %d evaluations of model (objective) function \n", optimum.getEvaluations());
System.out.format("RMSE: %f \n", optimum.getRMS());
}
@@ -356,11 +336,9 @@ public class Refining {
* @param rollValue rotation on roll value
* @param pitchValue rotation on pitch value
* @param factorValue scale factor
- * @throws RuggedException
*/
public void paramsEstimation(final Rugged rugged, final String sensorName,
- final double rollValue, final double pitchValue, final double factorValue)
- throws RuggedException {
+ final double rollValue, final double pitchValue, final double factorValue) {
// Estimate Roll
double estimatedRoll = rugged.getLineSensor(sensorName).
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java
index 06192a0257beea23ebfb13664c8ca14d5f020d93..18023f41782aa83aed012683f406b23c3f3766c2 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/GroundMeasurementGenerator.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,12 +22,11 @@ import org.hipparchus.random.UncorrelatedRandomVectorGenerator;
import org.hipparchus.random.Well19937a;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
+import org.orekit.rugged.adjustment.measurements.Observables;
+import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.rugged.api.Rugged;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorPixel;
-import org.orekit.rugged.adjustment.measurements.Observables;
-import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
import org.orekit.time.AbsoluteDate;
/** Ground measurements generator (sensor to ground mapping).
@@ -60,10 +59,8 @@ public class GroundMeasurementGenerator implements Measurable {
* @param rugged Rugged instance
* @param sensorName sensor name
* @param dimension number of line of the sensor
- * @throws RuggedException
*/
- public GroundMeasurementGenerator(final Rugged rugged, final String sensorName, final int dimension)
- throws RuggedException {
+ public GroundMeasurementGenerator(final Rugged rugged, final String sensorName, final int dimension) {
// Generate reference mapping
this.groundMapping = new SensorToGroundMapping(rugged.getName(), sensorName);
@@ -97,7 +94,7 @@ public class GroundMeasurementGenerator implements Measurable {
}
@Override
- public void createMeasurement(final int lineSampling, final int pixelSampling) throws RuggedException {
+ public void createMeasurement(final int lineSampling, final int pixelSampling) {
for (double line = 0; line < dimension; line += lineSampling) {
@@ -119,8 +116,7 @@ public class GroundMeasurementGenerator implements Measurable {
}
@Override
- public void createNoisyMeasurement(final int lineSampling, final int pixelSampling, final Noise noise)
- throws RuggedException {
+ public void createNoisyMeasurement(final int lineSampling, final int pixelSampling, final Noise noise) {
// Estimate latitude and longitude errors (rad)
final Vector3D latLongError = estimateLatLongError();
@@ -171,9 +167,8 @@ public class GroundMeasurementGenerator implements Measurable {
/** Compute latitude and longitude errors
* @return the latitude and longitude errors (rad)
- * @throws RuggedException
*/
- private Vector3D estimateLatLongError() throws RuggedException {
+ private Vector3D estimateLatLongError() {
final int pix = sensor.getNbPixels() / 2;
final int line = (int) FastMath.floor(pix); // assumption : same number of line and pixels;
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java
index 49c56cbd1021b6302f44b5ed27825863030be132..367dff1f121b498b34f457eaee137000459f6d31 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/InterMeasurementGenerator.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,7 +22,6 @@ import org.hipparchus.random.Well19937a;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.Rugged;
import org.orekit.rugged.errors.RuggedException;
-import org.orekit.rugged.errors.RuggedExceptionWrapper;
import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorPixel;
@@ -84,11 +83,9 @@ public class InterMeasurementGenerator implements Measurable {
* @param ruggedB Rugged instance corresponding to the viewing model B
* @param sensorNameB sensor name B
* @param dimensionB number of line for acquisition B
- * @throws RuggedException
*/
public InterMeasurementGenerator(final Rugged ruggedA, final String sensorNameA, final int dimensionA,
- final Rugged ruggedB, final String sensorNameB, final int dimensionB)
- throws RuggedException {
+ final Rugged ruggedB, final String sensorNameB, final int dimensionB) {
// Initialize parameters
initParams(ruggedA, sensorNameA, dimensionA, ruggedB, sensorNameB, dimensionB);
@@ -110,12 +107,10 @@ public class InterMeasurementGenerator implements Measurable {
* @param sensorNameB sensor name B
* @param dimensionB dimension for acquisition B
* @param outlier limit value for outlier points
- * @throws RuggedException
*/
public InterMeasurementGenerator(final Rugged ruggedA, final String sensorNameA, final int dimensionA,
final Rugged ruggedB, final String sensorNameB, final int dimensionB,
- final double outlier)
- throws RuggedException {
+ final double outlier) {
this(ruggedA, sensorNameA, dimensionA, ruggedB, sensorNameB, dimensionB);
this.outlier = outlier;
@@ -132,12 +127,10 @@ public class InterMeasurementGenerator implements Measurable {
* @param outlier limit value for outlier points
* @param earthConstraintWeight weight given to the Earth distance constraint
* with respect to the LOS distance (between 0 and 1).
- * @throws RuggedException
*/
public InterMeasurementGenerator(final Rugged ruggedA, final String sensorNameA, final int dimensionA,
final Rugged ruggedB, final String sensorNameB, final int dimensionB,
- final double outlier, final double earthConstraintWeight)
- throws RuggedException {
+ final double outlier, final double earthConstraintWeight) {
// Initialize parameters
initParams(ruggedA, sensorNameA, dimensionA, ruggedB, sensorNameB, dimensionB);
@@ -175,7 +168,7 @@ public class InterMeasurementGenerator implements Measurable {
}
@Override
- public void createMeasurement(final int lineSampling, final int pixelSampling) throws RuggedException {
+ public void createMeasurement(final int lineSampling, final int pixelSampling) {
// Search the sensor pixel seeing point
final int minLine = 0;
@@ -235,10 +228,8 @@ public class InterMeasurementGenerator implements Measurable {
* @param lineSampling sampling along lines
* @param pixelSampling sampling along columns
* @param noise errors to apply to measure for pixel A and pixel B
- * @throws RuggedException
*/
- public void createNoisyMeasurement(final int lineSampling, final int pixelSampling, final Noise noise)
- throws RuggedException {
+ public void createNoisyMeasurement(final int lineSampling, final int pixelSampling, final Noise noise) {
// Get noise features (errors)
// [pixelA, pixelB] mean
@@ -305,10 +296,11 @@ public class InterMeasurementGenerator implements Measurable {
// Increment the number of measurements
this.measurementCount++;
- }
- }
- }
- }
+
+ } // end test if geoDistance < outlier
+ } // end test if sensorPixelB != null
+ } // end loop on pixel of sensorA
+ } // end loop on line of sensorA
this.observables.addInterMapping(interMapping);
}
@@ -321,16 +313,14 @@ public class InterMeasurementGenerator implements Measurable {
* @param rB Rugged instance B
* @param sNameB sensor name B
* @param dimB dimension for acquisition B
- * @throws RuggedException
*/
private void initParams(final Rugged rA, final String sNameA, final int dimA,
- final Rugged rB, final String sNameB, final int dimB)
- throws RuggedException {
+ final Rugged rB, final String sNameB, final int dimB) {
this.sensorNameB = sNameB;
// Check that sensors's name is different
if (sNameA.contains(sNameB)) {
- throw new RuggedExceptionWrapper(new RuggedException(RuggedMessages.DUPLICATED_PARAMETER_NAME, sNameA));
+ throw new RuggedException(RuggedMessages.DUPLICATED_PARAMETER_NAME, sNameA);
}
this.ruggedA = rA;
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java
index 0f778026873bbfe19866a5e973ac0c04f49baedc..36521946d3badf98bfcb93183cce14a3edfb0ce2 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Measurable.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,8 +16,6 @@
*/
package fr.cs.examples.refiningPleiades.generators;
-import org.orekit.rugged.errors.RuggedException;
-
/** For measurements generator.
* @author Lucie Labat-Allee
* @author Guylaine Prat
@@ -27,23 +25,20 @@ public interface Measurable {
/** Get the number of measurements
* @return the number of measurements
- * @throws RuggedException
*/
- int getMeasurementCount() throws RuggedException;
+ int getMeasurementCount();
/** Create measurements (without noise)
* @param lineSampling line sampling
* @param pixelSampling pixel sampling
- * @throws RuggedException
*/
- void createMeasurement(int lineSampling, int pixelSampling) throws RuggedException;
+ void createMeasurement(int lineSampling, int pixelSampling);
/** Create noisy measurements
* @param lineSampling line sampling
* @param pixelSampling pixel sampling
* @param noise the noise to add to the measurements
- * @throws RuggedException
*/
- void createNoisyMeasurement(int lineSampling, int pixelSampling, Noise noise) throws RuggedException;
+ void createNoisyMeasurement(int lineSampling, int pixelSampling, Noise noise);
}
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java
index f48e00b3e991befcc7bdb1cf2a7b9e1937459acd..963acf8067642d33006fdcaca8a7434c9a77b13d 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/generators/Noise.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java
index ae8effcb6bb3cc2e10aa45765c0d6d4a6c9dd045..da083fb62ff354e7f2b7c70bd016ea86d14ef1a5 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/DistanceTools.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java
index 596c8203996f024dbaead3a2c0653d657bcbcae1..fd8d05c82e38a435916d69b769bd7af66aaaf226 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/metrics/LocalisationMetrics.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -23,18 +23,17 @@ import java.util.Set;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
import org.hipparchus.util.FastMath;
import org.orekit.bodies.GeodeticPoint;
+import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
+import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
import org.orekit.rugged.api.Rugged;
-import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorPixel;
-import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping;
-import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
/**
* Class for testing geometric performances in absolute location.
- * Metrics are computed for two scenarios: ground points and liaison points.
+ * Metrics are computed for two scenarios: ground control points and tie points.
* @see SensorToSensorMapping
* @see SensorToGroundMapping
* @author Jonathan Guinet
@@ -63,33 +62,29 @@ public class LocalisationMetrics {
private double earthDistanceMean;
- /** Compute metrics corresponding to the ground points study.
+ /** Compute metrics corresponding to the Ground Control Points (GCP) study.
* @param measMapping Mapping of observations/measurements = the ground truth
* @param rugged Rugged instance
* @param computeAngular flag to know if distance is computed in meters (false) or with angular (true)
- * @exception RuggedException if direct location fails
*/
- public LocalisationMetrics(final SensorToGroundMapping measMapping, final Rugged rugged, final boolean computeAngular)
- throws RuggedException {
+ public LocalisationMetrics(final SensorToGroundMapping measMapping, final Rugged rugged, final boolean computeAngular) {
// Initialization
this.resMax = 0.0;
this.resMean = 0.0;
- // Compute metrics - Case of Sensor to Ground mapping (fulcrum points study)
- computeMetrics(measMapping, rugged, computeAngular);
+ // Compute metrics - Case of Sensor to Ground mapping (Ground Control Points GCP study)
+ computeGCPmetrics(measMapping, rugged, computeAngular);
}
- /** Compute metrics corresponding to the liaison points study.
+ /** Compute metrics corresponding to the tie points study.
* @param measMapping Mapping of observations/measurements = the ground truth
* @param ruggedA Rugged instance corresponding to viewing model A
* @param ruggedB Rugged instance corresponding to viewing model B
* @param computeAngular flag to know if distance is computed in meters (false) or with angular (true)
- * @exception RuggedException if direct location fails
*/
public LocalisationMetrics(final SensorToSensorMapping measMapping, final Rugged ruggedA, final Rugged ruggedB,
- final boolean computeAngular)
- throws RuggedException {
+ final boolean computeAngular) {
// Initialization
this.resMax = 0.0;
@@ -99,19 +94,17 @@ public class LocalisationMetrics {
this.earthDistanceMax = 0.0;
this.earthDistanceMean = 0.0;
- // Compute metrics - Case of Sensor to Sensor mapping (liaison points study)
- computeLiaisonMetrics(measMapping, ruggedA, ruggedB, computeAngular);
+ // Compute metrics - Case of Sensor to Sensor mapping (tie points study)
+ computeTiePointsMetrics(measMapping, ruggedA, ruggedB, computeAngular);
}
/**
- * Compute metrics: case of ground control points.
+ * Compute metrics: case of ground control points (GCP).
* @param measMapping Mapping of observations/measurements = the ground truth
* @param rugged Rugged instance
* @param computeAngular flag to know if distance is computed in meters (false) or with angular (true)
- * @exception RuggedException if direct location fails
*/
- public void computeMetrics(final SensorToGroundMapping measMapping, final Rugged rugged, final boolean computeAngular)
- throws RuggedException {
+ public void computeGCPmetrics(final SensorToGroundMapping measMapping, final Rugged rugged, final boolean computeAngular) {
// Mapping of observations/measurements = the ground truth
final Set<Map.Entry<SensorPixel, GeodeticPoint>> measurementsMapping;
@@ -154,16 +147,14 @@ public class LocalisationMetrics {
}
/**
- * Compute metrics: case of liaison points.
+ * Compute metrics: case of tie points.
* @param measMapping Mapping of observations/measurements = the ground truth
* @param ruggedA Rugged instance corresponding to viewing model A
* @param ruggedB Rugged instance corresponding to viewing model B
* @param computeAngular Flag to know if distance is computed in meters (false) or with angular (true)
- * @exception RuggedException if direct location fails
*/
- public void computeLiaisonMetrics(final SensorToSensorMapping measMapping, final Rugged ruggedA, final Rugged ruggedB,
- final boolean computeAngular)
- throws RuggedException {
+ public void computeTiePointsMetrics(final SensorToSensorMapping measMapping, final Rugged ruggedA, final Rugged ruggedB,
+ final boolean computeAngular) {
// Mapping of observations/measurements = the ground truth
final Set<Map.Entry<SensorPixel, SensorPixel>> measurementsMapping;
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java
index 1ab3b9fc7c369055b585437a15e825ce14c732f0..31fe0895a2e2223fd6f17cfae667ca40911acf38 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/OrbitModel.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,48 +16,40 @@
*/
package fr.cs.examples.refiningPleiades.models;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hipparchus.geometry.euclidean.threed.Rotation;
-import org.hipparchus.geometry.euclidean.threed.RotationOrder;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
+import org.hipparchus.geometry.euclidean.threed.RotationOrder;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-import org.hipparchus.ode.nonstiff.DormandPrince853Integrator;
import org.hipparchus.util.FastMath;
-import java.util.ArrayList;
-import java.util.List;
import org.orekit.attitudes.AttitudeProvider;
-import org.orekit.attitudes.NadirPointing;
-import org.orekit.attitudes.YawCompensation;
import org.orekit.attitudes.LofOffset;
+import org.orekit.attitudes.NadirPointing;
import org.orekit.attitudes.TabulatedLofOffset;
+import org.orekit.attitudes.YawCompensation;
import org.orekit.bodies.BodyShape;
-import org.orekit.bodies.CelestialBodyFactory;
import org.orekit.bodies.OneAxisEllipsoid;
-import org.orekit.errors.OrekitException;
-import org.orekit.forces.gravity.HolmesFeatherstoneAttractionModel;
-import org.orekit.forces.gravity.ThirdBodyAttraction;
import org.orekit.forces.gravity.potential.GravityFieldFactory;
import org.orekit.forces.gravity.potential.NormalizedSphericalHarmonicsProvider;
import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
-import org.orekit.frames.Transform;
import org.orekit.frames.LOFType;
+import org.orekit.frames.Transform;
import org.orekit.orbits.CircularOrbit;
import org.orekit.orbits.Orbit;
-import org.orekit.orbits.OrbitType;
import org.orekit.orbits.PositionAngle;
import org.orekit.propagation.Propagator;
-import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.analytical.KeplerianPropagator;
-import org.orekit.propagation.numerical.NumericalPropagator;
import org.orekit.time.AbsoluteDate;
-
import org.orekit.time.TimeScale;
+import org.orekit.utils.AngularDerivativesFilter;
import org.orekit.utils.Constants;
import org.orekit.utils.IERSConventions;
import org.orekit.utils.PVCoordinates;
import org.orekit.utils.TimeStampedAngularCoordinates;
import org.orekit.utils.TimeStampedPVCoordinates;
-import org.orekit.utils.AngularDerivativesFilter;
/**
* Orbit Model class to generate positions-velocities and attitude quaternions.
@@ -98,8 +90,7 @@ public class OrbitModel {
final List<TimeStampedPVCoordinates> satellitePVList,
final String absDate,
final double px, final double py, final double pz,
- final double vx, final double vy, final double vz)
- throws OrekitException {
+ final double vx, final double vy, final double vz) {
final AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
final Vector3D position = new Vector3D(px, py, pz);
@@ -127,9 +118,8 @@ public class OrbitModel {
/** Create an Earth.
* @return the Earth as the WGS84 ellipsoid
- * @throws OrekitException
*/
- public BodyShape createEarth() throws OrekitException {
+ public BodyShape createEarth() {
return new OneAxisEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
@@ -138,9 +128,8 @@ public class OrbitModel {
/** Created a gravity field.
* @return normalized spherical harmonics coefficients
- * @throws OrekitException
*/
- public NormalizedSphericalHarmonicsProvider createGravityField() throws OrekitException {
+ public NormalizedSphericalHarmonicsProvider createGravityField() {
return GravityFieldFactory.getNormalizedProvider(12, 12);
}
@@ -148,9 +137,8 @@ public class OrbitModel {
/** Create an orbit at a chosen date.
* @param mu Earth gravitational constant
* @return the orbit
- * @throws OrekitException
*/
- public Orbit createOrbit(final double mu, final AbsoluteDate date) throws OrekitException {
+ public Orbit createOrbit(final double mu, final AbsoluteDate date) {
// the following orbital parameters have been computed using
// Orekit tutorial about phasing, using the following configuration:
@@ -202,8 +190,7 @@ public class OrbitModel {
/** Get the offset.
*/
- private Rotation getOffset(final BodyShape earth, final Orbit orbit, final double shift)
- throws OrekitException {
+ private Rotation getOffset(final BodyShape earth, final Orbit orbit, final double shift){
final LOFType type = LOFType.VVLH;
final double roll = getPoly(lofTransformRollPoly, shift);
@@ -226,8 +213,7 @@ public class OrbitModel {
/** Create the attitude provider.
*/
- public AttitudeProvider createAttitudeProvider(final BodyShape earth, final Orbit orbit)
- throws OrekitException {
+ public AttitudeProvider createAttitudeProvider(final BodyShape earth, final Orbit orbit) {
if (userDefinedLOFTransform) {
final LOFType type = LOFType.VVLH;
@@ -250,46 +236,11 @@ public class OrbitModel {
}
}
- /** Create the orbit propagator.
- */
- public Propagator createPropagator(final BodyShape earth,
- final NormalizedSphericalHarmonicsProvider gravityField,
- final Orbit orbit)
- throws OrekitException {
-
- final AttitudeProvider attitudeProvider = createAttitudeProvider(earth, orbit);
-
- final SpacecraftState state =
- new SpacecraftState(orbit,
- attitudeProvider.getAttitude(orbit, orbit.getDate(), orbit.getFrame()), 1180.0);
-
- // numerical model for improving orbit
- final OrbitType type = OrbitType.CIRCULAR;
- final double[][] tolerances = NumericalPropagator.tolerances(0.1, orbit, type);
- final DormandPrince853Integrator integrator =
- new DormandPrince853Integrator(1.0e-4 * orbit.getKeplerianPeriod(),
- 1.0e-1 * orbit.getKeplerianPeriod(),
- tolerances[0],
- tolerances[1]);
- integrator.setInitialStepSize(1.0e-2 * orbit.getKeplerianPeriod());
-
- final NumericalPropagator numericalPropagator = new NumericalPropagator(integrator);
- numericalPropagator.addForceModel(new HolmesFeatherstoneAttractionModel(earth.getBodyFrame(), gravityField));
- numericalPropagator .addForceModel(new ThirdBodyAttraction(CelestialBodyFactory.getSun()));
- numericalPropagator .addForceModel(new ThirdBodyAttraction(CelestialBodyFactory.getMoon()));
- numericalPropagator.setOrbitType(type);
- numericalPropagator.setInitialState(state);
- numericalPropagator.setAttitudeProvider(attitudeProvider);
-
- return numericalPropagator;
- }
-
/** Generate the orbit.
*/
public List<TimeStampedPVCoordinates> orbitToPV(final Orbit orbit, final BodyShape earth,
final AbsoluteDate minDate, final AbsoluteDate maxDate,
- final double step)
- throws OrekitException {
+ final double step) {
final Propagator propagator = new KeplerianPropagator(orbit);
@@ -312,8 +263,7 @@ public class OrbitModel {
*/
public List<TimeStampedAngularCoordinates> orbitToQ(final Orbit orbit, final BodyShape earth,
final AbsoluteDate minDate, final AbsoluteDate maxDate,
- final double step)
- throws OrekitException {
+ final double step) {
final Propagator propagator = new KeplerianPropagator(orbit);
propagator.setAttitudeProvider(createAttitudeProvider(earth, orbit));
diff --git a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java
index b54af4efbf63f95a651806c0a665687029bd7c8d..8e21a7851907fc98624c459f9bb6499fd185df04 100644
--- a/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java
+++ b/src/tutorials/java/fr/cs/examples/refiningPleiades/models/PleiadesViewingModel.java
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 CS Systèmes d'Information
+/* Copyright 2013-2019 CS Systèmes d'Information
* Licensed to CS Systèmes d'Information (CS) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,15 +16,16 @@
*/
package fr.cs.examples.refiningPleiades.models;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hipparchus.geometry.euclidean.threed.Rotation;
import org.hipparchus.geometry.euclidean.threed.RotationConvention;
import org.hipparchus.geometry.euclidean.threed.Vector3D;
-
import org.hipparchus.util.FastMath;
-import java.util.ArrayList;
-import java.util.List;
-
-
+import org.orekit.rugged.linesensor.LineDatation;
+import org.orekit.rugged.linesensor.LineSensor;
+import org.orekit.rugged.linesensor.LinearLineDatation;
import org.orekit.rugged.los.FixedRotation;
import org.orekit.rugged.los.FixedZHomothety;
import org.orekit.rugged.los.LOSBuilder;
@@ -35,13 +36,6 @@ import org.orekit.time.TimeScalesFactory;
import fr.cs.examples.refiningPleiades.Refining;
-import org.orekit.rugged.linesensor.LinearLineDatation;
-import org.orekit.rugged.linesensor.LineDatation;
-import org.orekit.rugged.linesensor.LineSensor;
-
-import org.orekit.rugged.errors.RuggedException;
-import org.orekit.errors.OrekitException;
-
/**
* Pleiades viewing model class definition.
* The aim of this class is to simulate PHR sensor.
@@ -71,7 +65,7 @@ public class PleiadesViewingModel {
* sensorName="line", incidenceAngle = 0.0, date = "2016-01-01T12:00:00.0"
* </p>
*/
- public PleiadesViewingModel(final String sensorName) throws RuggedException, OrekitException {
+ public PleiadesViewingModel(final String sensorName) {
this(sensorName, 0.0, "2016-01-01T12:00:00.0");
}
@@ -80,11 +74,8 @@ public class PleiadesViewingModel {
* @param sensorName sensor name
* @param incidenceAngle incidence angle
* @param referenceDate reference date
- * @throws RuggedException
- * @throws OrekitException
*/
- public PleiadesViewingModel(final String sensorName, final double incidenceAngle, final String referenceDate)
- throws RuggedException, OrekitException {
+ public PleiadesViewingModel(final String sensorName, final double incidenceAngle, final String referenceDate) {
this.sensorName = sensorName;
this.date = referenceDate;
@@ -126,7 +117,7 @@ public class PleiadesViewingModel {
/** Get the reference date.
*/
- public AbsoluteDate getDatationReference() throws OrekitException {
+ public AbsoluteDate getDatationReference() {
// We use Orekit for handling time and dates, and Rugged for defining the datation model:
final TimeScale utc = TimeScalesFactory.getUTC();
@@ -136,13 +127,13 @@ public class PleiadesViewingModel {
/** Get the min date.
*/
- public AbsoluteDate getMinDate() throws RuggedException {
+ public AbsoluteDate getMinDate() {
return lineSensor.getDate(0);
}
/** Get the max date.
*/
- public AbsoluteDate getMaxDate() throws RuggedException {
+ public AbsoluteDate getMaxDate() {
return lineSensor.getDate(DIMENSION);
}
@@ -167,7 +158,7 @@ public int getDimension() {
/** Create the line sensor
*/
- private void createLineSensor() throws RuggedException, OrekitException {
+ private void createLineSensor() {
// Offset of the MSI from center of mass of satellite
// one line sensor