diff --git a/NOTICE.txt b/NOTICE.txt index bc1cdecde19fab0aa842e873d3938e2b0c3f5c36..b915f8d653e210e1626ae6db2056cf3baa04df19 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ OREKIT -Copyright 2002-2018 CS Systèmes d'Information +Copyright 2002-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/build.xml b/build.xml index 2ad74b871b21a94ef35210c24e468667fe7c5843..bd1b8a27a8c6e0297ad6e6ecebbb3dc52380b61a 100644 --- a/build.xml +++ b/build.xml @@ -18,7 +18,7 @@ <property name="lib.dir" location="lib" /> - <property name="hipparchus.version" value="1.3" /> + <property name="hipparchus.version" value="1.4" /> <property name="hipparchus.core.jar" value="hipparchus-core-${hipparchus.version}.jar" /> <property name="hipparchus.geometry.jar" value="hipparchus-geometry-${hipparchus.version}.jar" /> <property name="hipparchus.ode.jar" value="hipparchus-ode-${hipparchus.version}.jar" /> @@ -35,7 +35,7 @@ <property name="hamcrest.maven.path" value="org/hamcrest" /> <property name="maven.repository" value="http://repo1.maven.org/maven2" /> - <property name="copyright" value="2002-2018 CS Systèmes d'Information" /> + <property name="copyright" value="2002-2019 CS Systèmes d'Information" /> <available file="${lib.dir}/${hipparchus.core.jar}" property="libs.present" /> diff --git a/pom.xml b/pom.xml index 9b0ba014b28119da0f51259a296e319865990e8c..7c29bd36811b8eb16cf3d30ca3756f2ec563b9be 100644 --- a/pom.xml +++ b/pom.xml @@ -245,29 +245,6 @@ <url>https://gitlab.orekit.org/orekit/orekit/issues</url> </issueManagement> - <mailingLists> - <mailingList> - <name>Orekit 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>Orekit users mailing list</name> - <subscribe>https://www.orekit.org/wws/subscribe/orekit-users</subscribe> - <unsubscribe>https://www.orekit.org/wws/signoff/orekit-users</unsubscribe> - <post>orekit-users@orekit.org</post> - <archive>https://www.orekit.org/wws/arc/orekit-users</archive> - </mailingList> - <mailingList> - <name>Orekit developers mailing list</name> - <subscribe>https://www.orekit.org/wws/subscribe/orekit-developers</subscribe> - <unsubscribe>https://www.orekit.org/wws/signoff/orekit-developers</unsubscribe> - <post>orekit-developers@orekit.org</post> - <archive>https://www.orekit.org/wws/arc/orekit-developers</archive> - </mailingList> - </mailingLists> - <dependencies> <dependency> <groupId>org.hipparchus</groupId> diff --git a/src/design/attitude-class-diagram.puml b/src/design/attitude-class-diagram.puml index 60127c84972e91888497b0b4f8fe61b13c1babe9..f7976d21ead3065ccc867c69173c0a771b204543 100644 --- a/src/design/attitude-class-diagram.puml +++ b/src/design/attitude-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/available-propagators-class-diagram.puml b/src/design/available-propagators-class-diagram.puml index 6290599f8b32f91e9285cf272832d9cc7c1b0ef0..dc0487861f8245f9c41b2ef9dba6ef61ad83650c 100644 --- a/src/design/available-propagators-class-diagram.puml +++ b/src/design/available-propagators-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/bodyshape-class-diagram.puml b/src/design/bodyshape-class-diagram.puml index e2d847b7a9524350ba6baafac046ad2724a87bea..1629a91ece596e6c29f85acd70f65f2430a9ed2b 100644 --- a/src/design/bodyshape-class-diagram.puml +++ b/src/design/bodyshape-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/celestial-bodies-class-diagram.puml b/src/design/celestial-bodies-class-diagram.puml index 0de16a43ea501b526b67d34c53f214c00501711b..3364d756a9ea397597e653cb31ec931381b9701d 100644 --- a/src/design/celestial-bodies-class-diagram.puml +++ b/src/design/celestial-bodies-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/data-class-diagram.puml b/src/design/data-class-diagram.puml index 2db4a0f3f5afb3ec52c2e199ea6dd5b865313e0d..4f14033a4c5bb8975383111b9628c06ce9411778 100644 --- a/src/design/data-class-diagram.puml +++ b/src/design/data-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/dsst-propagation-sequence-diagram.puml b/src/design/dsst-propagation-sequence-diagram.puml index 98b871cf0081d9956b796957edff97fc9abb81df..027cdd7620235000cf4499dcfaa39bbea55b995e 100644 --- a/src/design/dsst-propagation-sequence-diagram.puml +++ b/src/design/dsst-propagation-sequence-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/dsst-propagator-class-diagram.puml b/src/design/dsst-propagator-class-diagram.puml index 353f609e264ee5284ab5897d6e51474ce28569e3..4e1c37b2d5d2ecac23b3aaa710f610397a09dd3f 100644 --- a/src/design/dsst-propagator-class-diagram.puml +++ b/src/design/dsst-propagator-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/dsst-tesseral-contribution-class-diagram.puml b/src/design/dsst-tesseral-contribution-class-diagram.puml index 2e62a669401282fb7027711ca7bb83da03df132a..9c9573e541c5365ed5cc6c31b6527607095c6ffa 100644 --- a/src/design/dsst-tesseral-contribution-class-diagram.puml +++ b/src/design/dsst-tesseral-contribution-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/dsst-third-body-class-diagram.puml b/src/design/dsst-third-body-class-diagram.puml index b9d34a0a0b082d4b7a0b7e447cc7c7e811861c8a..68ed0f7f4df2779d3ca9c810a1134db1cbde41c9 100644 --- a/src/design/dsst-third-body-class-diagram.puml +++ b/src/design/dsst-third-body-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/dsst-zonal-contribution-class-diagram.puml b/src/design/dsst-zonal-contribution-class-diagram.puml index 29808378fc1c068aaaaca9422c00ec4be1b7b8b9..7bc3f4480a870015968e7ba38282c50d56e4857c 100644 --- a/src/design/dsst-zonal-contribution-class-diagram.puml +++ b/src/design/dsst-zonal-contribution-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/ephemeris-generation-mode-sequence-diagram.puml b/src/design/ephemeris-generation-mode-sequence-diagram.puml index 174bb60fc2b39df4ffc2713b0ba54729cbfc2ef2..d33aa2cba7a6ab0554be48e628f27c5bc9bc1aec 100644 --- a/src/design/ephemeris-generation-mode-sequence-diagram.puml +++ b/src/design/ephemeris-generation-mode-sequence-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/events-class-diagram.puml b/src/design/events-class-diagram.puml index cad00e52b4324555f9f90e0c491d2d48ad7d4c63..56e1ce44d0c38bfe218826bfb924823ebae13f33 100644 --- a/src/design/events-class-diagram.puml +++ b/src/design/events-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/events-sequence-diagram.puml b/src/design/events-sequence-diagram.puml index f37430cff5cb81869dd23617f764961feb5fa36c..24fde703e91aff70cd84b39329e2dbb1658a025a 100644 --- a/src/design/events-sequence-diagram.puml +++ b/src/design/events-sequence-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/field.puml b/src/design/field.puml index 25bf0a29a1c8fe03cfa061c1458c81fe3ffec045..e1df3fe20cbdc0446ac23e8c87dd8eeeaa9b7523 100644 --- a/src/design/field.puml +++ b/src/design/field.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/frames-class-diagram.puml b/src/design/frames-class-diagram.puml index 5a438da3231789cab6cf7f349338e4c245962d84..15c5a1920c0d2534ab00fc76688917da7d1e1fa0 100644 --- a/src/design/frames-class-diagram.puml +++ b/src/design/frames-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/gnss-antenna-class-diagram.puml b/src/design/gnss-antenna-class-diagram.puml index 501319c129c1f477642773cd7cfbb37bf265c70c..70d7e58e64ba096f93054d14823e21fdb853ceea 100644 --- a/src/design/gnss-antenna-class-diagram.puml +++ b/src/design/gnss-antenna-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/gnss-rinex-class-diagram.puml b/src/design/gnss-rinex-class-diagram.puml index 6c5727e1b72faa6d1a7d8ae19c154d29f5b78d21..cebe7f82bc0a17d6b1608e250c07bd912c1eca56 100644 --- a/src/design/gnss-rinex-class-diagram.puml +++ b/src/design/gnss-rinex-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/kalman-overview-class-diagram.puml b/src/design/kalman-overview-class-diagram.puml index bdabd2545d911b0ac58cdc79d8e7cf49f6b3f1b5..c330d2063286f8b84623d0a75eafd60a670b3063 100644 --- a/src/design/kalman-overview-class-diagram.puml +++ b/src/design/kalman-overview-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/master-mode-sequence-diagram.puml b/src/design/master-mode-sequence-diagram.puml index 4562445bcc4d6f0ccfc56f6fc047ae90517a8685..a20d2a16abad08a64a3cf160a840bc40653c3894 100644 --- a/src/design/master-mode-sequence-diagram.puml +++ b/src/design/master-mode-sequence-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/measurements-generation-class-diagram.puml b/src/design/measurements-generation-class-diagram.puml index 44d80bb00b4ced71e8402bfe1f757398a56d3b4a..a8c753bcd0e2b624c12d91e4583c34a354b4fe39 100644 --- a/src/design/measurements-generation-class-diagram.puml +++ b/src/design/measurements-generation-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/numerical-propagation-sequence-diagram.puml b/src/design/numerical-propagation-sequence-diagram.puml index ce9da1e31c0884dcfefe3f55bd81483fa825036a..1610c9aa002bbbf7277697f26fcba1aca31986f5 100644 --- a/src/design/numerical-propagation-sequence-diagram.puml +++ b/src/design/numerical-propagation-sequence-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/orbit-determination-measurements-class-diagram.puml b/src/design/orbit-determination-measurements-class-diagram.puml index 892556a7710821211f7748a33a5842c87415ea14..3809f415cbe13c638e45aea93f50fccb6818cde1 100644 --- a/src/design/orbit-determination-measurements-class-diagram.puml +++ b/src/design/orbit-determination-measurements-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/orbit-determination-overview-class-diagram.puml b/src/design/orbit-determination-overview-class-diagram.puml index e6c75b79e39f6b14aef0627b8b48bd29b9e4798e..7d104789a0b4b9b8867e97798c414437f2f44807 100644 --- a/src/design/orbit-determination-overview-class-diagram.puml +++ b/src/design/orbit-determination-overview-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/orbit-determination-parameters-class-diagram.puml b/src/design/orbit-determination-parameters-class-diagram.puml index fc42af246a8f103a7976d4098ad3c5efc66f1433..7fa70028ee8a21f809a4c0af7a371666ce0e9f4b 100644 --- a/src/design/orbit-determination-parameters-class-diagram.puml +++ b/src/design/orbit-determination-parameters-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/orbits-class-diagram.puml b/src/design/orbits-class-diagram.puml index 354e532614b86419165a7b687e11e45bfa37e9df..1e0504cf1a630eeef6c7c4d2fa967c81712022a9 100644 --- a/src/design/orbits-class-diagram.puml +++ b/src/design/orbits-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/partial-derivatives-class-diagram.puml b/src/design/partial-derivatives-class-diagram.puml index 3cf4ee9106c0ffb6e4a12465dd696f416152bfb0..ba40b6b5e38b769d713b4186f9c3f9642e406774 100644 --- a/src/design/partial-derivatives-class-diagram.puml +++ b/src/design/partial-derivatives-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/propagation-class-diagram.puml b/src/design/propagation-class-diagram.puml index 59389e7066e0fde5b734a4ba08d864d843f524d3..3773aafe95a8cea6769ee3c4272a7c9cef0a2b2c 100644 --- a/src/design/propagation-class-diagram.puml +++ b/src/design/propagation-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/propagator-conversion-class-diagram.puml b/src/design/propagator-conversion-class-diagram.puml index 362b5ecee60c49541c96ded63516486c70de38ea..777c49855896f8ab05ad27df792fcd47a183da30 100644 --- a/src/design/propagator-conversion-class-diagram.puml +++ b/src/design/propagator-conversion-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/sampling-class-diagram.puml b/src/design/sampling-class-diagram.puml index 49dac91843a1ea350375764836b8675c12ee2164..faf21b5edbe128c1ccca19a991d0451cc07e03e6 100644 --- a/src/design/sampling-class-diagram.puml +++ b/src/design/sampling-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/slave-mode-sequence-diagram.puml b/src/design/slave-mode-sequence-diagram.puml index a3a9a7510d8d3d01e62346aa0aa90b75ca4dea1c..e0cdbc42d699139b68e46dd7c4e2785b8878e39b 100644 --- a/src/design/slave-mode-sequence-diagram.puml +++ b/src/design/slave-mode-sequence-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/tessellation-class-diagram.puml b/src/design/tessellation-class-diagram.puml index db05a3da81ce2e7bffaa97a40487dfb2b44e2e1e..427ba2068c0e0bb8791d32c3f1a3d31d6ceb8985 100644 --- a/src/design/tessellation-class-diagram.puml +++ b/src/design/tessellation-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/time-class-diagram.puml b/src/design/time-class-diagram.puml index cc267bc9b9eb0870b51dba82d9d87694415f971e..fef1c278efec8789b100d35ce8aa97ad708859e4 100644 --- a/src/design/time-class-diagram.puml +++ b/src/design/time-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/top-packages.puml b/src/design/top-packages.puml index 75164728cd5282f81717c79a0b2347bfb54a8a15..aa9e091f9ef118c56b6b248a4ee46182974f1815 100644 --- a/src/design/top-packages.puml +++ b/src/design/top-packages.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/utils-class-diagram.puml b/src/design/utils-class-diagram.puml index 6d785b4e33c86e742e86f6942b50295eec430bc4..7379675626013f058206fa6a83fd769380143758 100644 --- a/src/design/utils-class-diagram.puml +++ b/src/design/utils-class-diagram.puml @@ -1,4 +1,4 @@ -' Copyright 2002-2018 CS Systèmes d'Information +' Copyright 2002-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/attitudes/Attitude.java b/src/main/java/org/orekit/attitudes/Attitude.java index f97a9cb9846a2f2e3d3ccbc08489406559290c7a..0428f9d4e99f18dd7f1328c01b31e5744e1d85d9 100644 --- a/src/main/java/org/orekit/attitudes/Attitude.java +++ b/src/main/java/org/orekit/attitudes/Attitude.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/AttitudeProvider.java b/src/main/java/org/orekit/attitudes/AttitudeProvider.java index 9388c0f47895d5d6d13118514de420304cb9f9a9..56f9f461d5beb095e820d52c2b4c53bcb1e9bb51 100644 --- a/src/main/java/org/orekit/attitudes/AttitudeProvider.java +++ b/src/main/java/org/orekit/attitudes/AttitudeProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/AttitudeProviderModifier.java b/src/main/java/org/orekit/attitudes/AttitudeProviderModifier.java index 104901b3800469e51aa3014756d1834095ab0031..fdff70ba8699c010e6cd4e3c401963d327eb6dcd 100644 --- a/src/main/java/org/orekit/attitudes/AttitudeProviderModifier.java +++ b/src/main/java/org/orekit/attitudes/AttitudeProviderModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/AttitudesSequence.java b/src/main/java/org/orekit/attitudes/AttitudesSequence.java index 88c83e416558d0aec8c777ce30fd35893290b30e..e2b37a70e8bebf87b24afda44b7b5d8ceb9f1aef 100644 --- a/src/main/java/org/orekit/attitudes/AttitudesSequence.java +++ b/src/main/java/org/orekit/attitudes/AttitudesSequence.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/BodyCenterPointing.java b/src/main/java/org/orekit/attitudes/BodyCenterPointing.java index 18ec6b5339f7b5ce4d41df5934b0e40db0b40622..34c9d070826f0b05854f215e2b8718e255d136a1 100644 --- a/src/main/java/org/orekit/attitudes/BodyCenterPointing.java +++ b/src/main/java/org/orekit/attitudes/BodyCenterPointing.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/CelestialBodyPointed.java b/src/main/java/org/orekit/attitudes/CelestialBodyPointed.java index 927023a1fec2ccd02abadc00b03328c68d4192dc..7eb053811cbaafc1e7c74a7c0bfda6553cc737fb 100644 --- a/src/main/java/org/orekit/attitudes/CelestialBodyPointed.java +++ b/src/main/java/org/orekit/attitudes/CelestialBodyPointed.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/FieldAttitude.java b/src/main/java/org/orekit/attitudes/FieldAttitude.java index 21d88db32bc128f44f43b9ff1a2c00a306630d04..a1822d889b2a9d8a467acf860670f6f21d32f23c 100644 --- a/src/main/java/org/orekit/attitudes/FieldAttitude.java +++ b/src/main/java/org/orekit/attitudes/FieldAttitude.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/FixedRate.java b/src/main/java/org/orekit/attitudes/FixedRate.java index 0927c91d30d1ea6b0165af9bf2fac0c80bb12d11..5aa81e50826d3d0906680a5c0509d42efefd4621 100644 --- a/src/main/java/org/orekit/attitudes/FixedRate.java +++ b/src/main/java/org/orekit/attitudes/FixedRate.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/GroundPointing.java b/src/main/java/org/orekit/attitudes/GroundPointing.java index 602ae03f47b4ee2b67033a340d674cffe3139001..bd24079aba1ada5e5c88cd066b99bfd470b36bad 100644 --- a/src/main/java/org/orekit/attitudes/GroundPointing.java +++ b/src/main/java/org/orekit/attitudes/GroundPointing.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/InertialProvider.java b/src/main/java/org/orekit/attitudes/InertialProvider.java index 7f3c60b5d968d18f04def0d0e2021b15b4edc3e6..b133d70c50855f2577c1e33d5eec7dfac074e9c8 100644 --- a/src/main/java/org/orekit/attitudes/InertialProvider.java +++ b/src/main/java/org/orekit/attitudes/InertialProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/LofOffset.java b/src/main/java/org/orekit/attitudes/LofOffset.java index fcba6cb0b249035ff80d5fd681e4921641ee173c..1f9e4c144c355be09d7f0939ce124d1d292be3cb 100644 --- a/src/main/java/org/orekit/attitudes/LofOffset.java +++ b/src/main/java/org/orekit/attitudes/LofOffset.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/LofOffsetPointing.java b/src/main/java/org/orekit/attitudes/LofOffsetPointing.java index 4add020412c60e7c1408fce6016d03a4bd667122..6104481efbbabcbe116f55627ed4f166c9e68c8f 100644 --- a/src/main/java/org/orekit/attitudes/LofOffsetPointing.java +++ b/src/main/java/org/orekit/attitudes/LofOffsetPointing.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/NadirPointing.java b/src/main/java/org/orekit/attitudes/NadirPointing.java index 4bfa24f9154ce72f427e934b14d92ca2b26c68e1..da97c86e440c0e30701a741e04907ee513d92294 100644 --- a/src/main/java/org/orekit/attitudes/NadirPointing.java +++ b/src/main/java/org/orekit/attitudes/NadirPointing.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/SpinStabilized.java b/src/main/java/org/orekit/attitudes/SpinStabilized.java index c4e57f95641cecc942845f03df5373cb6f0474b7..1a6f7d99a9423642a809b9924d614abf31fec84a 100644 --- a/src/main/java/org/orekit/attitudes/SpinStabilized.java +++ b/src/main/java/org/orekit/attitudes/SpinStabilized.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/TabulatedLofOffset.java b/src/main/java/org/orekit/attitudes/TabulatedLofOffset.java index a294cf1821ea6b03467710758f4d99b5da6b6244..0fc36ede2c428f34cba606a5ced9027d5c49e645 100644 --- a/src/main/java/org/orekit/attitudes/TabulatedLofOffset.java +++ b/src/main/java/org/orekit/attitudes/TabulatedLofOffset.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/TabulatedProvider.java b/src/main/java/org/orekit/attitudes/TabulatedProvider.java index 976fb7a2a75d5790458c06bc3ae1dda338a124ee..a329726edb418cc3838e2fe7bad7a83a3b0ac495 100644 --- a/src/main/java/org/orekit/attitudes/TabulatedProvider.java +++ b/src/main/java/org/orekit/attitudes/TabulatedProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/TargetPointing.java b/src/main/java/org/orekit/attitudes/TargetPointing.java index fa639446cb9e08243656318b001f7c2b172a9f62..395166a7cd897a20d11141f08f3bf61ab16372c9 100644 --- a/src/main/java/org/orekit/attitudes/TargetPointing.java +++ b/src/main/java/org/orekit/attitudes/TargetPointing.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/YawCompensation.java b/src/main/java/org/orekit/attitudes/YawCompensation.java index 468a3769d7ebe7cf247ce17f7671be2d9e206e7e..7c78b614eae2eb0987b5a91d6e16a7c5a7060a28 100644 --- a/src/main/java/org/orekit/attitudes/YawCompensation.java +++ b/src/main/java/org/orekit/attitudes/YawCompensation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/YawSteering.java b/src/main/java/org/orekit/attitudes/YawSteering.java index a7895d84059bf7ffaf072bae26dc218146b480d8..f3d476659b7a666eb68e68cd457bf0e493da9d04 100644 --- a/src/main/java/org/orekit/attitudes/YawSteering.java +++ b/src/main/java/org/orekit/attitudes/YawSteering.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/package-info.java b/src/main/java/org/orekit/attitudes/package-info.java index e556e6040a20a5c7a4f6be2f4af71378f2032a1b..e3be1ca7525bd0439be5ec4ee0300cfd4a9634f7 100644 --- a/src/main/java/org/orekit/attitudes/package-info.java +++ b/src/main/java/org/orekit/attitudes/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/BodyShape.java b/src/main/java/org/orekit/bodies/BodyShape.java index c4bc20d50ee44daeea522c20480f6801f8d8687e..355f1f45d31b95e366a93f6a1219f0699a99d473 100644 --- a/src/main/java/org/orekit/bodies/BodyShape.java +++ b/src/main/java/org/orekit/bodies/BodyShape.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/CelestialBody.java b/src/main/java/org/orekit/bodies/CelestialBody.java index 7c3a00e5064d4bc9728167fa3dd9e78d10a4dff4..dd7a9a5ab2f565686f7bb6bac8f64f6797aa7d81 100644 --- a/src/main/java/org/orekit/bodies/CelestialBody.java +++ b/src/main/java/org/orekit/bodies/CelestialBody.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/CelestialBodyFactory.java b/src/main/java/org/orekit/bodies/CelestialBodyFactory.java index 4a576c5d176d75d4a7f0fd90528efda9a300019c..4d744b7c6a505ab57236903ca40d2e81c547afef 100644 --- a/src/main/java/org/orekit/bodies/CelestialBodyFactory.java +++ b/src/main/java/org/orekit/bodies/CelestialBodyFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/CelestialBodyLoader.java b/src/main/java/org/orekit/bodies/CelestialBodyLoader.java index 9bbb30075ff55784173b8924e79a6aaf05c91389..bab86075cdcf7d5fb8b612c440b950ef962325f5 100644 --- a/src/main/java/org/orekit/bodies/CelestialBodyLoader.java +++ b/src/main/java/org/orekit/bodies/CelestialBodyLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/Ellipse.java b/src/main/java/org/orekit/bodies/Ellipse.java index 828fdcf6f9d5b9fa9c490108a3da033897847c5e..d6c25898cccacf73fad13ffd87ebe0a831d2daa8 100644 --- a/src/main/java/org/orekit/bodies/Ellipse.java +++ b/src/main/java/org/orekit/bodies/Ellipse.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/Ellipsoid.java b/src/main/java/org/orekit/bodies/Ellipsoid.java index 1fe221bc8dbc5655993b9d54f901a5046c25c375..eae4a188d37da768cc8401dda2ba98fd51894ba8 100644 --- a/src/main/java/org/orekit/bodies/Ellipsoid.java +++ b/src/main/java/org/orekit/bodies/Ellipsoid.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/FieldGeodeticPoint.java b/src/main/java/org/orekit/bodies/FieldGeodeticPoint.java index c21024d2fc38f01c51df74754494d85f1352cd27..91c1f6c3eac1b216cab31f5bfeeab4e7c3235594 100644 --- a/src/main/java/org/orekit/bodies/FieldGeodeticPoint.java +++ b/src/main/java/org/orekit/bodies/FieldGeodeticPoint.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -68,9 +68,9 @@ public class FieldGeodeticPoint<T extends RealFieldElement<T>> implements Serial * Build a new instance. The angular coordinates will be normalized so that * the latitude is between ±π/2 and the longitude is between ±π. * - * @param latitude latitude of the point - * @param longitude longitude of the point - * @param altitude altitude of the point + * @param latitude latitude of the point (rad) + * @param longitude longitude of the point (rad) + * @param altitude altitude of the point (m) */ public FieldGeodeticPoint(final T latitude, final T longitude, final T altitude) { diff --git a/src/main/java/org/orekit/bodies/GeodeticPoint.java b/src/main/java/org/orekit/bodies/GeodeticPoint.java index 96030c6286794228e2f7c45331f40d929e5b6713..f5a31eebd3bda1c893154e4d553dd599bbcb4b81 100644 --- a/src/main/java/org/orekit/bodies/GeodeticPoint.java +++ b/src/main/java/org/orekit/bodies/GeodeticPoint.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -66,9 +66,9 @@ public class GeodeticPoint implements Serializable { * Build a new instance. The angular coordinates will be normalized so that * the latitude is between ±π/2 and the longitude is between ±π. * - * @param latitude latitude of the point - * @param longitude longitude of the point - * @param altitude altitude of the point + * @param latitude latitude of the point (rad) + * @param longitude longitude of the point (rad) + * @param altitude altitude of the point (m) */ public GeodeticPoint(final double latitude, final double longitude, final double altitude) { diff --git a/src/main/java/org/orekit/bodies/IAUPole.java b/src/main/java/org/orekit/bodies/IAUPole.java index 0655d9b90bd9ac10f09ee745cb1626ed8c5237b9..9b949e39ae848163f4809c5d41d53ce28b8449e8 100644 --- a/src/main/java/org/orekit/bodies/IAUPole.java +++ b/src/main/java/org/orekit/bodies/IAUPole.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/JPLCelestialBody.java b/src/main/java/org/orekit/bodies/JPLCelestialBody.java index 00ddf6967803704d74a37638e1ef1ac0e8e16a02..2756e9b650f7a35e7f09377bf30af8340eee5390 100644 --- a/src/main/java/org/orekit/bodies/JPLCelestialBody.java +++ b/src/main/java/org/orekit/bodies/JPLCelestialBody.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/JPLEphemeridesLoader.java b/src/main/java/org/orekit/bodies/JPLEphemeridesLoader.java index 582787c52d57056a3adc1850664daf6faa30a39f..b6f5c06ddf64d2a4ba272d091c64148b79263649 100644 --- a/src/main/java/org/orekit/bodies/JPLEphemeridesLoader.java +++ b/src/main/java/org/orekit/bodies/JPLEphemeridesLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/OneAxisEllipsoid.java b/src/main/java/org/orekit/bodies/OneAxisEllipsoid.java index 71f8de70ddb5ae52f057e213d0ded46aaecd8d13..85487a892927b39c9e87c68896a47a38b9ffa785 100644 --- a/src/main/java/org/orekit/bodies/OneAxisEllipsoid.java +++ b/src/main/java/org/orekit/bodies/OneAxisEllipsoid.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/PosVelChebyshev.java b/src/main/java/org/orekit/bodies/PosVelChebyshev.java index b46760473309258efe03a3c81bd4bcaff302fd67..14a0d388065c066e55fe1183ad45b4e42febc276 100644 --- a/src/main/java/org/orekit/bodies/PosVelChebyshev.java +++ b/src/main/java/org/orekit/bodies/PosVelChebyshev.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/PredefinedIAUPoles.java b/src/main/java/org/orekit/bodies/PredefinedIAUPoles.java index dfd497032f7052ff7440756e188c75ee11481fe6..5f508812ae026246dbea97aba9956bb3462783ad 100644 --- a/src/main/java/org/orekit/bodies/PredefinedIAUPoles.java +++ b/src/main/java/org/orekit/bodies/PredefinedIAUPoles.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/package-info.java b/src/main/java/org/orekit/bodies/package-info.java index edd7be8c4acaf290392ef263f1a9b49184d97107..9f48c48d17c1a32a3a09836a9555f401a3c68aae 100644 --- a/src/main/java/org/orekit/bodies/package-info.java +++ b/src/main/java/org/orekit/bodies/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/BodiesElements.java b/src/main/java/org/orekit/data/BodiesElements.java index 55cc0609f477aa377192766ab81cb5c361cdad56..5bf6e7dc6168446126cb1e54168d28d675f9c5a3 100644 --- a/src/main/java/org/orekit/data/BodiesElements.java +++ b/src/main/java/org/orekit/data/BodiesElements.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/ClasspathCrawler.java b/src/main/java/org/orekit/data/ClasspathCrawler.java index c64fae897940c5e2f328cc04eae92da231d518c6..2277db1bd68dceac0ebf8af11b09f1acc208b168 100644 --- a/src/main/java/org/orekit/data/ClasspathCrawler.java +++ b/src/main/java/org/orekit/data/ClasspathCrawler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DataFilter.java b/src/main/java/org/orekit/data/DataFilter.java index 1699f86b51068bc147344590cda952d2d4c5374e..368141546349aaebab80e51e9f79fe99dd9e4d14 100644 --- a/src/main/java/org/orekit/data/DataFilter.java +++ b/src/main/java/org/orekit/data/DataFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DataLoader.java b/src/main/java/org/orekit/data/DataLoader.java index 1413cdf978e948fbf65833f72b228cf3ecfe72d1..96ee8e173d365c4c8500c14eda037c53d8d3b9b6 100644 --- a/src/main/java/org/orekit/data/DataLoader.java +++ b/src/main/java/org/orekit/data/DataLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DataProvider.java b/src/main/java/org/orekit/data/DataProvider.java index 8c108b50fcb02b6c2fb98ab8f65ba63c78ab1800..02ad674a42bf40dac593a20a985793f1dde88e23 100644 --- a/src/main/java/org/orekit/data/DataProvider.java +++ b/src/main/java/org/orekit/data/DataProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DataProvidersManager.java b/src/main/java/org/orekit/data/DataProvidersManager.java index bb1ba0b033833717c1d006ad39f83a353ba7c774..cc81c27880bf370a89af4e9cda8c1689e5bd7e71 100644 --- a/src/main/java/org/orekit/data/DataProvidersManager.java +++ b/src/main/java/org/orekit/data/DataProvidersManager.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DelaunayArguments.java b/src/main/java/org/orekit/data/DelaunayArguments.java index 39f1b2a424eb049b4986f2cc0d275698f5c69b1e..975f4da5d90c0d9128bab5433e35ccd4929fcd10 100644 --- a/src/main/java/org/orekit/data/DelaunayArguments.java +++ b/src/main/java/org/orekit/data/DelaunayArguments.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DirectoryCrawler.java b/src/main/java/org/orekit/data/DirectoryCrawler.java index 3755c6cbd4a05d5fcd083718c1558e1c4fbea062..c20f371d8c83c9247db4bd4cfb28af54d815eec2 100644 --- a/src/main/java/org/orekit/data/DirectoryCrawler.java +++ b/src/main/java/org/orekit/data/DirectoryCrawler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/FieldBodiesElements.java b/src/main/java/org/orekit/data/FieldBodiesElements.java index 6948831352e23734952d05775b85e16bb39fc522..1aee9a1926e77ff63e84001790b3fd5b1270f65c 100644 --- a/src/main/java/org/orekit/data/FieldBodiesElements.java +++ b/src/main/java/org/orekit/data/FieldBodiesElements.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/FieldDelaunayArguments.java b/src/main/java/org/orekit/data/FieldDelaunayArguments.java index 680975a4c002774b32ee6a8df6539340312facf2..9632e4966c1c6dcaa4e846c9dbd0b521a2281800 100644 --- a/src/main/java/org/orekit/data/FieldDelaunayArguments.java +++ b/src/main/java/org/orekit/data/FieldDelaunayArguments.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/FundamentalNutationArguments.java b/src/main/java/org/orekit/data/FundamentalNutationArguments.java index 4b2aab4563092f64fbc5d0e4ac42d3d161170ed9..9a5de66de52592ae73ecf6c01a772d83348578ac 100644 --- a/src/main/java/org/orekit/data/FundamentalNutationArguments.java +++ b/src/main/java/org/orekit/data/FundamentalNutationArguments.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/GeneralTerm.java b/src/main/java/org/orekit/data/GeneralTerm.java index 4adc9f16c410750a59c2238c98fb72ad8ea8e919..f50e5938e9a27e17115fdd6125af042ff34101e1 100644 --- a/src/main/java/org/orekit/data/GeneralTerm.java +++ b/src/main/java/org/orekit/data/GeneralTerm.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/GzipFilter.java b/src/main/java/org/orekit/data/GzipFilter.java index 0bff08f7ba98d8d1964eeea00550c12072116fd6..6ab514828f4502e68fd35eeb86344e0cdee8ac0f 100644 --- a/src/main/java/org/orekit/data/GzipFilter.java +++ b/src/main/java/org/orekit/data/GzipFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/LuniSolarTerm.java b/src/main/java/org/orekit/data/LuniSolarTerm.java index 57c3bbd2c97a9aae85aea20611657c64d9903286..5b4bcf349e44e544710d7174301106f91123dc00 100644 --- a/src/main/java/org/orekit/data/LuniSolarTerm.java +++ b/src/main/java/org/orekit/data/LuniSolarTerm.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/NamedData.java b/src/main/java/org/orekit/data/NamedData.java index 68a5c35914c82715217f257760b00085709d3fa8..ab26273809855ce93404fe0def8c4870fe51fe6e 100644 --- a/src/main/java/org/orekit/data/NamedData.java +++ b/src/main/java/org/orekit/data/NamedData.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/NetworkCrawler.java b/src/main/java/org/orekit/data/NetworkCrawler.java index 488d12f8a731f5b036bdd761ea87b60c6a3182d7..f2f5f80a2eace2506eac285843fe80467a9410f8 100644 --- a/src/main/java/org/orekit/data/NetworkCrawler.java +++ b/src/main/java/org/orekit/data/NetworkCrawler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/NoFarPlanetsTerm.java b/src/main/java/org/orekit/data/NoFarPlanetsTerm.java index d75f7502062759079f4fafc5b8d293d86ac7969e..c19a1745d06e2b2c361e953f5208c9d9571e66b4 100644 --- a/src/main/java/org/orekit/data/NoFarPlanetsTerm.java +++ b/src/main/java/org/orekit/data/NoFarPlanetsTerm.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/NutationCodec.java b/src/main/java/org/orekit/data/NutationCodec.java index e3894acdf5fb035072b3fa1b24a0876aab81eaaa..e1b5f92b21dc92041ee37fbfcf44fb5262d23b67 100644 --- a/src/main/java/org/orekit/data/NutationCodec.java +++ b/src/main/java/org/orekit/data/NutationCodec.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/PlanetaryTerm.java b/src/main/java/org/orekit/data/PlanetaryTerm.java index 4b24a4d72dc86d48eb9a2f1a1ada269b0b03dcdb..a84ccba536fd3b63f9b181059049fd7dc34c8b39 100644 --- a/src/main/java/org/orekit/data/PlanetaryTerm.java +++ b/src/main/java/org/orekit/data/PlanetaryTerm.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/PoissonSeries.java b/src/main/java/org/orekit/data/PoissonSeries.java index c1e0ea09675b0ae352dc8580968079257a2f3bf4..0a72a65ecd1e3b0c52a9a30eef9879143ffaa27e 100644 --- a/src/main/java/org/orekit/data/PoissonSeries.java +++ b/src/main/java/org/orekit/data/PoissonSeries.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/PoissonSeriesParser.java b/src/main/java/org/orekit/data/PoissonSeriesParser.java index 8b944bc77ae37eea82a1c726aeebb1c11df78432..bc095591c9491534a3b37897f3ff3362f01fbe0c 100644 --- a/src/main/java/org/orekit/data/PoissonSeriesParser.java +++ b/src/main/java/org/orekit/data/PoissonSeriesParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/PolynomialNutation.java b/src/main/java/org/orekit/data/PolynomialNutation.java index f4fb64a1104868010cd29edb44c964f731ea92de..f37f2ec7af1815f31b8cc20ca70acc6547f976cf 100644 --- a/src/main/java/org/orekit/data/PolynomialNutation.java +++ b/src/main/java/org/orekit/data/PolynomialNutation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/PolynomialParser.java b/src/main/java/org/orekit/data/PolynomialParser.java index 8013d9e8eb9a418585b2e056c8f5147c8ba6661b..9d780da96b2d1a68d04141798183946234cda3ee 100644 --- a/src/main/java/org/orekit/data/PolynomialParser.java +++ b/src/main/java/org/orekit/data/PolynomialParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/SeriesTerm.java b/src/main/java/org/orekit/data/SeriesTerm.java index 3fbc4e6ca18c141fcbccc288310a4e953de113e4..8cf8fabf0e6e13dcb5f9ea60eadae5ec729b7a72 100644 --- a/src/main/java/org/orekit/data/SeriesTerm.java +++ b/src/main/java/org/orekit/data/SeriesTerm.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/SimpleTimeStampedTableParser.java b/src/main/java/org/orekit/data/SimpleTimeStampedTableParser.java index 04327f0b86fcb5fa187774d0961fca89517261c4..79f674b74c51bcd29dc2de5691ef7a46d2328773 100644 --- a/src/main/java/org/orekit/data/SimpleTimeStampedTableParser.java +++ b/src/main/java/org/orekit/data/SimpleTimeStampedTableParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/TideTerm.java b/src/main/java/org/orekit/data/TideTerm.java index 81672ac23bd47b744f3f8ffe484fc3c7a3be592b..b71a9dc2cdfb65e34965c8c28a7a841d5007f9dc 100644 --- a/src/main/java/org/orekit/data/TideTerm.java +++ b/src/main/java/org/orekit/data/TideTerm.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/UnixCompressFilter.java b/src/main/java/org/orekit/data/UnixCompressFilter.java index cbd6f1a82dbe6e7650a107995c6b788ba1906689..0bb694130e908a80bce2221f7d7f13b3d73dca65 100644 --- a/src/main/java/org/orekit/data/UnixCompressFilter.java +++ b/src/main/java/org/orekit/data/UnixCompressFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/ZipJarCrawler.java b/src/main/java/org/orekit/data/ZipJarCrawler.java index f2b87b251cfee13dd86cd111b2800213331918a0..4ed4c5108029aaa29c815268f03b2d9b988a194f 100644 --- a/src/main/java/org/orekit/data/ZipJarCrawler.java +++ b/src/main/java/org/orekit/data/ZipJarCrawler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/package-info.java b/src/main/java/org/orekit/data/package-info.java index 43fa8e8d466702de3d5986e697aa8023395de19b..0fedc086f973b565011553020f702d4131e8bd82 100644 --- a/src/main/java/org/orekit/data/package-info.java +++ b/src/main/java/org/orekit/data/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/FrameAncestorException.java b/src/main/java/org/orekit/errors/FrameAncestorException.java index ab24698b9c217d67c90c40d2ff0b5c3b5ce50744..dbb2009c309489346e416eb5b855dbf2aca16261 100644 --- a/src/main/java/org/orekit/errors/FrameAncestorException.java +++ b/src/main/java/org/orekit/errors/FrameAncestorException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/LocalizedException.java b/src/main/java/org/orekit/errors/LocalizedException.java index b195be6b9624cc029aff560289e927fdebcb8427..f71c36cab00b8a9a038a06c15e32cd84d19eb2a6 100644 --- a/src/main/java/org/orekit/errors/LocalizedException.java +++ b/src/main/java/org/orekit/errors/LocalizedException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitException.java b/src/main/java/org/orekit/errors/OrekitException.java index 195f2f636bb53fd24043025095e0f1d6cfe87db3..5e889f4dde83f07abb1777e44d51a4f9a988ae5f 100644 --- a/src/main/java/org/orekit/errors/OrekitException.java +++ b/src/main/java/org/orekit/errors/OrekitException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitExceptionWrapper.java b/src/main/java/org/orekit/errors/OrekitExceptionWrapper.java index 7bc36a9fa14b8c655a48ea63f948efb02a91deb9..c3dfcd2c1e3190a089e21d80d1df3ab593079e68 100644 --- a/src/main/java/org/orekit/errors/OrekitExceptionWrapper.java +++ b/src/main/java/org/orekit/errors/OrekitExceptionWrapper.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitIOException.java b/src/main/java/org/orekit/errors/OrekitIOException.java index 9dc47777a59d9e68aa62d90707142979512649fd..f53c05f82da51989188d3cf1cc8be264f0d6b115 100644 --- a/src/main/java/org/orekit/errors/OrekitIOException.java +++ b/src/main/java/org/orekit/errors/OrekitIOException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitIllegalArgumentException.java b/src/main/java/org/orekit/errors/OrekitIllegalArgumentException.java index 7c8dbf056c9c556abb2d2ef43e2bd0a6a627fba1..cce19623ab86d73f08cec19ed7b99c60227b0703 100644 --- a/src/main/java/org/orekit/errors/OrekitIllegalArgumentException.java +++ b/src/main/java/org/orekit/errors/OrekitIllegalArgumentException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitIllegalStateException.java b/src/main/java/org/orekit/errors/OrekitIllegalStateException.java index 473c78c6641c25e5d3bfc7a3a6520395ed37641e..b3517e29c4b8713e4fb424c1486579ccd94addff 100644 --- a/src/main/java/org/orekit/errors/OrekitIllegalStateException.java +++ b/src/main/java/org/orekit/errors/OrekitIllegalStateException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitInternalError.java b/src/main/java/org/orekit/errors/OrekitInternalError.java index e6deaf57a4b101dc5c121d4aa91a64d60bfcd1ed..b843fab0183a845da783472f22cb7714a793ba15 100644 --- a/src/main/java/org/orekit/errors/OrekitInternalError.java +++ b/src/main/java/org/orekit/errors/OrekitInternalError.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitMessages.java b/src/main/java/org/orekit/errors/OrekitMessages.java index 0b10c1061e067cf572911bf67f5c5db854380ead..a105fd09f849028ade823ebc0267835531914c9e 100644 --- a/src/main/java/org/orekit/errors/OrekitMessages.java +++ b/src/main/java/org/orekit/errors/OrekitMessages.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitParseException.java b/src/main/java/org/orekit/errors/OrekitParseException.java index 2243879650e8745d9537a644d3c866bd5d619999..424f2c305f34d487ff88bb0c82e4ab5e80fdf60b 100644 --- a/src/main/java/org/orekit/errors/OrekitParseException.java +++ b/src/main/java/org/orekit/errors/OrekitParseException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/TimeStampedCacheException.java b/src/main/java/org/orekit/errors/TimeStampedCacheException.java index db2164c9c8b5874b38e4120f04d7624b66c4af5f..0fbcecf52c160a3c1d241ce8252e31d7693a137a 100644 --- a/src/main/java/org/orekit/errors/TimeStampedCacheException.java +++ b/src/main/java/org/orekit/errors/TimeStampedCacheException.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/package-info.java b/src/main/java/org/orekit/errors/package-info.java index 1255d3d44a41d6001ea0ceb0c8a00090aa946ad1..bdadfd4f51b4ae1e1e3c429cf2584823c815aaca 100644 --- a/src/main/java/org/orekit/errors/package-info.java +++ b/src/main/java/org/orekit/errors/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/iod/IodGibbs.java b/src/main/java/org/orekit/estimation/iod/IodGibbs.java index 07ba32d29ba0357acd04a4591cbc087055ac390b..964c8d82929820ab95719f1531c833970474b85a 100644 --- a/src/main/java/org/orekit/estimation/iod/IodGibbs.java +++ b/src/main/java/org/orekit/estimation/iod/IodGibbs.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/iod/IodGooding.java b/src/main/java/org/orekit/estimation/iod/IodGooding.java index 41786f75cd53ffd5fa275d4111b53b55db665702..325d5700024580e930397163a4bb2ccad8c6d2c8 100644 --- a/src/main/java/org/orekit/estimation/iod/IodGooding.java +++ b/src/main/java/org/orekit/estimation/iod/IodGooding.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/iod/IodLambert.java b/src/main/java/org/orekit/estimation/iod/IodLambert.java index c0d459056667dc627108267a51f6309744a8335b..5be53e67a1e3cf96ee00a7d66d995e0fac29be71 100644 --- a/src/main/java/org/orekit/estimation/iod/IodLambert.java +++ b/src/main/java/org/orekit/estimation/iod/IodLambert.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/leastsquares/BatchLSEstimator.java b/src/main/java/org/orekit/estimation/leastsquares/BatchLSEstimator.java index 2cc5bf939d0c636c6a0268dd137b250a835aaa04..20095f42e8d61ffbef4d8e738aa26971f9e3949d 100644 --- a/src/main/java/org/orekit/estimation/leastsquares/BatchLSEstimator.java +++ b/src/main/java/org/orekit/estimation/leastsquares/BatchLSEstimator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/leastsquares/BatchLSObserver.java b/src/main/java/org/orekit/estimation/leastsquares/BatchLSObserver.java index eaab679900472997d583cf398877ee0fa4ed8417..274cb211986b4064ba9d25a1ce27be67dfe63293 100644 --- a/src/main/java/org/orekit/estimation/leastsquares/BatchLSObserver.java +++ b/src/main/java/org/orekit/estimation/leastsquares/BatchLSObserver.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/leastsquares/MeasurementHandler.java b/src/main/java/org/orekit/estimation/leastsquares/MeasurementHandler.java index 967ff0c45be6817a224b764cc358b1866f4ceb89..19f87df3a38db1df04990623fb6f93504755bea5 100644 --- a/src/main/java/org/orekit/estimation/leastsquares/MeasurementHandler.java +++ b/src/main/java/org/orekit/estimation/leastsquares/MeasurementHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -90,8 +90,7 @@ class MeasurementHandler implements MultiSatStepHandler { final ObservedMeasurement<?> observed = next.getMeasurement(); // estimate the theoretical measurement - final List<Integer> indices = observed.getPropagatorsIndices(); - final SpacecraftState[] states = new SpacecraftState[indices.size()]; + final SpacecraftState[] states = new SpacecraftState[observed.getSatellites().size()]; for (int i = 0; i < states.length; ++i) { states[i] = interpolators.get(i).getInterpolatedState(next.getDate()); } diff --git a/src/main/java/org/orekit/estimation/leastsquares/Model.java b/src/main/java/org/orekit/estimation/leastsquares/Model.java index b7ec728e992aa8c63e15a09056ac3236590f5241..c925b29e60d402dcd88d0e5abc2204d0f0c6f1c8 100644 --- a/src/main/java/org/orekit/estimation/leastsquares/Model.java +++ b/src/main/java/org/orekit/estimation/leastsquares/Model.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -422,7 +422,7 @@ class Model implements MultivariateJacobianFunction { for (int k = 0; k < evaluationStates.length; ++k) { - final int p = observedMeasurement.getPropagatorsIndices().get(k); + final int p = observedMeasurement.getSatellites().get(k).getPropagatorIndex(); // partial derivatives of the current Cartesian coordinates with respect to current orbital state final double[][] aCY = new double[6][6]; diff --git a/src/main/java/org/orekit/estimation/leastsquares/ModelObserver.java b/src/main/java/org/orekit/estimation/leastsquares/ModelObserver.java index 6420ea128fa679fd837b1dee3268e4776c7f4e41..7ca3e4879d941766227e60005348f9e75a758bcc 100644 --- a/src/main/java/org/orekit/estimation/leastsquares/ModelObserver.java +++ b/src/main/java/org/orekit/estimation/leastsquares/ModelObserver.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/leastsquares/PreCompensation.java b/src/main/java/org/orekit/estimation/leastsquares/PreCompensation.java index 961814915673b22578c98b44ab9e6077202ca780..f01a7bc992506bb0a544dedf71c0581cf1b37154 100644 --- a/src/main/java/org/orekit/estimation/leastsquares/PreCompensation.java +++ b/src/main/java/org/orekit/estimation/leastsquares/PreCompensation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/leastsquares/package-info.java b/src/main/java/org/orekit/estimation/leastsquares/package-info.java index 918bf47a05ea33b8da7f59eee7754f2e8e5bff73..54494f39c39f40258ef1be9fa74bc1ba36231d35 100644 --- a/src/main/java/org/orekit/estimation/leastsquares/package-info.java +++ b/src/main/java/org/orekit/estimation/leastsquares/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/AbstractMeasurement.java b/src/main/java/org/orekit/estimation/measurements/AbstractMeasurement.java index e056b4a55ba114ae62e71ecc65ebad032c4854f8..31d575d4356e3ac07199e2cf05d51346d3bc9ff8 100644 --- a/src/main/java/org/orekit/estimation/measurements/AbstractMeasurement.java +++ b/src/main/java/org/orekit/estimation/measurements/AbstractMeasurement.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.measurements; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import org.hipparchus.RealFieldElement; import org.hipparchus.analysis.differentiation.DSFactory; @@ -45,10 +46,10 @@ public abstract class AbstractMeasurement<T extends ObservedMeasurement<T>> /** List of the supported parameters. */ private final List<ParameterDriver> supportedParameters; - /** Indices of the propagators related to this measurement. - * @since 9.0 + /** Satellites related to this measurement. + * @since 9.3 */ - private final List<Integer> propagatorsIndices; + private final List<ObservableSatellite> satellites; /** Date of the measurement. */ private final AbsoluteDate date; @@ -78,13 +79,37 @@ public abstract class AbstractMeasurement<T extends ObservedMeasurement<T>> * @param baseWeight base weight * @param propagatorsIndices indices of the propagators related to this measurement * @param supportedParameters supported parameters + * @deprecated since 9.3, replaced bew {@link #AbstractMeasurement(AbsoluteDate, + * double, double, double, List)} followed by {@link #addParameterDriver(ParameterDriver)} */ + @Deprecated protected AbstractMeasurement(final AbsoluteDate date, final double observed, final double sigma, final double baseWeight, final List<Integer> propagatorsIndices, final ParameterDriver... supportedParameters) { + this(date, observed, sigma, baseWeight, + propagatorsIndices.stream().map(i -> new ObservableSatellite(i)).collect(Collectors.toList())); + for (final ParameterDriver parameterDriver : supportedParameters) { + this.supportedParameters.add(parameterDriver); + } + } + + /** Simple constructor for mono-dimensional measurements. + * <p> + * At construction, a measurement is enabled. + * </p> + * @param date date of the measurement + * @param observed observed value + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param satellites satellites related to this measurement + * @since 9.3 + */ + protected AbstractMeasurement(final AbsoluteDate date, final double observed, + final double sigma, final double baseWeight, + final List<ObservableSatellite> satellites) { - this.supportedParameters = new ArrayList<ParameterDriver>(supportedParameters.length); + this.supportedParameters = new ArrayList<ParameterDriver>(); for (final ParameterDriver parameterDriver : supportedParameters) { this.supportedParameters.add(parameterDriver); } @@ -100,7 +125,7 @@ public abstract class AbstractMeasurement<T extends ObservedMeasurement<T>> baseWeight }; - this.propagatorsIndices = propagatorsIndices; + this.satellites = satellites; this.modifiers = new ArrayList<EstimationModifier<T>>(); setEnabled(true); @@ -117,28 +142,57 @@ public abstract class AbstractMeasurement<T extends ObservedMeasurement<T>> * @param baseWeight base weight * @param propagatorsIndices indices of the propagators related to this measurement * @param supportedParameters supported parameters + * @deprecated since 9.3, replaced bew {@link #AbstractMeasurement(AbsoluteDate, + * double[], double[], double[], List)} followed by {@link #addParameterDriver(ParameterDriver)} */ + @Deprecated protected AbstractMeasurement(final AbsoluteDate date, final double[] observed, final double[] sigma, final double[] baseWeight, final List<Integer> propagatorsIndices, final ParameterDriver... supportedParameters) { - this.supportedParameters = new ArrayList<ParameterDriver>(supportedParameters.length); + this(date, observed, sigma, baseWeight, + propagatorsIndices.stream().map(i -> new ObservableSatellite(i)).collect(Collectors.toList())); for (final ParameterDriver parameterDriver : supportedParameters) { this.supportedParameters.add(parameterDriver); } + } + + /** Simple constructor, for multi-dimensional measurements. + * <p> + * At construction, a measurement is enabled. + * </p> + * @param date date of the measurement + * @param observed observed value + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param satellites satellites related to this measurement + * @since 9.3 + */ + protected AbstractMeasurement(final AbsoluteDate date, final double[] observed, + final double[] sigma, final double[] baseWeight, + final List<ObservableSatellite> satellites) { + this.supportedParameters = new ArrayList<ParameterDriver>(); this.date = date; this.observed = observed.clone(); this.sigma = sigma.clone(); this.baseWeight = baseWeight.clone(); - this.propagatorsIndices = propagatorsIndices; + this.satellites = satellites; this.modifiers = new ArrayList<EstimationModifier<T>>(); setEnabled(true); } + /** Add a parameter driver. + * @param driver parameter driver to add + * @since 9.3 + */ + protected void addParameterDriver(final ParameterDriver driver) { + supportedParameters.add(driver); + } + /** {@inheritDoc} */ @Override public List<ParameterDriver> getParametersDrivers() { @@ -178,7 +232,13 @@ public abstract class AbstractMeasurement<T extends ObservedMeasurement<T>> /** {@inheritDoc} */ @Override public List<Integer> getPropagatorsIndices() { - return propagatorsIndices; + return satellites.stream().map(s -> s.getPropagatorIndex()).collect(Collectors.toList()); + } + + /** {@inheritDoc} */ + @Override + public List<ObservableSatellite> getSatellites() { + return satellites; } /** Estimate the theoretical value. diff --git a/src/main/java/org/orekit/estimation/measurements/AngularAzEl.java b/src/main/java/org/orekit/estimation/measurements/AngularAzEl.java index 839df307c1692e0e3a99269c08242e8b2252624f..119742699ac9adb14243c6b7aad9aeb20ad17961 100644 --- a/src/main/java/org/orekit/estimation/measurements/AngularAzEl.java +++ b/src/main/java/org/orekit/estimation/measurements/AngularAzEl.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -57,10 +57,13 @@ public class AngularAzEl extends AbstractMeasurement<AngularAzEl> { * @param angular observed value * @param sigma theoretical standard deviation * @param baseWeight base weight + * @deprecated since 9.3, replaced by {@#AngularAzEl(GroundStation, AbsoluteDate, + * double[], double[], double[], ObservableSatellite)} */ + @Deprecated public AngularAzEl(final GroundStation station, final AbsoluteDate date, final double[] angular, final double[] sigma, final double[] baseWeight) { - this(station, date, angular, sigma, baseWeight, 0); + this(station, date, angular, sigma, baseWeight, new ObservableSatellite(0)); } /** Simple constructor. @@ -71,20 +74,39 @@ public class AngularAzEl extends AbstractMeasurement<AngularAzEl> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.0 + * @deprecated since 9.3, replaced by {@#AngularAzEl(GroundStation, AbsoluteDate, + * double[], double[], double[], ObservableSatellite)} */ + @Deprecated public AngularAzEl(final GroundStation station, final AbsoluteDate date, final double[] angular, final double[] sigma, final double[] baseWeight, final int propagatorIndex) { - super(date, angular, sigma, baseWeight, Arrays.asList(propagatorIndex), - station.getEastOffsetDriver(), - station.getNorthOffsetDriver(), - station.getZenithOffsetDriver(), - station.getPrimeMeridianOffsetDriver(), - station.getPrimeMeridianDriftDriver(), - station.getPolarOffsetXDriver(), - station.getPolarDriftXDriver(), - station.getPolarOffsetYDriver(), - station.getPolarDriftYDriver()); + this(station, date, angular, sigma, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Simple constructor. + * @param station ground station from which measurement is performed + * @param date date of the measurement + * @param angular observed value + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public AngularAzEl(final GroundStation station, final AbsoluteDate date, + final double[] angular, final double[] sigma, final double[] baseWeight, + final ObservableSatellite satellite) { + super(date, angular, sigma, baseWeight, Arrays.asList(satellite)); + addParameterDriver(station.getClockOffsetDriver()); + addParameterDriver(station.getEastOffsetDriver()); + addParameterDriver(station.getNorthOffsetDriver()); + addParameterDriver(station.getZenithOffsetDriver()); + addParameterDriver(station.getPrimeMeridianOffsetDriver()); + addParameterDriver(station.getPrimeMeridianDriftDriver()); + addParameterDriver(station.getPolarOffsetXDriver()); + addParameterDriver(station.getPolarDriftXDriver()); + addParameterDriver(station.getPolarOffsetYDriver()); + addParameterDriver(station.getPolarDriftYDriver()); this.station = station; } @@ -100,7 +122,8 @@ public class AngularAzEl extends AbstractMeasurement<AngularAzEl> { protected EstimatedMeasurement<AngularAzEl> theoreticalEvaluation(final int iteration, final int evaluation, final SpacecraftState[] states) { - final SpacecraftState state = states[getPropagatorsIndices().get(0)]; + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // Azimuth/elevation derivatives are computed with respect to spacecraft state in inertial frame // and station parameters @@ -109,7 +132,7 @@ public class AngularAzEl extends AbstractMeasurement<AngularAzEl> { // Parameters: // - 0..2 - Position of the spacecraft in inertial frame // - 3..5 - Velocity of the spacecraft in inertial frame - // - 6..n - station parameters (station offsets, pole, prime meridian...) + // - 6..n - station parameters (clock offset, station offsets, pole, prime meridian...) // Get the number of parameters used for derivation // Place the selected drivers into a map @@ -129,11 +152,10 @@ public class AngularAzEl extends AbstractMeasurement<AngularAzEl> { // Transform between station and inertial frame, expressed as a derivative structure // The components of station's position in offset frame are the 3 last derivative parameters - final AbsoluteDate downlinkDate = getDate(); - final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = - new FieldAbsoluteDate<>(field, downlinkDate); final FieldTransform<DerivativeStructure> offsetToInertialDownlink = - station.getOffsetToInertial(state.getFrame(), downlinkDateDS, factory, indices); + station.getOffsetToInertial(state.getFrame(), getDate(), factory, indices); + final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = + offsetToInertialDownlink.getFieldDate(); // Station position/velocity in inertial frame at end of the downlink leg final TimeStampedFieldPVCoordinates<DerivativeStructure> stationDownlink = @@ -152,7 +174,7 @@ public class AngularAzEl extends AbstractMeasurement<AngularAzEl> { final DerivativeStructure tauD = signalTimeOfFlight(pvaDS, stationDownlink.getPosition(), downlinkDateDS); // Transit state - final double delta = downlinkDate.durationFrom(state.getDate()); + final DerivativeStructure delta = downlinkDateDS.durationFrom(state.getDate()); final DerivativeStructure deltaMTauD = tauD.negate().add(delta); final SpacecraftState transitState = state.shiftedBy(deltaMTauD.getValue()); diff --git a/src/main/java/org/orekit/estimation/measurements/AngularRaDec.java b/src/main/java/org/orekit/estimation/measurements/AngularRaDec.java index bb13dee4c1f5e3e09c3281683bf77d45798f0194..fd5860b191f48f4f0910cf3cf8f28a2e4dfa4bcf 100644 --- a/src/main/java/org/orekit/estimation/measurements/AngularRaDec.java +++ b/src/main/java/org/orekit/estimation/measurements/AngularRaDec.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -64,10 +64,13 @@ public class AngularRaDec extends AbstractMeasurement<AngularRaDec> { * @param angular observed value * @param sigma theoretical standard deviation * @param baseWeight base weight + * @deprecated since 9.3, replaced by {@#AngularRaDec(GroundStation, AbsoluteDate, + * double[], double[], double[], ObservableSatellite)} */ + @Deprecated public AngularRaDec(final GroundStation station, final Frame referenceFrame, final AbsoluteDate date, - final double[] angular, final double[] sigma, final double[] baseWeight) { - this(station, referenceFrame, date, angular, sigma, baseWeight, 0); + final double[] angular, final double[] sigma, final double[] baseWeight) { + this(station, referenceFrame, date, angular, sigma, baseWeight, new ObservableSatellite(0)); } /** Simple constructor. @@ -78,20 +81,41 @@ public class AngularRaDec extends AbstractMeasurement<AngularRaDec> { * @param sigma theoretical standard deviation * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement + * @since 9.0 + * @deprecated since 9.3, replaced by {@#AngularRaDec(GroundStation, AbsoluteDate, + * double[], double[], double[], ObservableSatellite)} */ + @Deprecated public AngularRaDec(final GroundStation station, final Frame referenceFrame, final AbsoluteDate date, final double[] angular, final double[] sigma, final double[] baseWeight, final int propagatorIndex) { - super(date, angular, sigma, baseWeight, Arrays.asList(propagatorIndex), - station.getEastOffsetDriver(), - station.getNorthOffsetDriver(), - station.getZenithOffsetDriver(), - station.getPrimeMeridianOffsetDriver(), - station.getPrimeMeridianDriftDriver(), - station.getPolarOffsetXDriver(), - station.getPolarDriftXDriver(), - station.getPolarOffsetYDriver(), - station.getPolarDriftYDriver()); + this(station, referenceFrame, date, angular, sigma, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Simple constructor. + * @param station ground station from which measurement is performed + * @param referenceFrame Reference frame in which the right ascension - declination angles are given + * @param date date of the measurement + * @param angular observed value + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public AngularRaDec(final GroundStation station, final Frame referenceFrame, final AbsoluteDate date, + final double[] angular, final double[] sigma, final double[] baseWeight, + final ObservableSatellite satellite) { + super(date, angular, sigma, baseWeight, Arrays.asList(satellite)); + addParameterDriver(station.getClockOffsetDriver()); + addParameterDriver(station.getEastOffsetDriver()); + addParameterDriver(station.getNorthOffsetDriver()); + addParameterDriver(station.getZenithOffsetDriver()); + addParameterDriver(station.getPrimeMeridianOffsetDriver()); + addParameterDriver(station.getPrimeMeridianDriftDriver()); + addParameterDriver(station.getPolarOffsetXDriver()); + addParameterDriver(station.getPolarDriftXDriver()); + addParameterDriver(station.getPolarOffsetYDriver()); + addParameterDriver(station.getPolarDriftYDriver()); this.station = station; this.referenceFrame = referenceFrame; } @@ -115,7 +139,8 @@ public class AngularRaDec extends AbstractMeasurement<AngularRaDec> { protected EstimatedMeasurement<AngularRaDec> theoreticalEvaluation(final int iteration, final int evaluation, final SpacecraftState[] states) { - final SpacecraftState state = states[getPropagatorsIndices().get(0)]; + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // Right Ascension/elevation (in reference frame )derivatives are computed with respect to spacecraft state in inertial frame // and station parameters @@ -124,7 +149,7 @@ public class AngularRaDec extends AbstractMeasurement<AngularRaDec> { // Parameters: // - 0..2 - Position of the spacecraft in inertial frame // - 3..5 - Velocity of the spacecraft in inertial frame - // - 6..n - station parameters (station offsets, pole, prime meridian...) + // - 6..n - station parameters (clock offset, station offsets, pole, prime meridian...) // Get the number of parameters used for derivation // Place the selected drivers into a map @@ -144,11 +169,10 @@ public class AngularRaDec extends AbstractMeasurement<AngularRaDec> { // Transform between station and inertial frame, expressed as a derivative structure // The components of station's position in offset frame are the 3 last derivative parameters - final AbsoluteDate downlinkDate = getDate(); - final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = - new FieldAbsoluteDate<>(field, downlinkDate); final FieldTransform<DerivativeStructure> offsetToInertialDownlink = - station.getOffsetToInertial(state.getFrame(), downlinkDateDS, factory, indices); + station.getOffsetToInertial(state.getFrame(), getDate(), factory, indices); + final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = + offsetToInertialDownlink.getFieldDate(); // Station position/velocity in inertial frame at end of the downlink leg final TimeStampedFieldPVCoordinates<DerivativeStructure> stationDownlink = @@ -163,7 +187,7 @@ public class AngularRaDec extends AbstractMeasurement<AngularRaDec> { final DerivativeStructure tauD = signalTimeOfFlight(pvaDS, stationDownlink.getPosition(), downlinkDateDS); // Transit state - final double delta = downlinkDate.durationFrom(state.getDate()); + final DerivativeStructure delta = downlinkDateDS.durationFrom(state.getDate()); final DerivativeStructure deltaMTauD = tauD.negate().add(delta); final SpacecraftState transitState = state.shiftedBy(deltaMTauD.getValue()); diff --git a/src/main/java/org/orekit/estimation/measurements/ComparableMeasurement.java b/src/main/java/org/orekit/estimation/measurements/ComparableMeasurement.java index 5b3e5358cb7a16cc2f550a9005b748d1a2b8a63f..533ef3c1788e75c77a662bd4a28a877962869116 100644 --- a/src/main/java/org/orekit/estimation/measurements/ComparableMeasurement.java +++ b/src/main/java/org/orekit/estimation/measurements/ComparableMeasurement.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/EstimatedEarthFrameProvider.java b/src/main/java/org/orekit/estimation/measurements/EstimatedEarthFrameProvider.java index 2f8dda130946d1f111f627c2f15488c9c38c2ff2..1e7f2cf76fea1dd2b6d7fddc0e821210490af533 100644 --- a/src/main/java/org/orekit/estimation/measurements/EstimatedEarthFrameProvider.java +++ b/src/main/java/org/orekit/estimation/measurements/EstimatedEarthFrameProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -219,7 +219,7 @@ public class EstimatedEarthFrameProvider implements TransformProvider { // take parametric prime meridian shift into account final double theta = linearModel(date, primeMeridianOffsetDriver, primeMeridianDriftDriver); - final double thetaDot = parametricModel(primeMeridianDriftDriver); + final double thetaDot = primeMeridianDriftDriver.getValue(); final Transform meridianShift = new Transform(date, new Rotation(Vector3D.PLUS_K, theta, RotationConvention.FRAME_TRANSFORM), @@ -228,8 +228,8 @@ public class EstimatedEarthFrameProvider implements TransformProvider { // take parametric pole shift into account final double xpNeg = -linearModel(date, polarOffsetXDriver, polarDriftXDriver); final double ypNeg = -linearModel(date, polarOffsetYDriver, polarDriftYDriver); - final double xpNegDot = -parametricModel(polarDriftXDriver); - final double ypNegDot = -parametricModel(polarDriftYDriver); + final double xpNegDot = -polarDriftXDriver.getValue(); + final double ypNegDot = -polarDriftYDriver.getValue(); final Transform poleShift = new Transform(date, new Transform(date, @@ -251,13 +251,13 @@ public class EstimatedEarthFrameProvider implements TransformProvider { // prime meridian shift parameters final T theta = linearModel(date, primeMeridianOffsetDriver, primeMeridianDriftDriver); - final T thetaDot = zero.add(parametricModel(primeMeridianDriftDriver)); + final T thetaDot = zero.add(primeMeridianDriftDriver.getValue()); // pole shift parameters final T xpNeg = linearModel(date, polarOffsetXDriver, polarDriftXDriver).negate(); final T ypNeg = linearModel(date, polarOffsetYDriver, polarDriftYDriver).negate(); - final T xpNegDot = zero.subtract(parametricModel(polarDriftXDriver)); - final T ypNegDot = zero.subtract(parametricModel(polarDriftYDriver)); + final T xpNegDot = zero.subtract(polarDriftXDriver.getValue()); + final T ypNegDot = zero.subtract(polarDriftYDriver.getValue()); return getTransform(date, theta, thetaDot, xpNeg, xpNegDot, ypNeg, ypNegDot); @@ -277,15 +277,15 @@ public class EstimatedEarthFrameProvider implements TransformProvider { final DerivativeStructure theta = linearModel(factory, date, primeMeridianOffsetDriver, primeMeridianDriftDriver, indices); - final DerivativeStructure thetaDot = parametricModel(factory, primeMeridianDriftDriver, indices); + final DerivativeStructure thetaDot = primeMeridianDriftDriver.getValue(factory, indices); // pole shift parameters final DerivativeStructure xpNeg = linearModel(factory, date, polarOffsetXDriver, polarDriftXDriver, indices).negate(); final DerivativeStructure ypNeg = linearModel(factory, date, polarOffsetYDriver, polarDriftYDriver, indices).negate(); - final DerivativeStructure xpNegDot = parametricModel(factory, polarDriftXDriver, indices).negate(); - final DerivativeStructure ypNegDot = parametricModel(factory, polarDriftYDriver, indices).negate(); + final DerivativeStructure xpNegDot = polarDriftXDriver.getValue(factory, indices).negate(); + final DerivativeStructure ypNegDot = polarDriftYDriver.getValue(factory, indices).negate(); return getTransform(date, theta, thetaDot, xpNeg, xpNegDot, ypNeg, ypNegDot); @@ -345,8 +345,8 @@ public class EstimatedEarthFrameProvider implements TransformProvider { offsetDriver.getName()); } final double dt = date.durationFrom(offsetDriver.getReferenceDate()); - final double offset = parametricModel(offsetDriver); - final double drift = parametricModel(driftDriver); + final double offset = offsetDriver.getValue(); + final double drift = driftDriver.getValue(); return dt * drift + offset; } @@ -365,8 +365,8 @@ public class EstimatedEarthFrameProvider implements TransformProvider { offsetDriver.getName()); } final T dt = date.durationFrom(offsetDriver.getReferenceDate()); - final double offset = parametricModel(offsetDriver); - final double drift = parametricModel(driftDriver); + final double offset = offsetDriver.getValue(); + final double drift = driftDriver.getValue(); return dt.multiply(drift).add(offset); } @@ -386,33 +386,11 @@ public class EstimatedEarthFrameProvider implements TransformProvider { offsetDriver.getName()); } final DerivativeStructure dt = date.durationFrom(offsetDriver.getReferenceDate()); - final DerivativeStructure offset = parametricModel(factory, offsetDriver, indices); - final DerivativeStructure drift = parametricModel(factory, driftDriver, indices); + final DerivativeStructure offset = offsetDriver.getValue(factory, indices); + final DerivativeStructure drift = driftDriver.getValue(factory, indices); return dt.multiply(drift).add(offset); } - /** Evaluate a parametric model. - * @param driver driver managing the parameter - * @return value of the parametric model - */ - private double parametricModel(final ParameterDriver driver) { - return driver.getValue(); - } - - /** Evaluate a parametric model. - * @param factory factory for the derivatives - * @param driver driver managing the parameter - * @param indices indices of the estimated parameters in derivatives computations - * @return value of the parametric model - */ - private DerivativeStructure parametricModel(final DSFactory factory, final ParameterDriver driver, - final Map<String, Integer> indices) { - final Integer index = indices.get(driver.getName()); - return (index == null) ? - factory.constant(driver.getValue()) : - factory.variable(index, driver.getValue()); - } - /** Replace the instance with a data transfer object for serialization. * <p> * This intermediate class serializes the files supported names, the ephemeris type diff --git a/src/main/java/org/orekit/estimation/measurements/EstimatedMeasurement.java b/src/main/java/org/orekit/estimation/measurements/EstimatedMeasurement.java index db7b17ee8aecfd6d598e2a5800c3f384cb178732..b992e6e76ad016e5a576a0eb202b0eb76b8ac0af 100644 --- a/src/main/java/org/orekit/estimation/measurements/EstimatedMeasurement.java +++ b/src/main/java/org/orekit/estimation/measurements/EstimatedMeasurement.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/EstimationModifier.java b/src/main/java/org/orekit/estimation/measurements/EstimationModifier.java index e3b092c443e3d7621877b0edc8e1123d646ed9f9..b9d18f4256c4464f20ce155685486e64da91282c 100644 --- a/src/main/java/org/orekit/estimation/measurements/EstimationModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/EstimationModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/EstimationsProvider.java b/src/main/java/org/orekit/estimation/measurements/EstimationsProvider.java index 1f2386e4f31e0e78aacd86e2121c23ba18683aa7..228dea9a6c709037773bb81bf02795a41dc82175 100644 --- a/src/main/java/org/orekit/estimation/measurements/EstimationsProvider.java +++ b/src/main/java/org/orekit/estimation/measurements/EstimationsProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/GroundStation.java b/src/main/java/org/orekit/estimation/measurements/GroundStation.java index b753019bd22505ddc0c630736d363f4fa9c34d04..df4ab52c2eae9e01a8d743d0c33438ccb7f1ca3a 100644 --- a/src/main/java/org/orekit/estimation/measurements/GroundStation.java +++ b/src/main/java/org/orekit/estimation/measurements/GroundStation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -64,6 +64,12 @@ import org.orekit.utils.ParameterDriver; * station frame (for non-Earth based ground stations, different precession nutation * models and associated planet oritentation parameters would be applied, if available): * </p> + * <p> + * Since 9.3, this class also adds a station clock offset parameter, which manages + * the value that must be subtracted from the observed measurement date to get the real + * physical date at which the measurement was performed (i.e. the offset is negative + * if the ground station clock is slow and positive if it is fast). + * </p> * <ol> * <li>precession/nutation, as theoretical model plus celestial pole EOP parameters</li> * <li>body rotation, as theoretical model plus prime meridian EOP parameters</li> @@ -71,6 +77,7 @@ import org.orekit.utils.ParameterDriver; * <li>additional body rotation, controlled by {@link #getPrimeMeridianOffsetDriver()} and {@link #getPrimeMeridianDriftDriver()}</li> * <li>additional polar motion, controlled by {@link #getPolarOffsetXDriver()}, {@link #getPolarDriftXDriver()}, * {@link #getPolarOffsetYDriver()} and {@link #getPolarDriftYDriver()}</li> + * <li>station clock offset, controlled by {@link #getClockOffsetDriver()}</li> * <li>station position offset, controlled by {@link #getEastOffsetDriver()}, * {@link #getNorthOffsetDriver()} and {@link #getZenithOffsetDriver()}</li> * </ol> @@ -79,19 +86,27 @@ import org.orekit.utils.ParameterDriver; */ public class GroundStation { - /** Suffix for ground station position offset parameter name. */ + /** Suffix for ground station position and clock offset parameters names. */ public static final String OFFSET_SUFFIX = "-offset"; /** Suffix for ground station intermediate frame name. */ public static final String INTERMEDIATE_SUFFIX = "-intermediate"; - /** Offsets scaling factor. + /** Clock offset scaling factor. + * <p> + * We use a power of 2 to avoid numeric noise introduction + * in the multiplications/divisions sequences. + * </p> + */ + private static final double CLOCK_OFFSET_SCALE = FastMath.scalb(1.0, -10); + + /** Position offsets scaling factor. * <p> * We use a power of 2 (in fact really 1.0 here) to avoid numeric noise introduction * in the multiplications/divisions sequences. * </p> */ - private static final double OFFSET_SCALE = FastMath.scalb(1.0, 0); + private static final double POSITION_OFFSET_SCALE = FastMath.scalb(1.0, 0); /** Provider for Earth frame whose EOP parameters can be estimated. */ private final EstimatedEarthFrameProvider estimatedEarthFrameProvider; @@ -108,6 +123,9 @@ public class GroundStation { /** Displacement models. */ private final StationDisplacement[] displacements; + /** Driver for clock offset. */ + private final ParameterDriver clockOffsetDriver; + /** Driver for position offset along the East axis. */ private final ParameterDriver eastOffsetDriver; @@ -123,8 +141,9 @@ public class GroundStation { * ({@link #getPrimeMeridianOffsetDriver()}, {@link #getPrimeMeridianDriftDriver()}, * {@link #getPolarOffsetXDriver()}, {@link #getPolarDriftXDriver()}, * {@link #getPolarOffsetXDriver()}, {@link #getPolarDriftXDriver()}) are set to 0. - * The initial values for the station offset model ({@link #getEastOffsetDriver()}, - * {@link #getNorthOffsetDriver()}, {@link #getZenithOffsetDriver()}) are set to 0. + * The initial values for the station offset model ({@link #getClockOffsetDriver()}, + * {@link #getEastOffsetDriver()}, {@link #getNorthOffsetDriver()}, + * {@link #getZenithOffsetDriver()}) are set to 0. * This implies that as long as these values are not changed, the offset frame is * the same as the {@link #getBaseFrame() base frame}. As soon as some of these models * are changed, the offset frame moves away from the {@link #getBaseFrame() base frame}. @@ -143,8 +162,9 @@ public class GroundStation { * ({@link #getPrimeMeridianOffsetDriver()}, {@link #getPrimeMeridianDriftDriver()}, * {@link #getPolarOffsetXDriver()}, {@link #getPolarDriftXDriver()}, * {@link #getPolarOffsetXDriver()}, {@link #getPolarDriftXDriver()}) are set to 0. - * The initial values for the station offset model ({@link #getEastOffsetDriver()}, - * {@link #getNorthOffsetDriver()}, {@link #getZenithOffsetDriver()}) are set to 0. + * The initial values for the station offset model ({@link #getClockOffsetDriver()}, + * {@link #getEastOffsetDriver()}, {@link #getNorthOffsetDriver()}, + * {@link #getZenithOffsetDriver()}, {@link #getClockOffsetDriver()}) are set to 0. * This implies that as long as these values are not changed, the offset frame is * the same as the {@link #getBaseFrame() base frame}. As soon as some of these models * are changed, the offset frame moves away from the {@link #getBaseFrame() base frame}. @@ -178,16 +198,20 @@ public class GroundStation { this.displacements = displacements.clone(); + this.clockOffsetDriver = new ParameterDriver(baseFrame.getName() + OFFSET_SUFFIX + "-clock", + 0.0, CLOCK_OFFSET_SCALE, + Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); + this.eastOffsetDriver = new ParameterDriver(baseFrame.getName() + OFFSET_SUFFIX + "-East", - 0.0, OFFSET_SCALE, + 0.0, POSITION_OFFSET_SCALE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); this.northOffsetDriver = new ParameterDriver(baseFrame.getName() + OFFSET_SUFFIX + "-North", - 0.0, OFFSET_SCALE, + 0.0, POSITION_OFFSET_SCALE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); this.zenithOffsetDriver = new ParameterDriver(baseFrame.getName() + OFFSET_SUFFIX + "-Zenith", - 0.0, OFFSET_SCALE, + 0.0, POSITION_OFFSET_SCALE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); } @@ -200,6 +224,14 @@ public class GroundStation { return displacements.clone(); } + /** Get a driver allowing to change station clock (which is related to measurement date). + * @return driver for station clock offset + * @since 9.3 + */ + public ParameterDriver getClockOffsetDriver() { + return clockOffsetDriver; + } + /** Get a driver allowing to change station position along East axis. * @return driver for station position offset along East axis */ @@ -365,9 +397,9 @@ public class GroundStation { public GeodeticPoint getOffsetGeodeticPoint(final AbsoluteDate date) { // take station offset into account - final double x = parametricModel(eastOffsetDriver); - final double y = parametricModel(northOffsetDriver); - final double z = parametricModel(zenithOffsetDriver); + final double x = eastOffsetDriver.getValue(); + final double y = northOffsetDriver.getValue(); + final double z = zenithOffsetDriver.getValue(); final BodyShape baseShape = baseFrame.getParentShape(); final Transform baseToBody = baseFrame.getTransformTo(baseShape.getBodyFrame(), date); Vector3D origin = baseToBody.transformPosition(new Vector3D(x, y, z)); @@ -390,114 +422,126 @@ public class GroundStation { * a new offset frame. * </p> * @param inertial inertial frame to transform to - * @param date date of the transform - * @return offset frame defining vectors + * @param clockDate date of the transform as read by the ground station clock (i.e. clock offset <em>not</em> compensated) + * @return transform between offset frame and inertial frame, at <em>real</em> measurement + * date (i.e. with clock, Earth and station offsets applied) */ - public Transform getOffsetToInertial(final Frame inertial, final AbsoluteDate date) { + public Transform getOffsetToInertial(final Frame inertial, final AbsoluteDate clockDate) { + + // take clock offset into account + final double offset = clockOffsetDriver.getValue(); + final AbsoluteDate offsetCompensatedDate = new AbsoluteDate(clockDate, -offset); // take Earth offsets into account - final Transform intermediateToBody = estimatedEarthFrameProvider.getTransform(date).getInverse(); + final Transform intermediateToBody = estimatedEarthFrameProvider.getTransform(offsetCompensatedDate).getInverse(); - // take station offset into account - final double x = parametricModel(eastOffsetDriver); - final double y = parametricModel(northOffsetDriver); - final double z = parametricModel(zenithOffsetDriver); + // take station offsets into account + final double x = eastOffsetDriver.getValue(); + final double y = northOffsetDriver.getValue(); + final double z = zenithOffsetDriver.getValue(); final BodyShape baseShape = baseFrame.getParentShape(); - final Transform baseToBody = baseFrame.getTransformTo(baseShape.getBodyFrame(), date); + final Transform baseToBody = baseFrame.getTransformTo(baseShape.getBodyFrame(), offsetCompensatedDate); Vector3D origin = baseToBody.transformPosition(new Vector3D(x, y, z)); - origin = origin.add(computeDisplacement(date, origin)); + origin = origin.add(computeDisplacement(offsetCompensatedDate, origin)); - final GeodeticPoint originGP = baseShape.transform(origin, baseShape.getBodyFrame(), date); + final GeodeticPoint originGP = baseShape.transform(origin, baseShape.getBodyFrame(), offsetCompensatedDate); final Transform offsetToIntermediate = - new Transform(date, - new Transform(date, + new Transform(offsetCompensatedDate, + new Transform(offsetCompensatedDate, new Rotation(Vector3D.PLUS_I, Vector3D.PLUS_K, originGP.getEast(), originGP.getZenith()), Vector3D.ZERO), - new Transform(date, origin)); + new Transform(offsetCompensatedDate, origin)); // combine all transforms together - final Transform bodyToInert = baseFrame.getParent().getTransformTo(inertial, date); + final Transform bodyToInert = baseFrame.getParent().getTransformTo(inertial, offsetCompensatedDate); - return new Transform(date, offsetToIntermediate, new Transform(date, intermediateToBody, bodyToInert)); + return new Transform(offsetCompensatedDate, offsetToIntermediate, new Transform(offsetCompensatedDate, intermediateToBody, bodyToInert)); } /** Get the transform between offset frame and inertial frame with derivatives. * <p> - * As the East and North vector are not well defined at pole, the derivatives + * As the East and North vectors are not well defined at pole, the derivatives * of these two vectors diverge to infinity as we get closer to the pole. * So this method should not be used for stations less than 0.0001 degree from * either poles. * </p> * @param inertial inertial frame to transform to - * @param date date of the transform + * @param clockDate date of the transform as read by the ground station clock (i.e. clock offset <em>not</em> compensated) * @param factory factory for the derivatives * @param indices indices of the estimated parameters in derivatives computations - * @return offset frame defining vectors with derivatives + * @return transform between offset frame and inertial frame, at <em>real</em> measurement + * date (i.e. with clock, Earth and station offsets applied) + * @see #getOffsetToInertial(Frame, FieldAbsoluteDate, DSFactory, Map) + * @since 9.3 + */ + public FieldTransform<DerivativeStructure> getOffsetToInertial(final Frame inertial, + final AbsoluteDate clockDate, + final DSFactory factory, + final Map<String, Integer> indices) { + // take clock offset into account + final DerivativeStructure offset = clockOffsetDriver.getValue(factory, indices); + final FieldAbsoluteDate<DerivativeStructure> offsetCompensatedDate = + new FieldAbsoluteDate<DerivativeStructure>(clockDate, offset.negate()); + + return getOffsetToInertial(inertial, offsetCompensatedDate, factory, indices); + } + + /** Get the transform between offset frame and inertial frame with derivatives. + * <p> + * As the East and North vectors are not well defined at pole, the derivatives + * of these two vectors diverge to infinity as we get closer to the pole. + * So this method should not be used for stations less than 0.0001 degree from + * either poles. + * </p> + * @param inertial inertial frame to transform to + * @param offsetCompensatedDate date of the transform, clock offset and its derivatives already compensated + * @param factory factory for the derivatives + * @param indices indices of the estimated parameters in derivatives computations + * @return transform between offset frame and inertial frame, at specified date + * @see #getOffsetToInertial(Frame, AbsoluteDate, DSFactory, Map) * @since 9.0 */ public FieldTransform<DerivativeStructure> getOffsetToInertial(final Frame inertial, - final FieldAbsoluteDate<DerivativeStructure> date, + final FieldAbsoluteDate<DerivativeStructure> offsetCompensatedDate, final DSFactory factory, final Map<String, Integer> indices) { - final Field<DerivativeStructure> field = date.getField(); + final Field<DerivativeStructure> field = factory.getDerivativeField(); final FieldVector3D<DerivativeStructure> zero = FieldVector3D.getZero(field); final FieldVector3D<DerivativeStructure> plusI = FieldVector3D.getPlusI(field); final FieldVector3D<DerivativeStructure> plusK = FieldVector3D.getPlusK(field); // take Earth offsets into account final FieldTransform<DerivativeStructure> intermediateToBody = - estimatedEarthFrameProvider.getTransform(date, factory, indices).getInverse(); + estimatedEarthFrameProvider.getTransform(offsetCompensatedDate, factory, indices).getInverse(); - // take station offset into account - final DerivativeStructure x = parametricModel(factory, eastOffsetDriver, indices); - final DerivativeStructure y = parametricModel(factory, northOffsetDriver, indices); - final DerivativeStructure z = parametricModel(factory, zenithOffsetDriver, indices); + // take station offsets into account + final DerivativeStructure x = eastOffsetDriver.getValue(factory, indices); + final DerivativeStructure y = northOffsetDriver.getValue(factory, indices); + final DerivativeStructure z = zenithOffsetDriver.getValue(factory, indices); final BodyShape baseShape = baseFrame.getParentShape(); final Transform baseToBody = baseFrame.getTransformTo(baseShape.getBodyFrame(), (AbsoluteDate) null); FieldVector3D<DerivativeStructure> origin = baseToBody.transformPosition(new FieldVector3D<>(x, y, z)); - origin = origin.add(computeDisplacement(date.toAbsoluteDate(), origin.toVector3D())); - final FieldGeodeticPoint<DerivativeStructure> originGP = baseShape.transform(origin, baseShape.getBodyFrame(), date); + origin = origin.add(computeDisplacement(offsetCompensatedDate.toAbsoluteDate(), origin.toVector3D())); + final FieldGeodeticPoint<DerivativeStructure> originGP = baseShape.transform(origin, baseShape.getBodyFrame(), offsetCompensatedDate); final FieldTransform<DerivativeStructure> offsetToIntermediate = - new FieldTransform<>(date, - new FieldTransform<>(date, + new FieldTransform<>(offsetCompensatedDate, + new FieldTransform<>(offsetCompensatedDate, new FieldRotation<>(plusI, plusK, originGP.getEast(), originGP.getZenith()), zero), - new FieldTransform<>(date, origin)); + new FieldTransform<>(offsetCompensatedDate, origin)); // combine all transforms together - final FieldTransform<DerivativeStructure> bodyToInert = baseFrame.getParent().getTransformTo(inertial, date); + final FieldTransform<DerivativeStructure> bodyToInert = baseFrame.getParent().getTransformTo(inertial, offsetCompensatedDate); - return new FieldTransform<>(date, + return new FieldTransform<>(offsetCompensatedDate, offsetToIntermediate, - new FieldTransform<>(date, intermediateToBody, bodyToInert)); - - } - - /** Evaluate a parametric model. - * @param driver driver managing the parameter - * @return value of the parametric model - */ - private double parametricModel(final ParameterDriver driver) { - return driver.getValue(); - } + new FieldTransform<>(offsetCompensatedDate, intermediateToBody, bodyToInert)); - /** Evaluate a parametric model. - * @param factory factory for the derivatives - * @param driver driver managing the parameter - * @param indices indices of the estimated parameters in derivatives computations - * @return value of the parametric model - */ - private DerivativeStructure parametricModel(final DSFactory factory, final ParameterDriver driver, - final Map<String, Integer> indices) { - final Integer index = indices.get(driver.getName()); - return (index == null) ? - factory.constant(driver.getValue()) : - factory.variable(index, driver.getValue()); } } diff --git a/src/main/java/org/orekit/estimation/measurements/InterSatellitesRange.java b/src/main/java/org/orekit/estimation/measurements/InterSatellitesRange.java index c0c163d97d198301cdd0749c56ad955abe0a4ba9..e04d6f4485fbfd2bc013c0f6447c52c239b4ad11 100644 --- a/src/main/java/org/orekit/estimation/measurements/InterSatellitesRange.java +++ b/src/main/java/org/orekit/estimation/measurements/InterSatellitesRange.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,33 +17,48 @@ package org.orekit.estimation.measurements; import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; -import org.hipparchus.Field; import org.hipparchus.analysis.differentiation.DSFactory; import org.hipparchus.analysis.differentiation.DerivativeStructure; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; import org.orekit.time.FieldAbsoluteDate; import org.orekit.utils.Constants; +import org.orekit.utils.ParameterDriver; import org.orekit.utils.TimeStampedFieldPVCoordinates; import org.orekit.utils.TimeStampedPVCoordinates; /** One-way or two-way range measurements between two satellites. * <p> - * Satellite 1 is always considered to be the satellite that receives the - * signal and computes the measurement. + * For one-way measurements, a signal is emitted by a remote satellite and received + * by local satellite. The measurement value is the elapsed time between emission + * and reception multiplied by c where c is the speed of light. * </p> * <p> - * For one-way measurements, a signal is emitted by satellite 2 and received - * by satellite 1. The measurement value is the elapsed time between emission - * and reception divided by c were c is the speed of light. + * For two-way measurements, a signal is emitted by local satellite, reflected on + * remote satellite, and received back by local satellite. The measurement value + * is the elapsed time between emission and reception multiplied by c/2 where c + * is the speed of light. * </p> * <p> - * For two-way measurements, a signal is emitted by satellite 1, reflected on - * satellite 2, and received back by satellite 1 again. The measurement value - * is the elapsed time between emission and reception divided by 2c were c is - * the speed of light. + * Since 9.3, this class also uses the clock offsets of both satellites, + * which manage the value that must be added to each satellite reading of time to + * compute the real physical date. In this measurement, these offsets have two effects: * </p> + * <ul> + * <li>as measurement date is evaluated at reception time, the real physical date + * of the measurement is the observed date to which the local satellite clock + * offset is subtracted</li> + * <li>as range is evaluated using the total signal time of flight, for one-way + * measurements the observed range is the real physical signal time of flight to + * which (Δtl - Δtr) ⨉ c is added, where Δtl (resp. Δtr) is the clock offset for the + * local satellite (resp. remote satellite). A similar effect exists in + * two-way measurements but it is computed as (Δtl - Δtl) ⨉ c / 2 as the local satellite + * clock is used for both initial emission and final reception and therefore it evaluates + * to zero.</li> + * </ul> * <p> * The motion of both satellites during the signal flight time is * taken into account. The date of the measurement corresponds to @@ -58,10 +73,10 @@ public class InterSatellitesRange extends AbstractMeasurement<InterSatellitesRan private final boolean twoway; /** Simple constructor. - * @param satellite1Index index of satellite 1 propagator + * @param localIndex index of local satellite propagator * (i.e. the satellite which receives the signal and performs * the measurement) - * @param satellite2Index index of satellite 2 propagator + * @param remoteIndex index of remote satellite propagator * (i.e. the satellite which simply emits the signal in the one-way * case, or reflects the signal in the two-way case) * @param twoWay flag indicating whether it is a two-way measurement @@ -69,12 +84,35 @@ public class InterSatellitesRange extends AbstractMeasurement<InterSatellitesRan * @param range observed value * @param sigma theoretical standard deviation * @param baseWeight base weight + * @deprecated as of 9.3, replaced by {@link #InterSatellitesRange(ObservableSatellite, ObservableSatellite, + * boolean, AbsoluteDate, double, double, double)} */ - public InterSatellitesRange(final int satellite1Index, final int satellite2Index, + @Deprecated + public InterSatellitesRange(final int localIndex, final int remoteIndex, final boolean twoWay, final AbsoluteDate date, final double range, final double sigma, final double baseWeight) { - super(date, range, sigma, baseWeight, Arrays.asList(satellite1Index, satellite2Index)); + this(new ObservableSatellite(localIndex), new ObservableSatellite(remoteIndex), + twoWay, date, range, sigma, baseWeight); + } + + /** Simple constructor. + * @param local satellite which receives the signal and performs the measurement + * @param remote satellite which simply emits the signal in the one-way case, + * or reflects the signal in the two-way case + * @param twoWay flag indicating whether it is a two-way measurement + * @param date date of the measurement + * @param range observed value + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @since 9.3 + */ + public InterSatellitesRange(final ObservableSatellite local, + final ObservableSatellite remote, + final boolean twoWay, + final AbsoluteDate date, final double range, + final double sigma, final double baseWeight) { + super(date, range, sigma, baseWeight, Arrays.asList(local, remote)); this.twoway = twoWay; } @@ -95,32 +133,43 @@ public class InterSatellitesRange extends AbstractMeasurement<InterSatellitesRan // ---------------------- // // Parameters: - // - 0..2 - Position of the satellite 1 in inertial frame - // - 3..5 - Velocity of the satellite 1 in inertial frame - // - 6..8 - Position of the satellite 2 in inertial frame - // - 9..11 - Velocity of the satellite 2 in inertial frame - final int nbParams = 12; - final DSFactory factory = new DSFactory(nbParams, 1); - final Field<DerivativeStructure> field = factory.getDerivativeField(); + // - 0..2 - Position of the receiver satellite in inertial frame + // - 3..5 - Velocity of the receiver satellite in inertial frame + // - 6..8 - Position of the remote satellite in inertial frame + // - 9..11 - Velocity of the remote satellite in inertial frame + // - 12.. - Measurement parameters: local clock offset, remote clock offset... + int nbParams = 12; + final Map<String, Integer> indices = new HashMap<>(); + for (ParameterDriver driver : getParametersDrivers()) { + if (driver.isSelected()) { + indices.put(driver.getName(), nbParams++); + } + } + final DSFactory factory = new DSFactory(nbParams, 1); // coordinates of both satellites - final SpacecraftState state1 = states[getPropagatorsIndices().get(0)]; - final TimeStampedFieldPVCoordinates<DerivativeStructure> pva1 = getCoordinates(state1, 0, factory); - final SpacecraftState state2 = states[getPropagatorsIndices().get(1)]; - final TimeStampedFieldPVCoordinates<DerivativeStructure> pva2 = getCoordinates(state2, 6, factory); + final ObservableSatellite local = getSatellites().get(0); + final SpacecraftState stateL = states[local.getPropagatorIndex()]; + final TimeStampedFieldPVCoordinates<DerivativeStructure> pvaL = getCoordinates(stateL, 0, factory); + final ObservableSatellite remote = getSatellites().get(1); + final SpacecraftState stateR = states[remote.getPropagatorIndex()]; + final TimeStampedFieldPVCoordinates<DerivativeStructure> pvaR = getCoordinates(stateR, 6, factory); // compute propagation times // (if state has already been set up to pre-compensate propagation delay, // we will have delta == tauD and transitState will be the same as state) // downlink delay - final FieldAbsoluteDate<DerivativeStructure> arrivalDate = new FieldAbsoluteDate<>(field, getDate()); + final DerivativeStructure dtl = local.getClockOffsetDriver().getValue(factory, indices); + final FieldAbsoluteDate<DerivativeStructure> arrivalDate = + new FieldAbsoluteDate<DerivativeStructure>(getDate(), dtl.negate()); + final TimeStampedFieldPVCoordinates<DerivativeStructure> s1Downlink = - pva1.shiftedBy(arrivalDate.durationFrom(pva1.getDate())); - final DerivativeStructure tauD = signalTimeOfFlight(pva2, s1Downlink.getPosition(), arrivalDate); + pvaL.shiftedBy(arrivalDate.durationFrom(pvaL.getDate())); + final DerivativeStructure tauD = signalTimeOfFlight(pvaR, s1Downlink.getPosition(), arrivalDate); // Transit state - final double delta = getDate().durationFrom(state2.getDate()); + final double delta = getDate().durationFrom(stateR.getDate()); final DerivativeStructure deltaMTauD = tauD.negate().add(delta); // prepare the evaluation @@ -129,20 +178,20 @@ public class InterSatellitesRange extends AbstractMeasurement<InterSatellitesRan final DerivativeStructure range; if (twoway) { // Transit state (re)computed with derivative structures - final TimeStampedFieldPVCoordinates<DerivativeStructure> transitStateDS = pva2.shiftedBy(deltaMTauD); + final TimeStampedFieldPVCoordinates<DerivativeStructure> transitStateDS = pvaR.shiftedBy(deltaMTauD); // uplink delay - final DerivativeStructure tauU = signalTimeOfFlight(pva1, + final DerivativeStructure tauU = signalTimeOfFlight(pvaL, transitStateDS.getPosition(), transitStateDS.getDate()); estimated = new EstimatedMeasurement<>(this, iteration, evaluation, new SpacecraftState[] { - state1.shiftedBy(deltaMTauD.getValue()), - state2.shiftedBy(deltaMTauD.getValue()) + stateL.shiftedBy(deltaMTauD.getValue()), + stateR.shiftedBy(deltaMTauD.getValue()) }, new TimeStampedPVCoordinates[] { - state1.shiftedBy(delta - tauD.getValue() - tauU.getValue()).getPVCoordinates(), - state2.shiftedBy(delta - tauD.getValue()).getPVCoordinates(), - state1.shiftedBy(delta).getPVCoordinates() + stateL.shiftedBy(delta - tauD.getValue() - tauU.getValue()).getPVCoordinates(), + stateR.shiftedBy(delta - tauD.getValue()).getPVCoordinates(), + stateL.shiftedBy(delta).getPVCoordinates() }); // Range value @@ -152,15 +201,18 @@ public class InterSatellitesRange extends AbstractMeasurement<InterSatellitesRan estimated = new EstimatedMeasurement<>(this, iteration, evaluation, new SpacecraftState[] { - state1.shiftedBy(deltaMTauD.getValue()), - state2.shiftedBy(deltaMTauD.getValue()) + stateL.shiftedBy(deltaMTauD.getValue()), + stateR.shiftedBy(deltaMTauD.getValue()) }, new TimeStampedPVCoordinates[] { - state2.shiftedBy(delta - tauD.getValue()).getPVCoordinates(), - state1.shiftedBy(delta).getPVCoordinates() + stateR.shiftedBy(delta - tauD.getValue()).getPVCoordinates(), + stateL.shiftedBy(delta).getPVCoordinates() }); + // Clock offsets + final DerivativeStructure dtr = remote.getClockOffsetDriver().getValue(factory, indices); + // Range value - range = tauD.multiply(Constants.SPEED_OF_LIGHT); + range = tauD.add(dtl).subtract(dtr).multiply(Constants.SPEED_OF_LIGHT); } estimated.setEstimatedValue(range.getValue()); diff --git a/src/main/java/org/orekit/estimation/measurements/ObservableSatellite.java b/src/main/java/org/orekit/estimation/measurements/ObservableSatellite.java new file mode 100644 index 0000000000000000000000000000000000000000..437062eb8c7dc2450fae6d2fd74da65e47daa1fe --- /dev/null +++ b/src/main/java/org/orekit/estimation/measurements/ObservableSatellite.java @@ -0,0 +1,75 @@ +/* Copyright 2002-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.estimation.measurements; + +import org.hipparchus.util.FastMath; +import org.orekit.utils.ParameterDriver; + +/** Class modeling a satellite that can be observed. + * + * @author Luc Maisonobe + * @since 9.3 + */ +public class ObservableSatellite { + + /** Prefix for clock offset parameter driver, the propagator index will be appended to it. */ + public static final String CLOCK_OFFSET_PREFIX = "clock-offset-satellite-"; + + /** Clock offset scaling factor. + * <p> + * We use a power of 2 to avoid numeric noise introduction + * in the multiplications/divisions sequences. + * </p> + */ + private static final double CLOCK_OFFSET_SCALE = FastMath.scalb(1.0, -10); + + /** Index of the propagator related to this satellite. */ + private final int propagatorIndex; + + /** Parameter driver for satellite clock offset. */ + private final ParameterDriver clockOffsetDriver; + + /** Simple constructor. + * @param propagatorIndex index of the propagator related to this satellite + */ + public ObservableSatellite(final int propagatorIndex) { + this.propagatorIndex = propagatorIndex; + this.clockOffsetDriver = new ParameterDriver(CLOCK_OFFSET_PREFIX + propagatorIndex, + 0.0, CLOCK_OFFSET_SCALE, + Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); + } + + /** Get the index of the propagator related to this satellite. + * @return index of the propagator related to this satellite + */ + public int getPropagatorIndex() { + return propagatorIndex; + } + + /** Get the clock offset parameter driver. + * <p> + * The offset value is defined as the value in seconds that must be <em>subtracted</em> from + * the satellite clock reading of time to compute the real physical date. The offset + * is therefore negative if the satellite clock is slow and positive if it is fast. + * </p> + * @return clock offset parameter driver + */ + public ParameterDriver getClockOffsetDriver() { + return clockOffsetDriver; + } + +} diff --git a/src/main/java/org/orekit/estimation/measurements/ObservedMeasurement.java b/src/main/java/org/orekit/estimation/measurements/ObservedMeasurement.java index 1e6859ca4a1ae217738187f7d8e5960a1ac58d82..92acabf51f56a40e04cecd6588ab6b64e8274efd 100644 --- a/src/main/java/org/orekit/estimation/measurements/ObservedMeasurement.java +++ b/src/main/java/org/orekit/estimation/measurements/ObservedMeasurement.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,7 @@ package org.orekit.estimation.measurements; import java.util.List; +import java.util.stream.Collectors; import org.orekit.propagation.SpacecraftState; import org.orekit.utils.ParameterDriver; @@ -129,9 +130,21 @@ public interface ObservedMeasurement<T extends ObservedMeasurement<T>> extends C * @return indices of the {@link org.orekit.propagation.Propagator propagators} * related to this measurement * @since 9.0 + * @deprecated as of 9.3, replaced by {@link #getSatellites()} */ + @Deprecated List<Integer> getPropagatorsIndices(); + /** Get the satellites related to this measurement. + * @return satellites related to this measurement + * @since 9.3 + */ + default List<ObservableSatellite> getSatellites() { + // this default implementation is temporary for the 9.3 release, + // it will be removed when getPropagatorsIndices() is removed at 10.0 + return getPropagatorsIndices().stream().map(i -> new ObservableSatellite(i)).collect(Collectors.toList()); + } + /** Estimate the theoretical value of the measurement. * <p> * The estimated value is the <em>combination</em> of the raw estimated diff --git a/src/main/java/org/orekit/estimation/measurements/PV.java b/src/main/java/org/orekit/estimation/measurements/PV.java index d1fd1ea7b5e003a68285e6c91fda0d94bfd8f5a2..cb0215514d7400dfe148d6f8e34ef63ca36d3ce8 100644 --- a/src/main/java/org/orekit/estimation/measurements/PV.java +++ b/src/main/java/org/orekit/estimation/measurements/PV.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,10 +71,13 @@ public class PV extends AbstractMeasurement<PV> { * @param sigmaPosition theoretical standard deviation on position components * @param sigmaVelocity theoretical standard deviation on velocity components * @param baseWeight base weight + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double, double, double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double sigmaPosition, final double sigmaVelocity, final double baseWeight) { - this(date, position, velocity, sigmaPosition, sigmaVelocity, baseWeight, 0); + this(date, position, velocity, sigmaPosition, sigmaVelocity, baseWeight, new ObservableSatellite(0)); } /** Constructor with two double for the standard deviations. @@ -91,10 +94,34 @@ public class PV extends AbstractMeasurement<PV> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.0 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double, double, double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double sigmaPosition, final double sigmaVelocity, final double baseWeight, final int propagatorIndex) { + this(date, position, velocity, sigmaPosition, sigmaVelocity, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Constructor with two double for the standard deviations. + * <p>The first double is the position's standard deviation, common to the 3 position's components. + * The second double is the position's standard deviation, common to the 3 position's components.</p> + * <p> + * The measurement must be in the orbit propagation frame. + * </p> + * @param date date of the measurement + * @param position position + * @param velocity velocity + * @param sigmaPosition theoretical standard deviation on position components + * @param sigmaVelocity theoretical standard deviation on velocity components + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, + final double sigmaPosition, final double sigmaVelocity, final double baseWeight, + final ObservableSatellite satellite) { this(date, position, velocity, new double[] { sigmaPosition, @@ -103,10 +130,10 @@ public class PV extends AbstractMeasurement<PV> { sigmaVelocity, sigmaVelocity, sigmaVelocity - }, baseWeight, propagatorIndex); + }, baseWeight, satellite); } - /** Constructor with two vectors for the standard deviations and default value for propagator index.. + /** Constructor with two vectors for the standard deviations and default value for propagator index. * <p>One 3-sized vectors for position standard deviations. * One 3-sized vectors for velocity standard deviations. * The 3-sized vectors are the square root of the diagonal elements of the covariance matrix.</p> @@ -121,10 +148,13 @@ public class PV extends AbstractMeasurement<PV> { * @param sigmaVelocity 3-sized vector of the standard deviations of the velocity * @param baseWeight base weight * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[], double[], double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[] sigmaPosition, final double[] sigmaVelocity, final double baseWeight) { - this(date, position, velocity, sigmaPosition, sigmaVelocity, baseWeight, 0); + this(date, position, velocity, sigmaPosition, sigmaVelocity, baseWeight, new ObservableSatellite(0)); } /** Constructor with two vectors for the standard deviations. @@ -140,13 +170,37 @@ public class PV extends AbstractMeasurement<PV> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[], double[], double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[] sigmaPosition, final double[] sigmaVelocity, final double baseWeight, final int propagatorIndex) { + this(date, position, velocity, sigmaPosition, sigmaVelocity, + baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Constructor with two vectors for the standard deviations. + * <p>One 3-sized vectors for position standard deviations. + * One 3-sized vectors for velocity standard deviations. + * The 3-sized vectors are the square root of the diagonal elements of the covariance matrix.</p> + * <p>The measurement must be in the orbit propagation frame.</p> + * @param date date of the measurement + * @param position position + * @param velocity velocity + * @param sigmaPosition 3-sized vector of the standard deviations of the position + * @param sigmaVelocity 3-sized vector of the standard deviations of the velocity + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, + final double[] sigmaPosition, final double[] sigmaVelocity, + final double baseWeight, final ObservableSatellite satellite) { this(date, position, velocity, buildPvCovarianceMatrix(sigmaPosition, sigmaVelocity), - baseWeight, propagatorIndex); + baseWeight, satellite); } /** Constructor with one vector for the standard deviations and default value for propagator index. @@ -161,10 +215,13 @@ public class PV extends AbstractMeasurement<PV> { * @param sigmaPV 6-sized vector of the standard deviations * @param baseWeight base weight * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[], double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[] sigmaPV, final double baseWeight) { - this(date, position, velocity, sigmaPV, baseWeight, 0); + this(date, position, velocity, sigmaPV, baseWeight, new ObservableSatellite(0)); } /** Constructor with one vector for the standard deviations. @@ -177,12 +234,29 @@ public class PV extends AbstractMeasurement<PV> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[], double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[] sigmaPV, final double baseWeight, final int propagatorIndex) { - this(date, position, velocity, - buildPvCovarianceMatrix(sigmaPV), - baseWeight, propagatorIndex); + this(date, position, velocity, sigmaPV, baseWeight, new ObservableSatellite(0)); + } + + /** Constructor with one vector for the standard deviations. + * <p>The 6-sized vector is the square root of the diagonal elements of the covariance matrix.</p> + * <p>The measurement must be in the orbit propagation frame.</p> + * @param date date of the measurement + * @param position position + * @param velocity velocity + * @param sigmaPV 6-sized vector of the standard deviations + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, + final double[] sigmaPV, final double baseWeight, final ObservableSatellite satellite) { + this(date, position, velocity, buildPvCovarianceMatrix(sigmaPV), baseWeight, satellite); } /** @@ -200,11 +274,15 @@ public class PV extends AbstractMeasurement<PV> { * @param velocityCovarianceMatrix 3x3 covariance matrix of the velocity * @param baseWeight base weight * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[][], double[][], double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[][] positionCovarianceMatrix, final double[][] velocityCovarianceMatrix, final double baseWeight) { - this(date, position, velocity, positionCovarianceMatrix, velocityCovarianceMatrix, baseWeight, 0); + this(date, position, velocity, positionCovarianceMatrix, velocityCovarianceMatrix, + baseWeight, new ObservableSatellite(0)); } /** @@ -220,13 +298,37 @@ public class PV extends AbstractMeasurement<PV> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[][], double[][], double, ObservableSatellite)} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[][] positionCovarianceMatrix, final double[][] velocityCovarianceMatrix, final double baseWeight, final int propagatorIndex) { + this(date, position, velocity, positionCovarianceMatrix, velocityCovarianceMatrix, + baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** + * Constructor with 2 smaller covariance matrices. + * <p>One 3x3 covariance matrix for position and one 3x3 covariance matrix for velocity. + * The fact that the covariance matrices are symmetric and positive definite is not checked.</p> + * <p>The measurement must be in the orbit propagation frame.</p> + * @param date date of the measurement + * @param position position + * @param velocity velocity + * @param positionCovarianceMatrix 3x3 covariance matrix of the position + * @param velocityCovarianceMatrix 3x3 covariance matrix of the velocity + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, + final double[][] positionCovarianceMatrix, final double[][] velocityCovarianceMatrix, + final double baseWeight, final ObservableSatellite satellite) { this(date, position, velocity, buildPvCovarianceMatrix(positionCovarianceMatrix, velocityCovarianceMatrix), - baseWeight, propagatorIndex); + baseWeight, satellite); } /** @@ -242,10 +344,13 @@ public class PV extends AbstractMeasurement<PV> { * @param covarianceMatrix 6x6 covariance matrix of the PV measurement * @param baseWeight base weight * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[][], double, ObservableSatellite))} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[][] covarianceMatrix, final double baseWeight) { - this(date, position, velocity, covarianceMatrix, baseWeight, 0); + this(date, position, velocity, covarianceMatrix, baseWeight, new ObservableSatellite(0)); } /** Constructor with full covariance matrix and all inputs. @@ -258,9 +363,28 @@ public class PV extends AbstractMeasurement<PV> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.2 + * @deprecated as of 9.3, replaced by {@link #PV(AbsoluteDate, Vector3D, Vector3D, + * double[][], double, ObservableSatellite))} */ + @Deprecated public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, final double[][] covarianceMatrix, final double baseWeight, final int propagatorIndex) { + this(date, position, velocity, covarianceMatrix, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Constructor with full covariance matrix and all inputs. + * <p>The fact that the covariance matrix is symmetric and positive definite is not checked.</p> + * <p>The measurement must be in the orbit propagation frame.</p> + * @param date date of the measurement + * @param position position + * @param velocity velocity + * @param covarianceMatrix 6x6 covariance matrix of the PV measurement + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public PV(final AbsoluteDate date, final Vector3D position, final Vector3D velocity, + final double[][] covarianceMatrix, final double baseWeight, final ObservableSatellite satellite) { super(date, new double[] { position.getX(), position.getY(), position.getZ(), @@ -269,7 +393,7 @@ public class PV extends AbstractMeasurement<PV> { new double[] { baseWeight, baseWeight, baseWeight, baseWeight, baseWeight, baseWeight - }, Arrays.asList(propagatorIndex)); + }, Arrays.asList(satellite)); this.covarianceMatrix = covarianceMatrix; } @@ -328,7 +452,9 @@ public class PV extends AbstractMeasurement<PV> { final SpacecraftState[] states) { // PV value - final TimeStampedPVCoordinates pv = states[getPropagatorsIndices().get(0)].getPVCoordinates(); + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; + final TimeStampedPVCoordinates pv = state.getPVCoordinates(); // prepare the evaluation final EstimatedMeasurement<PV> estimated = diff --git a/src/main/java/org/orekit/estimation/measurements/Phase.java b/src/main/java/org/orekit/estimation/measurements/Phase.java index 034443372b119885709ba0480feca21ae4a5a59d..ec5aa0e569d50cdca378d016984f07e48532e8b2 100644 --- a/src/main/java/org/orekit/estimation/measurements/Phase.java +++ b/src/main/java/org/orekit/estimation/measurements/Phase.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -68,11 +68,14 @@ public class Phase extends AbstractMeasurement<Phase> { * @param wavelength phase observed value wavelength * @param sigma theoretical standard deviation * @param baseWeight base weight + * @deprecated since 9.3 raplced by {@link #Phase(GroundStation, AbsoluteDate, + * double, double, double, double, ObservableSatellite)} */ + @Deprecated public Phase(final GroundStation station, final AbsoluteDate date, final double phase, final double wavelength, final double sigma, final double baseWeight) { - this(station, date, phase, wavelength, sigma, baseWeight, 0); + this(station, date, phase, wavelength, sigma, baseWeight, new ObservableSatellite(0)); } /** Simple constructor. @@ -83,20 +86,40 @@ public class Phase extends AbstractMeasurement<Phase> { * @param sigma theoretical standard deviation * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement + * @deprecated since 9.3 raplced by {@link #Phase(GroundStation, AbsoluteDate, + * double, double, double, double, ObservableSatellite)} */ + @Deprecated public Phase(final GroundStation station, final AbsoluteDate date, final double phase, final double wavelength, final double sigma, final double baseWeight, final int propagatorIndex) { - super(date, phase, sigma, baseWeight, Arrays.asList(propagatorIndex), - station.getEastOffsetDriver(), - station.getNorthOffsetDriver(), - station.getZenithOffsetDriver(), - station.getPrimeMeridianOffsetDriver(), - station.getPrimeMeridianDriftDriver(), - station.getPolarOffsetXDriver(), - station.getPolarDriftXDriver(), - station.getPolarOffsetYDriver(), - station.getPolarDriftYDriver()); + this(station, date, phase, wavelength, sigma, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Simple constructor. + * @param station ground station from which measurement is performed + * @param date date of the measurement + * @param phase observed value + * @param wavelength phase observed value wavelength + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public Phase(final GroundStation station, final AbsoluteDate date, + final double phase, final double wavelength, final double sigma, + final double baseWeight, final ObservableSatellite satellite) { + super(date, phase, sigma, baseWeight, Arrays.asList(satellite)); + addParameterDriver(station.getClockOffsetDriver()); + addParameterDriver(station.getEastOffsetDriver()); + addParameterDriver(station.getNorthOffsetDriver()); + addParameterDriver(station.getZenithOffsetDriver()); + addParameterDriver(station.getPrimeMeridianOffsetDriver()); + addParameterDriver(station.getPrimeMeridianDriftDriver()); + addParameterDriver(station.getPolarOffsetXDriver()); + addParameterDriver(station.getPolarDriftXDriver()); + addParameterDriver(station.getPolarOffsetYDriver()); + addParameterDriver(station.getPolarDriftYDriver()); this.station = station; this.wavelength = wavelength; } @@ -114,7 +137,8 @@ public class Phase extends AbstractMeasurement<Phase> { final int evaluation, final SpacecraftState[] states) { - final SpacecraftState state = states[getPropagatorsIndices().get(0)]; + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // Phase derivatives are computed with respect to spacecraft state in inertial frame // and station parameters @@ -123,7 +147,7 @@ public class Phase extends AbstractMeasurement<Phase> { // Parameters: // - 0..2 - Position of the spacecraft in inertial frame // - 3..5 - Velocity of the spacecraft in inertial frame - // - 6..n - station parameters (station offsets, pole, prime meridian...) + // - 6..n - station parameters (clock offset, station offsets, pole, prime meridian...) int nbParams = 6; final Map<String, Integer> indices = new HashMap<>(); for (ParameterDriver driver : getParametersDrivers()) { @@ -140,11 +164,10 @@ public class Phase extends AbstractMeasurement<Phase> { // transform between station and inertial frame, expressed as a derivative structure // The components of station's position in offset frame are the 3 last derivative parameters - final AbsoluteDate downlinkDate = getDate(); - final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = - new FieldAbsoluteDate<>(field, downlinkDate); final FieldTransform<DerivativeStructure> offsetToInertialDownlink = - station.getOffsetToInertial(state.getFrame(), downlinkDateDS, factory, indices); + station.getOffsetToInertial(state.getFrame(), getDate(), factory, indices); + final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = + offsetToInertialDownlink.getFieldDate(); // Station position in inertial frame at end of the downlink leg final TimeStampedFieldPVCoordinates<DerivativeStructure> stationDownlink = @@ -159,7 +182,7 @@ public class Phase extends AbstractMeasurement<Phase> { final DerivativeStructure tauD = signalTimeOfFlight(pvaDS, stationDownlink.getPosition(), downlinkDateDS); // Transit state & Transit state (re)computed with derivative structures - final double delta = downlinkDate.durationFrom(state.getDate()); + final DerivativeStructure delta = downlinkDateDS.durationFrom(state.getDate()); final DerivativeStructure deltaMTauD = tauD.negate().add(delta); final SpacecraftState transitState = state.shiftedBy(deltaMTauD.getValue()); final TimeStampedFieldPVCoordinates<DerivativeStructure> transitStateDS = pvaDS.shiftedBy(deltaMTauD); diff --git a/src/main/java/org/orekit/estimation/measurements/Position.java b/src/main/java/org/orekit/estimation/measurements/Position.java index ac078d83f5d63aceab497a426545a5236660641a..bd5020b2b60ec5a16a3e0951dfec4f4fbd3a09d4 100644 --- a/src/main/java/org/orekit/estimation/measurements/Position.java +++ b/src/main/java/org/orekit/estimation/measurements/Position.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -62,10 +62,13 @@ public class Position extends AbstractMeasurement<Position> { * @param position position * @param sigmaPosition theoretical standard deviation on position components * @param baseWeight base weight + * @deprecated as of 9.3, replaced by {@link #Position(AbsoluteDate, Vector3D, + * double, double, ObservableSatellite)} */ + @Deprecated public Position(final AbsoluteDate date, final Vector3D position, final double sigmaPosition, final double baseWeight) { - this(date, position, sigmaPosition, baseWeight, 0); + this(date, position, sigmaPosition, baseWeight, new ObservableSatellite(0)); } /** Constructor with one double for the standard deviation. @@ -78,16 +81,37 @@ public class Position extends AbstractMeasurement<Position> { * @param sigmaPosition theoretical standard deviation on position components * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement + * @deprecated as of 9.3, replaced by {@link #Position(AbsoluteDate, Vector3D, + * double, double, ObservableSatellite)} */ + @Deprecated public Position(final AbsoluteDate date, final Vector3D position, final double sigmaPosition, final double baseWeight, final int propagatorIndex) { + this(date, position, sigmaPosition, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Constructor with one double for the standard deviation. + * <p>The double is the position's standard deviation, common to the 3 position's components.</p> + * <p> + * The measurement must be in the orbit propagation frame. + * </p> + * @param date date of the measurement + * @param position position + * @param sigmaPosition theoretical standard deviation on position components + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public Position(final AbsoluteDate date, final Vector3D position, + final double sigmaPosition, final double baseWeight, + final ObservableSatellite satellite) { this(date, position, new double[] { sigmaPosition, sigmaPosition, sigmaPosition - }, baseWeight, propagatorIndex); + }, baseWeight, satellite); } /** Constructor with one vector for the standard deviation and default value for propagator index.. @@ -100,10 +124,13 @@ public class Position extends AbstractMeasurement<Position> { * @param position position * @param sigmaPosition 3-sized vector of the standard deviations of the position * @param baseWeight base weight + * @deprecated as of 9.3, replaced by {@link #Position(AbsoluteDate, Vector3D, + * double[], double, ObservableSatellite)} */ + @Deprecated public Position(final AbsoluteDate date, final Vector3D position, final double[] sigmaPosition, final double baseWeight) { - this(date, position, sigmaPosition, baseWeight, 0); + this(date, position, sigmaPosition, baseWeight, new ObservableSatellite(0)); } /** Constructor with one vector for the standard deviation. @@ -114,10 +141,28 @@ public class Position extends AbstractMeasurement<Position> { * @param sigmaPosition 3-sized vector of the standard deviations of the position * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement + * @deprecated as of 9.3, replaced by {@link #Position(AbsoluteDate, Vector3D, + * double[], double, ObservableSatellite)} */ + @Deprecated public Position(final AbsoluteDate date, final Vector3D position, final double[] sigmaPosition, final double baseWeight, final int propagatorIndex) { - this(date, position, buildPvCovarianceMatrix(sigmaPosition), baseWeight, propagatorIndex); + this(date, position, sigmaPosition, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Constructor with one vector for the standard deviation. + * <p>The 3-sized vector represents the square root of the diagonal elements of the covariance matrix.</p> + * <p>The measurement must be in the orbit propagation frame.</p> + * @param date date of the measurement + * @param position position + * @param sigmaPosition 3-sized vector of the standard deviations of the position + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public Position(final AbsoluteDate date, final Vector3D position, + final double[] sigmaPosition, final double baseWeight, final ObservableSatellite satellite) { + this(date, position, buildPvCovarianceMatrix(sigmaPosition), baseWeight, satellite); } /** @@ -131,10 +176,13 @@ public class Position extends AbstractMeasurement<Position> { * @param position position * @param positionCovarianceMatrix 3x3 covariance matrix of the position * @param baseWeight base weight + * @deprecated as of 9.3, replaced by {@link #Position(AbsoluteDate, Vector3D, + * double[][], double, ObservableSatellite)} */ + @Deprecated public Position(final AbsoluteDate date, final Vector3D position, final double[][] positionCovarianceMatrix, final double baseWeight) { - this(date, position, positionCovarianceMatrix, baseWeight, 0); + this(date, position, positionCovarianceMatrix, baseWeight, new ObservableSatellite(0)); } /** Constructor with full covariance matrix and all inputs. @@ -145,17 +193,36 @@ public class Position extends AbstractMeasurement<Position> { * @param covarianceMatrix 6x6 covariance matrix of the PV measurement * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement + * @deprecated as of 9.3, replaced by {@link #Position(AbsoluteDate, Vector3D, + * double[][], double, ObservableSatellite)} */ + @Deprecated public Position(final AbsoluteDate date, final Vector3D position, final double[][] covarianceMatrix, final double baseWeight, final int propagatorIndex) { + this(date, position, covarianceMatrix, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Constructor with full covariance matrix and all inputs. + * <p>The fact that the covariance matrix is symmetric and positive definite is not checked.</p> + * <p>The measurement must be in the orbit propagation frame.</p> + * @param date date of the measurement + * @param position position + * @param covarianceMatrix 6x6 covariance matrix of the PV measurement + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public Position(final AbsoluteDate date, final Vector3D position, + final double[][] covarianceMatrix, final double baseWeight, + final ObservableSatellite satellite) { super(date, new double[] { position.getX(), position.getY(), position.getZ() }, extractSigmas(covarianceMatrix), new double[] { baseWeight, baseWeight, baseWeight - }, Arrays.asList(propagatorIndex)); + }, Arrays.asList(satellite)); this.covarianceMatrix = covarianceMatrix; } @@ -206,7 +273,9 @@ public class Position extends AbstractMeasurement<Position> { final SpacecraftState[] states) { // PV value - final TimeStampedPVCoordinates pv = states[getPropagatorsIndices().get(0)].getPVCoordinates(); + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; + final TimeStampedPVCoordinates pv = state.getPVCoordinates(); // prepare the evaluation final EstimatedMeasurement<Position> estimated = diff --git a/src/main/java/org/orekit/estimation/measurements/Range.java b/src/main/java/org/orekit/estimation/measurements/Range.java index 8be504c93e3f2313f1bb2e251c00f551fc76d49b..018bfa50da69548ccb43972689d111012e5435e2 100644 --- a/src/main/java/org/orekit/estimation/measurements/Range.java +++ b/src/main/java/org/orekit/estimation/measurements/Range.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,27 +33,43 @@ import org.orekit.utils.ParameterDriver; import org.orekit.utils.TimeStampedFieldPVCoordinates; import org.orekit.utils.TimeStampedPVCoordinates; -/** Class modeling a range measurement from a ground station or - * from a satellite. +/** Class modeling a range measurement from a ground station. * <p> - * For two-way measurements, the measurement is considered - * to be a signal emitted from a ground station, reflected - * on spacecraft, and received on the same ground station. - * Its value is the elapsed time between emission and reception - * divided by 2c were c is the speed of light. + * For one-way measurements, a signal is emitted by the satellite + * and received by the ground station. The measurement value is the + * elapsed time between emission and reception multiplied by c where + * c is the speed of light. * </p> * <p> - * For one-way measurements, a signal is emitted by the satellite - * and received by the ground station. The measurement value - * is the elapsed time between emission and reception divided by - * the speed of light. + * For two-way measurements, the measurement is considered to be a signal + * emitted from a ground station, reflected on spacecraft, and received + * on the same ground station. Its value is the elapsed time between + * emission and reception multiplied by c/2 where c is the speed of light. + * </p> + * <p> + * The motion of both the station and the spacecraft during the signal + * flight time are taken into account. The date of the measurement + * corresponds to the reception on ground of the emitted or reflected signal. * </p> * <p> - * The motion of both the station and the - * spacecraft during the signal flight time are taken into - * account. The date of the measurement corresponds to the - * reception on ground of the emitted or reflected signal. + * The clock offsets of both the ground station and the satellite are taken + * into account. These offsets correspond to the values that must be subtracted + * from station (resp. satellite) reading of time to compute the real physical + * date. These offsets have two effects: * </p> + * <ul> + * <li>as measurement date is evaluated at reception time, the real physical date + * of the measurement is the observed date to which the receiving ground station + * clock offset is subtracted</li> + * <li>as range is evaluated using the total signal time of flight, for one-way + * measurements the observed range is the real physical signal time of flight to + * which (Δtg - Δts) ⨉ c is added, where Δtg (resp. Δts) is the clock offset for the + * receiving ground station (resp. emitting satellite). A similar effect exists in + * two-way measurements but it is computed as (Δtg - Δtg) ⨉ c / 2 as the same ground + * station clock is used for initial emission and final reception and therefore it evaluates + * to zero.</li> + * </ul> + * <p> * @author Thierry Ceolin * @author Luc Maisonobe * @author Maxime Journot @@ -78,10 +94,13 @@ public class Range extends AbstractMeasurement<Range> { * @param range observed value * @param sigma theoretical standard deviation * @param baseWeight base weight + * @deprecated as of 9.3, replaced by {@link #Range(GroundStation, boolean, AbsoluteDate, + * double, double, double, ObservableSatellite)} */ + @Deprecated public Range(final GroundStation station, final AbsoluteDate date, final double range, final double sigma, final double baseWeight) { - this(station, true, date, range, sigma, baseWeight, 0); + this(station, true, date, range, sigma, baseWeight, new ObservableSatellite(0)); } /** Simple constructor. @@ -96,10 +115,13 @@ public class Range extends AbstractMeasurement<Range> { * @param sigma theoretical standard deviation * @param baseWeight base weight * @param twoWay flag indicating whether it is a two-way measurement + * @deprecated as of 9.3, replaced by {@link #Range(GroundStation, boolean, AbsoluteDate, + * double, double, double, ObservableSatellite)} */ + @Deprecated public Range(final GroundStation station, final AbsoluteDate date, final double range, final double sigma, final double baseWeight, final boolean twoWay) { - this(station, twoWay, date, range, sigma, baseWeight, 0); + this(station, twoWay, date, range, sigma, baseWeight, new ObservableSatellite(0)); } /** Simple constructor. @@ -109,12 +131,14 @@ public class Range extends AbstractMeasurement<Range> { * @param sigma theoretical standard deviation * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement - * @since 9.0 + * @deprecated as of 9.3, replaced by {@link #Range(GroundStation, boolean, AbsoluteDate, + * double, double, double, ObservableSatellite)} */ + @Deprecated public Range(final GroundStation station, final AbsoluteDate date, final double range, final double sigma, final double baseWeight, final int propagatorIndex) { - this(station, true, date, range, sigma, baseWeight, 0); + this(station, true, date, range, sigma, baseWeight, new ObservableSatellite(0)); } /** Simple constructor. @@ -126,20 +150,44 @@ public class Range extends AbstractMeasurement<Range> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.0 + * @deprecated as of 9.3, replaced by {@link #Range(GroundStation, boolean, AbsoluteDate, + * double, double, double, ObservableSatellite)} */ + @Deprecated public Range(final GroundStation station, final boolean twoWay, final AbsoluteDate date, final double range, final double sigma, final double baseWeight, final int propagatorIndex) { - super(date, range, sigma, baseWeight, Arrays.asList(propagatorIndex), - station.getEastOffsetDriver(), - station.getNorthOffsetDriver(), - station.getZenithOffsetDriver(), - station.getPrimeMeridianOffsetDriver(), - station.getPrimeMeridianDriftDriver(), - station.getPolarOffsetXDriver(), - station.getPolarDriftXDriver(), - station.getPolarOffsetYDriver(), - station.getPolarDriftYDriver()); + this(station, twoWay, date, range, sigma, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Simple constructor. + * @param station ground station from which measurement is performed + * @param twoWay flag indicating whether it is a two-way measurement + * @param date date of the measurement + * @param range observed value + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public Range(final GroundStation station, final boolean twoWay, final AbsoluteDate date, + final double range, final double sigma, final double baseWeight, + final ObservableSatellite satellite) { + super(date, range, sigma, baseWeight, Arrays.asList(satellite)); + addParameterDriver(station.getClockOffsetDriver()); + addParameterDriver(station.getEastOffsetDriver()); + addParameterDriver(station.getNorthOffsetDriver()); + addParameterDriver(station.getZenithOffsetDriver()); + addParameterDriver(station.getPrimeMeridianOffsetDriver()); + addParameterDriver(station.getPrimeMeridianDriftDriver()); + addParameterDriver(station.getPolarOffsetXDriver()); + addParameterDriver(station.getPolarDriftXDriver()); + addParameterDriver(station.getPolarOffsetYDriver()); + addParameterDriver(station.getPolarDriftYDriver()); + if (!twoWay) { + // for one way measurements, the satellite clock offset affects the measurement + addParameterDriver(satellite.getClockOffsetDriver()); + } this.station = station; this.twoway = twoWay; } @@ -164,7 +212,8 @@ public class Range extends AbstractMeasurement<Range> { final int evaluation, final SpacecraftState[] states) { - final SpacecraftState state = states[getPropagatorsIndices().get(0)]; + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // Range derivatives are computed with respect to spacecraft state in inertial frame // and station parameters @@ -173,7 +222,7 @@ public class Range extends AbstractMeasurement<Range> { // Parameters: // - 0..2 - Position of the spacecraft in inertial frame // - 3..5 - Velocity of the spacecraft in inertial frame - // - 6..n - station parameters (station offsets, pole, prime meridian...) + // - 6..n - measurements parameters (clock offset, station offsets, pole, prime meridian, sat clock offset...) int nbParams = 6; final Map<String, Integer> indices = new HashMap<>(); for (ParameterDriver driver : getParametersDrivers()) { @@ -190,11 +239,9 @@ public class Range extends AbstractMeasurement<Range> { // transform between station and inertial frame, expressed as a derivative structure // The components of station's position in offset frame are the 3 last derivative parameters - final AbsoluteDate downlinkDate = getDate(); - final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = - new FieldAbsoluteDate<>(field, downlinkDate); final FieldTransform<DerivativeStructure> offsetToInertialDownlink = - station.getOffsetToInertial(state.getFrame(), downlinkDateDS, factory, indices); + station.getOffsetToInertial(state.getFrame(), getDate(), factory, indices); + final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = offsetToInertialDownlink.getFieldDate(); // Station position in inertial frame at end of the downlink leg final TimeStampedFieldPVCoordinates<DerivativeStructure> stationDownlink = @@ -209,7 +256,7 @@ public class Range extends AbstractMeasurement<Range> { final DerivativeStructure tauD = signalTimeOfFlight(pvaDS, stationDownlink.getPosition(), downlinkDateDS); // Transit state & Transit state (re)computed with derivative structures - final double delta = downlinkDate.durationFrom(state.getDate()); + final DerivativeStructure delta = downlinkDateDS.durationFrom(state.getDate()); final DerivativeStructure deltaMTauD = tauD.negate().add(delta); final SpacecraftState transitState = state.shiftedBy(deltaMTauD.getValue()); final TimeStampedFieldPVCoordinates<DerivativeStructure> transitStateDS = pvaDS.shiftedBy(deltaMTauD); @@ -254,8 +301,13 @@ public class Range extends AbstractMeasurement<Range> { stationDownlink.toTimeStampedPVCoordinates() }); + // Clock offsets + final DerivativeStructure dtg = station.getClockOffsetDriver().getValue(factory, indices); + final DerivativeStructure dts = satellite.getClockOffsetDriver().getValue(factory, indices); + // Range value - range = tauD.multiply(Constants.SPEED_OF_LIGHT); + range = tauD.add(dtg).subtract(dts).multiply(Constants.SPEED_OF_LIGHT); + } estimated.setEstimatedValue(range.getValue()); diff --git a/src/main/java/org/orekit/estimation/measurements/RangeRate.java b/src/main/java/org/orekit/estimation/measurements/RangeRate.java index 16aedcc182403cb91015e4b277cb9ae4831a840b..2db7441f596bdce988b3428cac1b485ceeb17a85 100644 --- a/src/main/java/org/orekit/estimation/measurements/RangeRate.java +++ b/src/main/java/org/orekit/estimation/measurements/RangeRate.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -66,13 +66,16 @@ public class RangeRate extends AbstractMeasurement<RangeRate> { * @param sigma theoretical standard deviation * @param baseWeight base weight * @param twoway if true, this is a two-way measurement + * @deprecated since 9.3 replaced by {@link #RangeRate(GroundStation, AbsoluteDate, + * double, double, double, boolean, ObservableSatellite)} */ + @Deprecated public RangeRate(final GroundStation station, final AbsoluteDate date, final double rangeRate, final double sigma, final double baseWeight, final boolean twoway) { - this(station, date, rangeRate, sigma, baseWeight, twoway, 0); + this(station, date, rangeRate, sigma, baseWeight, twoway, new ObservableSatellite(0)); } /** Simple constructor. @@ -84,23 +87,43 @@ public class RangeRate extends AbstractMeasurement<RangeRate> { * @param twoway if true, this is a two-way measurement * @param propagatorIndex index of the propagator related to this measurement * @since 9.0 + * @deprecated since 9.3 replaced by {@link #RangeRate(GroundStation, AbsoluteDate, + * double, double, double, boolean, ObservableSatellite)} */ + @Deprecated public RangeRate(final GroundStation station, final AbsoluteDate date, final double rangeRate, final double sigma, final double baseWeight, final boolean twoway, final int propagatorIndex) { - super(date, rangeRate, sigma, baseWeight, Arrays.asList(propagatorIndex), - station.getEastOffsetDriver(), - station.getNorthOffsetDriver(), - station.getZenithOffsetDriver(), - station.getPrimeMeridianOffsetDriver(), - station.getPrimeMeridianDriftDriver(), - station.getPolarOffsetXDriver(), - station.getPolarDriftXDriver(), - station.getPolarOffsetYDriver(), - station.getPolarDriftYDriver()); + this(station, date, rangeRate, sigma, baseWeight, twoway, new ObservableSatellite(propagatorIndex)); + } + + /** Simple constructor. + * @param station ground station from which measurement is performed + * @param date date of the measurement + * @param rangeRate observed value, m/s + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param twoway if true, this is a two-way measurement + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public RangeRate(final GroundStation station, final AbsoluteDate date, + final double rangeRate, final double sigma, final double baseWeight, + final boolean twoway, final ObservableSatellite satellite) { + super(date, rangeRate, sigma, baseWeight, Arrays.asList(satellite)); + addParameterDriver(station.getClockOffsetDriver()); + addParameterDriver(station.getEastOffsetDriver()); + addParameterDriver(station.getNorthOffsetDriver()); + addParameterDriver(station.getZenithOffsetDriver()); + addParameterDriver(station.getPrimeMeridianOffsetDriver()); + addParameterDriver(station.getPrimeMeridianDriftDriver()); + addParameterDriver(station.getPolarOffsetXDriver()); + addParameterDriver(station.getPolarDriftXDriver()); + addParameterDriver(station.getPolarOffsetYDriver()); + addParameterDriver(station.getPolarDriftYDriver()); this.station = station; this.twoway = twoway; } @@ -124,7 +147,8 @@ public class RangeRate extends AbstractMeasurement<RangeRate> { protected EstimatedMeasurement<RangeRate> theoreticalEvaluation(final int iteration, final int evaluation, final SpacecraftState[] states) { - final SpacecraftState state = states[getPropagatorsIndices().get(0)]; + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // Range-rate derivatives are computed with respect to spacecraft state in inertial frame // and station position in station's offset frame @@ -133,7 +157,7 @@ public class RangeRate extends AbstractMeasurement<RangeRate> { // Parameters: // - 0..2 - Position of the spacecraft in inertial frame // - 3..5 - Velocity of the spacecraft in inertial frame - // - 6..n - station parameters (station offsets, pole, prime meridian...) + // - 6..n - station parameters (clock offset, station offsets, pole, prime meridian...) int nbParams = 6; final Map<String, Integer> indices = new HashMap<>(); for (ParameterDriver driver : getParametersDrivers()) { @@ -150,11 +174,10 @@ public class RangeRate extends AbstractMeasurement<RangeRate> { // transform between station and inertial frame, expressed as a derivative structure // The components of station's position in offset frame are the 3 last derivative parameters - final AbsoluteDate downlinkDate = getDate(); - final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = - new FieldAbsoluteDate<>(field, downlinkDate); final FieldTransform<DerivativeStructure> offsetToInertialDownlink = - station.getOffsetToInertial(state.getFrame(), downlinkDateDS, factory, indices); + station.getOffsetToInertial(state.getFrame(), getDate(), factory, indices); + final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = + offsetToInertialDownlink.getFieldDate(); // Station position in inertial frame at end of the downlink leg final TimeStampedFieldPVCoordinates<DerivativeStructure> stationDownlink = @@ -169,7 +192,7 @@ public class RangeRate extends AbstractMeasurement<RangeRate> { final DerivativeStructure tauD = signalTimeOfFlight(pvaDS, stationDownlink.getPosition(), downlinkDateDS); // Transit state - final double delta = downlinkDate.durationFrom(state.getDate()); + final DerivativeStructure delta = downlinkDateDS.durationFrom(state.getDate()); final DerivativeStructure deltaMTauD = tauD.negate().add(delta); final SpacecraftState transitState = state.shiftedBy(deltaMTauD.getValue()); @@ -183,10 +206,11 @@ public class RangeRate extends AbstractMeasurement<RangeRate> { final EstimatedMeasurement<RangeRate> estimated; if (twoway) { // one-way (uplink) light time correction - final AbsoluteDate approxUplinkDate = downlinkDate.shiftedBy(-2 * tauD.getValue()); - final FieldAbsoluteDate<DerivativeStructure> approxUplinkDateDS = new FieldAbsoluteDate<>(field, approxUplinkDate); final FieldTransform<DerivativeStructure> offsetToInertialApproxUplink = - station.getOffsetToInertial(state.getFrame(), approxUplinkDateDS, factory, indices); + station.getOffsetToInertial(state.getFrame(), + downlinkDateDS.shiftedBy(tauD.multiply(-2)), factory, indices); + final FieldAbsoluteDate<DerivativeStructure> approxUplinkDateDS = + offsetToInertialApproxUplink.getFieldDate(); final TimeStampedFieldPVCoordinates<DerivativeStructure> stationApproxUplink = offsetToInertialApproxUplink.transformPVCoordinates(new TimeStampedFieldPVCoordinates<>(approxUplinkDateDS, diff --git a/src/main/java/org/orekit/estimation/measurements/TurnAroundRange.java b/src/main/java/org/orekit/estimation/measurements/TurnAroundRange.java index 6054f5360e4111c0f06620a6f7a3215dea18afd6..2fb41b9b2a6c1e04d5be1d513b97a208361fb8c5 100644 --- a/src/main/java/org/orekit/estimation/measurements/TurnAroundRange.java +++ b/src/main/java/org/orekit/estimation/measurements/TurnAroundRange.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -76,11 +76,14 @@ public class TurnAroundRange extends AbstractMeasurement<TurnAroundRange> { * @param turnAroundRange observed value * @param sigma theoretical standard deviation * @param baseWeight base weight + * @deprecated as of 9.3, replaced by {@link #TurnAroundRange(GroundStation, GroundStation, AbsoluteDate, + * double, double, double, ObservableSatellite)} */ + @Deprecated public TurnAroundRange(final GroundStation masterStation, final GroundStation slaveStation, final AbsoluteDate date, final double turnAroundRange, final double sigma, final double baseWeight) { - this(masterStation, slaveStation, date, turnAroundRange, sigma, baseWeight, 0); + this(masterStation, slaveStation, date, turnAroundRange, sigma, baseWeight, new ObservableSatellite(0)); } /** Simple constructor. @@ -92,30 +95,52 @@ public class TurnAroundRange extends AbstractMeasurement<TurnAroundRange> { * @param baseWeight base weight * @param propagatorIndex index of the propagator related to this measurement * @since 9.0 + * @deprecated as of 9.3, replaced by {@link #TurnAroundRange(GroundStation, GroundStation, AbsoluteDate, + * double, double, double, ObservableSatellite)} */ + @Deprecated public TurnAroundRange(final GroundStation masterStation, final GroundStation slaveStation, final AbsoluteDate date, final double turnAroundRange, final double sigma, final double baseWeight, final int propagatorIndex) { - super(date, turnAroundRange, sigma, baseWeight, Arrays.asList(propagatorIndex), - masterStation.getEastOffsetDriver(), - masterStation.getNorthOffsetDriver(), - masterStation.getZenithOffsetDriver(), - masterStation.getPrimeMeridianOffsetDriver(), - masterStation.getPrimeMeridianDriftDriver(), - masterStation.getPolarOffsetXDriver(), - masterStation.getPolarDriftXDriver(), - masterStation.getPolarOffsetYDriver(), - masterStation.getPolarDriftYDriver(), - slaveStation.getEastOffsetDriver(), - slaveStation.getNorthOffsetDriver(), - slaveStation.getZenithOffsetDriver(), - slaveStation.getPrimeMeridianOffsetDriver(), - slaveStation.getPrimeMeridianDriftDriver(), - slaveStation.getPolarOffsetXDriver(), - slaveStation.getPolarDriftXDriver(), - slaveStation.getPolarOffsetYDriver(), - slaveStation.getPolarDriftYDriver()); + this(masterStation, slaveStation, date, turnAroundRange, sigma, baseWeight, new ObservableSatellite(propagatorIndex)); + } + + /** Simple constructor. + * @param masterStation ground station from which measurement is performed + * @param slaveStation ground station reflecting the signal + * @param date date of the measurement + * @param turnAroundRange observed value + * @param sigma theoretical standard deviation + * @param baseWeight base weight + * @param satellite satellite related to this measurement + * @since 9.3 + */ + public TurnAroundRange(final GroundStation masterStation, final GroundStation slaveStation, + final AbsoluteDate date, final double turnAroundRange, + final double sigma, final double baseWeight, + final ObservableSatellite satellite) { + super(date, turnAroundRange, sigma, baseWeight, Arrays.asList(satellite)); + addParameterDriver(masterStation.getClockOffsetDriver()); + addParameterDriver(masterStation.getEastOffsetDriver()); + addParameterDriver(masterStation.getNorthOffsetDriver()); + addParameterDriver(masterStation.getZenithOffsetDriver()); + addParameterDriver(masterStation.getPrimeMeridianOffsetDriver()); + addParameterDriver(masterStation.getPrimeMeridianDriftDriver()); + addParameterDriver(masterStation.getPolarOffsetXDriver()); + addParameterDriver(masterStation.getPolarDriftXDriver()); + addParameterDriver(masterStation.getPolarOffsetYDriver()); + addParameterDriver(masterStation.getPolarDriftYDriver()); + // the slave station clock is not used at all, we ignore the corresponding parameter driver + addParameterDriver(slaveStation.getEastOffsetDriver()); + addParameterDriver(slaveStation.getNorthOffsetDriver()); + addParameterDriver(slaveStation.getZenithOffsetDriver()); + addParameterDriver(slaveStation.getPrimeMeridianOffsetDriver()); + addParameterDriver(slaveStation.getPrimeMeridianDriftDriver()); + addParameterDriver(slaveStation.getPolarOffsetXDriver()); + addParameterDriver(slaveStation.getPolarDriftXDriver()); + addParameterDriver(slaveStation.getPolarOffsetYDriver()); + addParameterDriver(slaveStation.getPolarDriftYDriver()); this.masterStation = masterStation; this.slaveStation = slaveStation; } @@ -139,7 +164,8 @@ public class TurnAroundRange extends AbstractMeasurement<TurnAroundRange> { protected EstimatedMeasurement<TurnAroundRange> theoreticalEvaluation(final int iteration, final int evaluation, final SpacecraftState[] states) { - final SpacecraftState state = states[getPropagatorsIndices().get(0)]; + final ObservableSatellite satellite = getSatellites().get(0); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // Turn around range derivatives are computed with respect to: // - Spacecraft state in inertial frame @@ -149,7 +175,7 @@ public class TurnAroundRange extends AbstractMeasurement<TurnAroundRange> { // // - 0..2 - Position of the spacecraft in inertial frame // - 3..5 - Velocity of the spacecraft in inertial frame - // - 6..n - stations' parameters (stations' offsets, pole, prime meridian...) + // - 6..n - stations' parameters (clock offset, station offsets, pole, prime meridian...) int nbParams = 6; final Map<String, Integer> indices = new HashMap<>(); for (ParameterDriver driver : getParametersDrivers()) { @@ -188,18 +214,18 @@ public class TurnAroundRange extends AbstractMeasurement<TurnAroundRange> { // Time difference between t (date of the measurement) and t' (date tagged in spacecraft state) // (if state has already been set up to pre-compensate propagation delay, // we will have delta = masterTauD + slaveTauU) - final AbsoluteDate measurementDate = getDate(); - final FieldAbsoluteDate<DerivativeStructure> measurementDateDS = new FieldAbsoluteDate<>(field, measurementDate); - final double delta = measurementDate.durationFrom(state.getDate()); + final double delta = getDate().durationFrom(state.getDate()); // transform between master station topocentric frame (east-north-zenith) and inertial frame expressed as DerivativeStructures final FieldTransform<DerivativeStructure> masterToInert = - masterStation.getOffsetToInertial(state.getFrame(), measurementDateDS, factory, indices); + masterStation.getOffsetToInertial(state.getFrame(), getDate(), factory, indices); + final FieldAbsoluteDate<DerivativeStructure> measurementDateDS = + masterToInert.getFieldDate(); // Master station PV in inertial frame at measurement date final TimeStampedFieldPVCoordinates<DerivativeStructure> masterArrival = - masterToInert.transformPVCoordinates(new TimeStampedPVCoordinates(measurementDate, - PVCoordinates.ZERO)); + masterToInert.transformPVCoordinates(new TimeStampedFieldPVCoordinates<>(measurementDateDS, + zero, zero, zero)); // Compute propagation times final DerivativeStructure masterTauD = signalTimeOfFlight(pvaDS, masterArrival.getPosition(), measurementDateDS); diff --git a/src/main/java/org/orekit/estimation/measurements/generation/AbstractMeasurementBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/AbstractMeasurementBuilder.java index cee713d351d00508fa9fe33b96f53c1a83d19976..e7f08fb46c56adf2581eb0c10a73c5710707915a 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/AbstractMeasurementBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/AbstractMeasurementBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +23,7 @@ import java.util.List; import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.EstimatedMeasurement; import org.orekit.estimation.measurements.EstimationModifier; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.time.AbsoluteDate; @@ -46,8 +47,8 @@ public abstract class AbstractMeasurementBuilder<T extends ObservedMeasurement<T /** Base weight. */ private final double[] baseWeight; - /** Indices of the propagators related to this measurement. */ - private final int[] propagatorsIndices; + /** Satellites related to this measurement. */ + private final ObservableSatellite[] satellites; /** Start of the measurements time span. */ private AbsoluteDate spanStart; @@ -59,33 +60,33 @@ public abstract class AbstractMeasurementBuilder<T extends ObservedMeasurement<T * @param noiseSource noise source, may be null for generating perfect measurements * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorsIndices indices of the propagators related to this measurement + * @param satellites satellites related to this builder */ protected AbstractMeasurementBuilder(final CorrelatedRandomVectorGenerator noiseSource, final double sigma, final double baseWeight, - final int... propagatorsIndices) { + final ObservableSatellite... satellites) { this(noiseSource, new double[] { sigma }, new double[] { baseWeight - }, propagatorsIndices); + }, satellites); } /** Simple constructor. * @param noiseSource noise source, may be null for generating perfect measurements * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorsIndices indices of the propagators related to this measurement + * @param satellites satellites related to this builder */ protected AbstractMeasurementBuilder(final CorrelatedRandomVectorGenerator noiseSource, final double[] sigma, final double[] baseWeight, - final int... propagatorsIndices) { - this.noiseSource = noiseSource; - this.modifiers = new ArrayList<>(); - this.sigma = sigma.clone(); - this.baseWeight = baseWeight.clone(); - this.propagatorsIndices = propagatorsIndices.clone(); + final ObservableSatellite... satellites) { + this.noiseSource = noiseSource; + this.modifiers = new ArrayList<>(); + this.sigma = sigma.clone(); + this.baseWeight = baseWeight.clone(); + this.satellites = satellites.clone(); } /** {@inheritDoc} @@ -164,19 +165,11 @@ public abstract class AbstractMeasurementBuilder<T extends ObservedMeasurement<T return baseWeight.clone(); } - /** Get the indices of the {@link org.orekit.propagation.Propagator propagators} - * related to this measurement. - * <p> - * The propagators are indexed starting from 0 and ordered according to - * the order of the {@link org.orekit.propagation.conversion.PropagatorBuilder - * propagators builders} in the orbit determination engine used. - * </p> - * @return indices of the {@link org.orekit.propagation.Propagator propagators} - * related to this measurement - * @since 9.0 + /** Get the satellites related to this measurement. + * @return satellites related to this measurement */ - protected int[] getPropagatorsIndices() { - return propagatorsIndices.clone(); + protected ObservableSatellite[] getSatellites() { + return satellites.clone(); } } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/AbstractScheduler.java b/src/main/java/org/orekit/estimation/measurements/generation/AbstractScheduler.java index 3e246a8df6ba5fb85102392e52e084183756a5d2..d4a3395bec2f87fd1f24655efa830bab183c22fb 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/AbstractScheduler.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/AbstractScheduler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/generation/AngularAzElBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/AngularAzElBuilder.java index 87648bb5b97fe47276ca479008947fea1b18cc56..7d37f45875438d67ed1ae5a04c796b437ae548e2 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/AngularAzElBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/AngularAzElBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +20,7 @@ import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.AngularAzEl; import org.orekit.estimation.measurements.EstimationModifier; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; import org.orekit.utils.ParameterDriver; @@ -39,13 +40,13 @@ public class AngularAzElBuilder extends AbstractMeasurementBuilder<AngularAzEl> * @param station ground station from which measurement is performed * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorIndex index of the propagator related to this measurement + * @param satellite satellite related to this builder */ public AngularAzElBuilder(final CorrelatedRandomVectorGenerator noiseSource, final GroundStation station, final double[] sigma, final double[] baseWeight, - final int propagatorIndex) { - super(noiseSource, sigma, baseWeight, propagatorIndex); + final ObservableSatellite satellite) { + super(noiseSource, sigma, baseWeight, satellite); this.station = station; } @@ -53,16 +54,16 @@ public class AngularAzElBuilder extends AbstractMeasurementBuilder<AngularAzEl> @Override public AngularAzEl build(final SpacecraftState[] states) { - final int propagatorIndex = getPropagatorsIndices()[0]; - final double[] sigma = getTheoreticalStandardDeviation(); - final double[] baseWeight = getBaseWeight(); - final SpacecraftState state = states[propagatorIndex]; + final ObservableSatellite satellite = getSatellites()[0]; + final double[] sigma = getTheoreticalStandardDeviation(); + final double[] baseWeight = getBaseWeight(); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // create a dummy measurement final AngularAzEl dummy = new AngularAzEl(station, state.getDate(), new double[] { 0.0, 0.0 - }, sigma, baseWeight, propagatorIndex); + }, sigma, baseWeight, satellite); for (final EstimationModifier<AngularAzEl> modifier : getModifiers()) { dummy.addModifier(modifier); } @@ -88,7 +89,7 @@ public class AngularAzElBuilder extends AbstractMeasurementBuilder<AngularAzEl> // generate measurement final AngularAzEl measurement = new AngularAzEl(station, state.getDate(), angular, - sigma, baseWeight, propagatorIndex); + sigma, baseWeight, satellite); for (final EstimationModifier<AngularAzEl> modifier : getModifiers()) { measurement.addModifier(modifier); } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilder.java index a3bce5678ac5032ebae1a117a7708414dad34fe3..2557dccfbc8255f4329f90204754c46bcb4a8820 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +20,7 @@ import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.AngularRaDec; import org.orekit.estimation.measurements.EstimationModifier; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.frames.Frame; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; @@ -44,13 +45,13 @@ public class AngularRaDecBuilder extends AbstractMeasurementBuilder<AngularRaDec * @param referenceFrame Reference frame in which the right ascension - declination angles are given * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorIndex index of the propagator related to this measurement + * @param satellite satellite related to this builder */ public AngularRaDecBuilder(final CorrelatedRandomVectorGenerator noiseSource, final GroundStation station, final Frame referenceFrame, final double[] sigma, final double[] baseWeight, - final int propagatorIndex) { - super(noiseSource, sigma, baseWeight, propagatorIndex); + final ObservableSatellite satellite) { + super(noiseSource, sigma, baseWeight, satellite); this.station = station; this.referenceFrame = referenceFrame; } @@ -59,16 +60,16 @@ public class AngularRaDecBuilder extends AbstractMeasurementBuilder<AngularRaDec @Override public AngularRaDec build(final SpacecraftState[] states) { - final int propagatorIndex = getPropagatorsIndices()[0]; - final double[] sigma = getTheoreticalStandardDeviation(); - final double[] baseWeight = getBaseWeight(); - final SpacecraftState state = states[propagatorIndex]; + final ObservableSatellite satellite = getSatellites()[0]; + final double[] sigma = getTheoreticalStandardDeviation(); + final double[] baseWeight = getBaseWeight(); + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // create a dummy measurement final AngularRaDec dummy = new AngularRaDec(station, referenceFrame, state.getDate(), new double[] { 0.0, 0.0 - }, sigma, baseWeight, propagatorIndex); + }, sigma, baseWeight, satellite); for (final EstimationModifier<AngularRaDec> modifier : getModifiers()) { dummy.addModifier(modifier); } @@ -94,7 +95,7 @@ public class AngularRaDecBuilder extends AbstractMeasurementBuilder<AngularRaDec // generate measurement final AngularRaDec measurement = new AngularRaDec(station, referenceFrame, state.getDate(), - angular, sigma, baseWeight, propagatorIndex); + angular, sigma, baseWeight, satellite); for (final EstimationModifier<AngularRaDec> modifier : getModifiers()) { measurement.addModifier(modifier); } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/ContinuousScheduler.java b/src/main/java/org/orekit/estimation/measurements/generation/ContinuousScheduler.java index e29209e33cf8bc8dbec413a79f473cc7bb7848a0..4722a9c8a8d5f5f3fa5bf3ec2375b67b86fb5d32 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/ContinuousScheduler.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/ContinuousScheduler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/generation/EventBasedScheduler.java b/src/main/java/org/orekit/estimation/measurements/generation/EventBasedScheduler.java index 82eb3c1464e6982d55545805c731b0b3be070ab5..5c8548fd8255bd16ee4ce586309cd112dd997342 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/EventBasedScheduler.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/EventBasedScheduler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/generation/Generator.java b/src/main/java/org/orekit/estimation/measurements/generation/Generator.java index 236e5a091e8620c9cc0333db8d4ac0deb2483780..3071dcadf3b3a86e3b7d3cff396e6f2c7ce11fc6 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/Generator.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/Generator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +21,7 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.propagation.Propagator; import org.orekit.propagation.PropagatorsParallelizer; @@ -51,19 +52,19 @@ public class Generator { /** Add a propagator. * @param propagator to add - * @return index of the propagator + * @return satellite satellite propagated by the propagator */ - public int addPropagator(final Propagator propagator) { + public ObservableSatellite addPropagator(final Propagator propagator) { propagators.add(propagator); - return propagators.size() - 1; + return new ObservableSatellite(propagators.size() - 1); } /** Get a registered propagator. - * @param index index of the propagator, as returned by {@link #addPropagator(Propagator)} - * @return propagator at index + * @param satellite satellite propagated by the propagator {@link #addPropagator(Propagator)} + * @return propagator corresponding to satellite */ - public Propagator getPropagator(final int index) { - return propagators.get(index); + public Propagator getPropagator(final ObservableSatellite satellite) { + return propagators.get(satellite.getPropagatorIndex()); } /** Add a sequences generator for a specific measurement type. diff --git a/src/main/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilder.java index 1dd6ed6fb51a95ec42bd1e7c1f4a4ed75219a345..11f05116921799a94c823d1ca369edf2ab236eff 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.measurements.generation; import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.EstimationModifier; import org.orekit.estimation.measurements.InterSatellitesRange; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; import org.orekit.utils.ParameterDriver; @@ -35,20 +36,17 @@ public class InterSatellitesRangeBuilder extends AbstractMeasurementBuilder<Inte /** Simple constructor. * @param noiseSource noise source, may be null for generating perfect measurements - * @param satellite1Index index of satellite 1 propagator - * (i.e. the satellite which receives the signal and performs - * the measurement) - * @param satellite2Index index of satellite 2 propagator - * (i.e. the satellite which simply emits the signal in the one-way - * case, or reflects the signal in the two-way case) + * @param local satellite which receives the signal and performs the measurement + * @param remote satellite which simply emits the signal in the one-way case, + * or reflects the signal in the two-way case * @param twoWay flag indicating whether it is a two-way measurement * @param sigma theoretical standard deviation * @param baseWeight base weight */ public InterSatellitesRangeBuilder(final CorrelatedRandomVectorGenerator noiseSource, - final int satellite1Index, final int satellite2Index, + final ObservableSatellite local, final ObservableSatellite remote, final boolean twoWay, final double sigma, final double baseWeight) { - super(noiseSource, sigma, baseWeight, satellite1Index, satellite2Index); + super(noiseSource, sigma, baseWeight, local, remote); this.twoway = twoWay; } @@ -56,13 +54,13 @@ public class InterSatellitesRangeBuilder extends AbstractMeasurementBuilder<Inte @Override public InterSatellitesRange build(final SpacecraftState[] states) { - final int[] indices = getPropagatorsIndices(); - final double sigma = getTheoreticalStandardDeviation()[0]; - final double baseWeight = getBaseWeight()[0]; - final SpacecraftState state = states[indices[0]]; + final ObservableSatellite[] satellites = getSatellites(); + final double sigma = getTheoreticalStandardDeviation()[0]; + final double baseWeight = getBaseWeight()[0]; + final SpacecraftState state = states[satellites[0].getPropagatorIndex()]; // create a dummy measurement - final InterSatellitesRange dummy = new InterSatellitesRange(indices[0], indices[1], twoway, state.getDate(), + final InterSatellitesRange dummy = new InterSatellitesRange(satellites[0], satellites[1], twoway, state.getDate(), Double.NaN, sigma, baseWeight); for (final EstimationModifier<InterSatellitesRange> modifier : getModifiers()) { dummy.addModifier(modifier); @@ -87,7 +85,7 @@ public class InterSatellitesRangeBuilder extends AbstractMeasurementBuilder<Inte } // generate measurement - final InterSatellitesRange measurement = new InterSatellitesRange(indices[0], indices[1], twoway, state.getDate(), + final InterSatellitesRange measurement = new InterSatellitesRange(satellites[0], satellites[1], twoway, state.getDate(), range, sigma, baseWeight); for (final EstimationModifier<InterSatellitesRange> modifier : getModifiers()) { measurement.addModifier(modifier); diff --git a/src/main/java/org/orekit/estimation/measurements/generation/MeasurementBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/MeasurementBuilder.java index 9227691d4ec35780f2115fa435c871fd3161cf82..c4c619f884ebca5fac5b479e36cc228302c4b02a 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/MeasurementBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/MeasurementBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/generation/PVBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/PVBuilder.java index 7bfbbd451c4aa38984aef77d32572a4984c5f6c0..2a56a109b28d50a01ad03db24940ee20524c36f8 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/PVBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/PVBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.measurements.generation; import org.hipparchus.geometry.euclidean.threed.Vector3D; import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.EstimationModifier; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.PV; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; @@ -36,31 +37,31 @@ public class PVBuilder extends AbstractMeasurementBuilder<PV> { * @param sigmaPosition theoretical standard deviation on position components * @param sigmaVelocity theoretical standard deviation on velocity components * @param baseWeight base weight - * @param propagatorIndex index of the propagator related to this measurement + * @param satellite satellite related to this builder */ public PVBuilder(final CorrelatedRandomVectorGenerator noiseSource, final double sigmaPosition, final double sigmaVelocity, - final double baseWeight, final int propagatorIndex) { + final double baseWeight, final ObservableSatellite satellite) { super(noiseSource, new double[] { sigmaPosition, sigmaVelocity }, new double[] { baseWeight - }, propagatorIndex); + }, satellite); } /** {@inheritDoc} */ @Override public PV build(final SpacecraftState[] states) { - final int propagatorIndex = getPropagatorsIndices()[0]; - final double[] sigma = getTheoreticalStandardDeviation(); - final double baseWeight = getBaseWeight()[0]; - final SpacecraftState state = states[propagatorIndex]; + final ObservableSatellite satellite = getSatellites()[0]; + final double[] sigma = getTheoreticalStandardDeviation(); + final double baseWeight = getBaseWeight()[0]; + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // create a dummy measurement final PV dummy = new PV(state.getDate(), Vector3D.NaN, Vector3D.NaN, - sigma[0], sigma[1], baseWeight, propagatorIndex); + sigma[0], sigma[1], baseWeight, satellite); for (final EstimationModifier<PV> modifier : getModifiers()) { dummy.addModifier(modifier); } @@ -91,7 +92,7 @@ public class PVBuilder extends AbstractMeasurementBuilder<PV> { // generate measurement final PV measurement = new PV(state.getDate(), new Vector3D(pv[0], pv[1], pv[2]), new Vector3D(pv[3], pv[4], pv[5]), - sigma[0], sigma[1], baseWeight, propagatorIndex); + sigma[0], sigma[1], baseWeight, satellite); for (final EstimationModifier<PV> modifier : getModifiers()) { measurement.addModifier(modifier); } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/PositionBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/PositionBuilder.java index 29ef255d4a40c32ed507e21b7a57a922eb7a51b5..f4b4434684532640159c377f298bf010d08ca006 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/PositionBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/PositionBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.measurements.generation; import org.hipparchus.geometry.euclidean.threed.Vector3D; import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.EstimationModifier; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.Position; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; @@ -35,25 +36,25 @@ public class PositionBuilder extends AbstractMeasurementBuilder<Position> { * @param noiseSource noise source, may be null for generating perfect measurements * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorIndex index of the propagator related to this measurement + * @param satellite satellite related to this builder */ public PositionBuilder(final CorrelatedRandomVectorGenerator noiseSource, final double sigma, final double baseWeight, - final int propagatorIndex) { - super(noiseSource, sigma, baseWeight, propagatorIndex); + final ObservableSatellite satellite) { + super(noiseSource, sigma, baseWeight, satellite); } /** {@inheritDoc} */ @Override public Position build(final SpacecraftState[] states) { - final int propagatorIndex = getPropagatorsIndices()[0]; - final double sigma = getTheoreticalStandardDeviation()[0]; - final double baseWeight = getBaseWeight()[0]; - final SpacecraftState state = states[propagatorIndex]; + final ObservableSatellite satellite = getSatellites()[0]; + final double sigma = getTheoreticalStandardDeviation()[0]; + final double baseWeight = getBaseWeight()[0]; + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // create a dummy measurement - final Position dummy = new Position(state.getDate(), Vector3D.NaN, sigma, baseWeight, propagatorIndex); + final Position dummy = new Position(state.getDate(), Vector3D.NaN, sigma, baseWeight, satellite); for (final EstimationModifier<Position> modifier : getModifiers()) { dummy.addModifier(modifier); } @@ -80,7 +81,7 @@ public class PositionBuilder extends AbstractMeasurementBuilder<Position> { // generate measurement final Position measurement = new Position(state.getDate(), new Vector3D(position), - sigma, baseWeight, propagatorIndex); + sigma, baseWeight, satellite); for (final EstimationModifier<Position> modifier : getModifiers()) { measurement.addModifier(modifier); } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/RangeBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/RangeBuilder.java index f36097e51cea90516cfebe1077af6c7a8849cfe7..f3c5d205f84dbab0b8cc19cbd2fa37f98ffb5920 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/RangeBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/RangeBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.measurements.generation; import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.EstimationModifier; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.Range; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; @@ -43,13 +44,13 @@ public class RangeBuilder extends AbstractMeasurementBuilder<Range> { * @param twoWay flag indicating whether it is a two-way measurement * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorIndex index of the propagator related to this measurement + * @param satellite satellite related to this builder */ public RangeBuilder(final CorrelatedRandomVectorGenerator noiseSource, final GroundStation station, final boolean twoWay, final double sigma, final double baseWeight, - final int propagatorIndex) { - super(noiseSource, sigma, baseWeight, propagatorIndex); + final ObservableSatellite satellite) { + super(noiseSource, sigma, baseWeight, satellite); this.station = station; this.twoway = twoWay; } @@ -58,13 +59,13 @@ public class RangeBuilder extends AbstractMeasurementBuilder<Range> { @Override public Range build(final SpacecraftState[] states) { - final int propagatorIndex = getPropagatorsIndices()[0]; - final double sigma = getTheoreticalStandardDeviation()[0]; - final double baseWeight = getBaseWeight()[0]; - final SpacecraftState state = states[propagatorIndex]; + final ObservableSatellite satellite = getSatellites()[0]; + final double sigma = getTheoreticalStandardDeviation()[0]; + final double baseWeight = getBaseWeight()[0]; + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // create a dummy measurement - final Range dummy = new Range(station, twoway, state.getDate(), Double.NaN, sigma, baseWeight, propagatorIndex); + final Range dummy = new Range(station, twoway, state.getDate(), Double.NaN, sigma, baseWeight, satellite); for (final EstimationModifier<Range> modifier : getModifiers()) { dummy.addModifier(modifier); } @@ -88,7 +89,7 @@ public class RangeBuilder extends AbstractMeasurementBuilder<Range> { } // generate measurement - final Range measurement = new Range(station, twoway, state.getDate(), range, sigma, baseWeight, propagatorIndex); + final Range measurement = new Range(station, twoway, state.getDate(), range, sigma, baseWeight, satellite); for (final EstimationModifier<Range> modifier : getModifiers()) { measurement.addModifier(modifier); } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/RangeRateBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/RangeRateBuilder.java index c1c9bd6b72a7ca42f1bc1f3d721345d49ba84d8a..4a653e3f3162b38cd4781814fd3dd1ce215d36ab 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/RangeRateBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/RangeRateBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.measurements.generation; import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.EstimationModifier; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.RangeRate; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; @@ -43,13 +44,13 @@ public class RangeRateBuilder extends AbstractMeasurementBuilder<RangeRate> { * @param twoWay flag indicating whether it is a two-way measurement * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorIndex index of the propagator related to this measurement + * @param satellite satellite related to this builder */ public RangeRateBuilder(final CorrelatedRandomVectorGenerator noiseSource, final GroundStation station, final boolean twoWay, final double sigma, final double baseWeight, - final int propagatorIndex) { - super(noiseSource, sigma, baseWeight, propagatorIndex); + final ObservableSatellite satellite) { + super(noiseSource, sigma, baseWeight, satellite); this.station = station; this.twoway = twoWay; } @@ -58,13 +59,13 @@ public class RangeRateBuilder extends AbstractMeasurementBuilder<RangeRate> { @Override public RangeRate build(final SpacecraftState[] states) { - final int propagatorIndex = getPropagatorsIndices()[0]; - final double sigma = getTheoreticalStandardDeviation()[0]; - final double baseWeight = getBaseWeight()[0]; - final SpacecraftState state = states[propagatorIndex]; + final ObservableSatellite satellite = getSatellites()[0]; + final double sigma = getTheoreticalStandardDeviation()[0]; + final double baseWeight = getBaseWeight()[0]; + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // create a dummy measurement - final RangeRate dummy = new RangeRate(station, state.getDate(), Double.NaN, sigma, baseWeight, twoway, propagatorIndex); + final RangeRate dummy = new RangeRate(station, state.getDate(), Double.NaN, sigma, baseWeight, twoway, satellite); for (final EstimationModifier<RangeRate> modifier : getModifiers()) { dummy.addModifier(modifier); } @@ -89,7 +90,7 @@ public class RangeRateBuilder extends AbstractMeasurementBuilder<RangeRate> { // generate measurement final RangeRate measurement = new RangeRate(station, state.getDate(), rangeRate, - sigma, baseWeight, twoway, propagatorIndex); + sigma, baseWeight, twoway, satellite); for (final EstimationModifier<RangeRate> modifier : getModifiers()) { measurement.addModifier(modifier); } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/Scheduler.java b/src/main/java/org/orekit/estimation/measurements/generation/Scheduler.java index 2ee046f2221c53080c925290fc2d8ed564365d78..a81f1dd3742a8f75ba39f934536f5991a89ac0eb 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/Scheduler.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/Scheduler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/generation/SignSemantic.java b/src/main/java/org/orekit/estimation/measurements/generation/SignSemantic.java index c501552f1bc40c123668a2dd048fcdb792ac3809..530531b304822aa1921d53686f399c84b4cc828e 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/SignSemantic.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/SignSemantic.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/generation/TurnAroundRangeBuilder.java b/src/main/java/org/orekit/estimation/measurements/generation/TurnAroundRangeBuilder.java index 261f6b281f636b60f4b7647327c7152723b5740b..bbb6621c487618f8a20a5b85e95cd19cead6ca1a 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/TurnAroundRangeBuilder.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/TurnAroundRangeBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.measurements.generation; import org.hipparchus.random.CorrelatedRandomVectorGenerator; import org.orekit.estimation.measurements.EstimationModifier; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.TurnAroundRange; import org.orekit.propagation.SpacecraftState; import org.orekit.time.AbsoluteDate; @@ -43,13 +44,13 @@ public class TurnAroundRangeBuilder extends AbstractMeasurementBuilder<TurnAroun * @param slaveStation ground station reflecting the signal * @param sigma theoretical standard deviation * @param baseWeight base weight - * @param propagatorIndex index of the propagator related to this measurement + * @param satellite satellite related to this builder */ public TurnAroundRangeBuilder(final CorrelatedRandomVectorGenerator noiseSource, final GroundStation masterStation, final GroundStation slaveStation, final double sigma, final double baseWeight, - final int propagatorIndex) { - super(noiseSource, sigma, baseWeight, propagatorIndex); + final ObservableSatellite satellite) { + super(noiseSource, sigma, baseWeight, satellite); this.masterStation = masterStation; this.slaveStation = slaveStation; } @@ -58,13 +59,14 @@ public class TurnAroundRangeBuilder extends AbstractMeasurementBuilder<TurnAroun @Override public TurnAroundRange build(final SpacecraftState[] states) { - final int propagatorIndex = getPropagatorsIndices()[0]; - final double sigma = getTheoreticalStandardDeviation()[0]; - final double baseWeight = getBaseWeight()[0]; - final SpacecraftState state = states[propagatorIndex]; + final ObservableSatellite satellite = getSatellites()[0]; + final double sigma = getTheoreticalStandardDeviation()[0]; + final double baseWeight = getBaseWeight()[0]; + final SpacecraftState state = states[satellite.getPropagatorIndex()]; // create a dummy measurement - final TurnAroundRange dummy = new TurnAroundRange(masterStation, slaveStation, state.getDate(), Double.NaN, sigma, baseWeight, propagatorIndex); + final TurnAroundRange dummy = new TurnAroundRange(masterStation, slaveStation, state.getDate(), + Double.NaN, sigma, baseWeight, satellite); for (final EstimationModifier<TurnAroundRange> modifier : getModifiers()) { dummy.addModifier(modifier); } @@ -89,7 +91,7 @@ public class TurnAroundRangeBuilder extends AbstractMeasurementBuilder<TurnAroun // generate measurement final TurnAroundRange measurement = new TurnAroundRange(masterStation, slaveStation, state.getDate(), - range, sigma, baseWeight, propagatorIndex); + range, sigma, baseWeight, satellite); for (final EstimationModifier<TurnAroundRange> modifier : getModifiers()) { measurement.addModifier(modifier); } diff --git a/src/main/java/org/orekit/estimation/measurements/generation/package-info.java b/src/main/java/org/orekit/estimation/measurements/generation/package-info.java index 1d113807be1fdab99048fd665c2e43951b304093..6fea98c9bc30877e6d47aa4d06f609d109f7fe27 100644 --- a/src/main/java/org/orekit/estimation/measurements/generation/package-info.java +++ b/src/main/java/org/orekit/estimation/measurements/generation/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/AngularIonosphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/AngularIonosphericDelayModifier.java index edf119b2550e28d35dc3e2646511819de3c7f309..88c4529d5ba2f1725eac68964954e3c9a02243f3 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/AngularIonosphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/AngularIonosphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/AngularRadioRefractionModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/AngularRadioRefractionModifier.java index 488190760822255cfe00e733576a363ad6831e2c..5ebfd5381763f79681705af12f8d6a53e05a5f8d 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/AngularRadioRefractionModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/AngularRadioRefractionModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/AngularTroposphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/AngularTroposphericDelayModifier.java index 6ce21ee6430106d85a492b13f0b2c21c0907bade..999f2e4d4d3b6f549e5086e8ffce2a6b868347b8 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/AngularTroposphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/AngularTroposphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/Bias.java b/src/main/java/org/orekit/estimation/measurements/modifiers/Bias.java index ee6a99dd958740f608efb3ffacc13a10f6016ccf..246684023ab477a011408896d97e44dd2fe837db 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/Bias.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/Bias.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/DynamicOutlierFilter.java b/src/main/java/org/orekit/estimation/measurements/modifiers/DynamicOutlierFilter.java index 1ce72b12e18a4cbf67e32ebfbbeac5e3b8c5a067..d5783d03eae2c5aebb5709f4e37efd7a9795c101 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/DynamicOutlierFilter.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/DynamicOutlierFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2017 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifier.java index ddcc758affcf5b403ebd5a5d1040e59cb527a559..6470bf14a20ad4ecd969f2803eeca980436e2a49 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/OnBoardAntennaRangeModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaRangeModifier.java index 0ce7150f7163defa7ddbb88b042833e8d6bdf75b..be60292a6bbdc0b4fb642559fe3ca1a527567dfa 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaRangeModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaRangeModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifier.java index 6e330c9e82c04c8810d744cb87e5fc05c83cb9f0..1ce7a36354d2d76dfd18af6dc82b2bd100235148 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/OutlierFilter.java b/src/main/java/org/orekit/estimation/measurements/modifiers/OutlierFilter.java index a3120d3a43ddf73934a48758d60592e10d686b7f..0c13b0e4051bc4a925989701ec44711f4394936a 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/OutlierFilter.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/OutlierFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/PhaseAmbiguityModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/PhaseAmbiguityModifier.java index 79cef5aa846d3d6037295516dfa335ae759c266f..7393afcf96b1da6dbc1583c89c3840e7c572a8ca 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/PhaseAmbiguityModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/PhaseAmbiguityModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/RangeIonosphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeIonosphericDelayModifier.java index 200d66370a4003ef60aac69234be28d37c558c12..a6ed3d239c34dc64c00b8174eff040f5a43de752 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/RangeIonosphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeIonosphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -140,7 +140,7 @@ public class RangeIonosphericDelayModifier implements EstimationModifier<Range> }; final ParameterFunction rangeErrorDerivative = - Differentiation.differentiate(rangeError, driver, 3, 10.0); + Differentiation.differentiate(rangeError, 3, 10.0 * driver.getScale()); return rangeErrorDerivative.value(driver); @@ -178,7 +178,8 @@ public class RangeIonosphericDelayModifier implements EstimationModifier<Range> } estimated.setStateDerivatives(0, stateDerivatives); - for (final ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (final ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver())) { if (driver.isSelected()) { diff --git a/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateIonosphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateIonosphericDelayModifier.java index df6416ef5c3adcc89382e6745b2ceff67b54adc9..59516f9fc7c99d63ac8252376a6a9fdba417f807 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateIonosphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateIonosphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -175,7 +175,7 @@ public class RangeRateIonosphericDelayModifier implements EstimationModifier<Ran }; final ParameterFunction rangeErrorDerivative = - Differentiation.differentiate(rangeError, driver, 3, 10.0); + Differentiation.differentiate(rangeError, 3, 10.0 * driver.getScale()); return rangeErrorDerivative.value(driver); @@ -216,7 +216,8 @@ public class RangeRateIonosphericDelayModifier implements EstimationModifier<Ran } estimated.setStateDerivatives(0, stateDerivatives); - for (final ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (final ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver())) { if (driver.isSelected()) { diff --git a/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateTroposphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateTroposphericDelayModifier.java index 86a522ac08dfdce1f3d2bda8243e585d365b8ab4..95c3180b994d1e9dfd0c02a6a3a2089a6ab49210 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateTroposphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeRateTroposphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -258,7 +258,7 @@ public class RangeRateTroposphericDelayModifier implements EstimationModifier<Ra }; final ParameterFunction rangeErrorDerivative = - Differentiation.differentiate(rangeError, driver, 3, 10.0); + Differentiation.differentiate(rangeError, 3, 10.0 * driver.getScale()); return rangeErrorDerivative.value(driver); @@ -336,7 +336,8 @@ public class RangeRateTroposphericDelayModifier implements EstimationModifier<Ra } - for (final ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (final ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver())) { if (driver.isSelected()) { diff --git a/src/main/java/org/orekit/estimation/measurements/modifiers/RangeTroposphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeTroposphericDelayModifier.java index 4ce171dc7893d43dae9f08f3bbfc3a702ef11038..a8f67c163ce8cf81b7bc8f67d8283232025770be 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/RangeTroposphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/RangeTroposphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -210,7 +210,7 @@ public class RangeTroposphericDelayModifier implements EstimationModifier<Range> }; final ParameterFunction rangeErrorDerivative = - Differentiation.differentiate(rangeError, driver, 3, 10.0); + Differentiation.differentiate(rangeError, 3, 10.0 * driver.getScale()); return rangeErrorDerivative.value(driver); @@ -289,7 +289,8 @@ public class RangeTroposphericDelayModifier implements EstimationModifier<Range> } - for (final ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (final ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver())) { if (driver.isSelected()) { diff --git a/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeIonosphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeIonosphericDelayModifier.java index ecb6e940f594c97836979560c3bbb4935e16a9d5..dea5c6d3426681a009df6487b7d384f3a6b01c72 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeIonosphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeIonosphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -138,7 +138,7 @@ public class TurnAroundRangeIonosphericDelayModifier implements EstimationModifi }; final ParameterFunction rangeErrorDerivative = - Differentiation.differentiate(rangeError, driver, 3, 10.0); + Differentiation.differentiate(rangeError, 3, 10.0 * driver.getScale()); return rangeErrorDerivative.value(driver); @@ -179,7 +179,8 @@ public class TurnAroundRangeIonosphericDelayModifier implements EstimationModifi estimated.setStateDerivatives(0, stateDerivatives); // Update derivatives with respect to master station position - for (final ParameterDriver driver : Arrays.asList(masterStation.getEastOffsetDriver(), + for (final ParameterDriver driver : Arrays.asList(masterStation.getClockOffsetDriver(), + masterStation.getEastOffsetDriver(), masterStation.getNorthOffsetDriver(), masterStation.getZenithOffsetDriver())) { if (driver.isSelected()) { diff --git a/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeTroposphericDelayModifier.java b/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeTroposphericDelayModifier.java index c137e7b5783bde6ded0d819e5839cfdfffa7960d..86821ee5c7057a4dc3b3ee5c24ef864f4925c351 100644 --- a/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeTroposphericDelayModifier.java +++ b/src/main/java/org/orekit/estimation/measurements/modifiers/TurnAroundRangeTroposphericDelayModifier.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -208,7 +208,7 @@ public class TurnAroundRangeTroposphericDelayModifier implements EstimationModif } }; - final ParameterFunction rangeErrorDerivative = Differentiation.differentiate(rangeError, driver, 3, 10.0); + final ParameterFunction rangeErrorDerivative = Differentiation.differentiate(rangeError, 3, 10.0 * driver.getScale()); return rangeErrorDerivative.value(driver); @@ -306,7 +306,8 @@ public class TurnAroundRangeTroposphericDelayModifier implements EstimationModif } // Update derivatives with respect to master station position - for (final ParameterDriver driver : Arrays.asList(masterStation.getEastOffsetDriver(), + for (final ParameterDriver driver : Arrays.asList(masterStation.getClockOffsetDriver(), + masterStation.getEastOffsetDriver(), masterStation.getNorthOffsetDriver(), masterStation.getZenithOffsetDriver())) { if (driver.isSelected()) { diff --git a/src/main/java/org/orekit/estimation/measurements/package-info.java b/src/main/java/org/orekit/estimation/measurements/package-info.java index 5d66dbb0f844f43ba007762137b2ed8a1840e3b0..91925d442dba89e3fc7236adcc77f70304b985bf 100644 --- a/src/main/java/org/orekit/estimation/measurements/package-info.java +++ b/src/main/java/org/orekit/estimation/measurements/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/package-info.java b/src/main/java/org/orekit/estimation/package-info.java index d8dd9282089aa1f4b7e8d297dc8f084b86c69aef..c8ffdf92b3e2116407eb802111330394072d2eaa 100644 --- a/src/main/java/org/orekit/estimation/package-info.java +++ b/src/main/java/org/orekit/estimation/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/AbstractCovarianceMatrixProvider.java b/src/main/java/org/orekit/estimation/sequential/AbstractCovarianceMatrixProvider.java index 5cc5afe3a5dbcf0483a3d721fe427a2dff02d7b2..007443b0b3e4a66cdd9bef26002459ab3132ba92 100644 --- a/src/main/java/org/orekit/estimation/sequential/AbstractCovarianceMatrixProvider.java +++ b/src/main/java/org/orekit/estimation/sequential/AbstractCovarianceMatrixProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/ConstantProcessNoise.java b/src/main/java/org/orekit/estimation/sequential/ConstantProcessNoise.java index 9538a060527efdd017307c2129dd760b5c9fa3e8..92a1d43dfb70ba53456be7ad15072dd16d15a2ba 100644 --- a/src/main/java/org/orekit/estimation/sequential/ConstantProcessNoise.java +++ b/src/main/java/org/orekit/estimation/sequential/ConstantProcessNoise.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/CovarianceMatrixProvider.java b/src/main/java/org/orekit/estimation/sequential/CovarianceMatrixProvider.java index 58c4697c82799d7f1b2d7e42265aa1af014dd3a5..1b8a449ab9a0f04a39696222ee58127721dd68a8 100644 --- a/src/main/java/org/orekit/estimation/sequential/CovarianceMatrixProvider.java +++ b/src/main/java/org/orekit/estimation/sequential/CovarianceMatrixProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/KalmanEstimation.java b/src/main/java/org/orekit/estimation/sequential/KalmanEstimation.java index 5902141f7ca4fbe116c6fd8f25b205232809ca95..56e31dfe27a0c6d69a68f1184d038bd1d9e5b665 100644 --- a/src/main/java/org/orekit/estimation/sequential/KalmanEstimation.java +++ b/src/main/java/org/orekit/estimation/sequential/KalmanEstimation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/KalmanEstimator.java b/src/main/java/org/orekit/estimation/sequential/KalmanEstimator.java index 16143155d62a890728c4159ca7edfdf3307ac323..d201e0ed6f522a11cb738795c9dadfa9cc501fcc 100644 --- a/src/main/java/org/orekit/estimation/sequential/KalmanEstimator.java +++ b/src/main/java/org/orekit/estimation/sequential/KalmanEstimator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/KalmanEstimatorBuilder.java b/src/main/java/org/orekit/estimation/sequential/KalmanEstimatorBuilder.java index bdfad59bc3cf8ad30b1354a94c88a9aee20f49f4..fef334b8212b6a76c5db6b3cf4ed9a805096c1fa 100644 --- a/src/main/java/org/orekit/estimation/sequential/KalmanEstimatorBuilder.java +++ b/src/main/java/org/orekit/estimation/sequential/KalmanEstimatorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/KalmanObserver.java b/src/main/java/org/orekit/estimation/sequential/KalmanObserver.java index 532f195d47303bde0eedefe3db70c633b94b667d..a13996e69dbe67058a935964f97f955fec37e48c 100644 --- a/src/main/java/org/orekit/estimation/sequential/KalmanObserver.java +++ b/src/main/java/org/orekit/estimation/sequential/KalmanObserver.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/MeasurementDecorator.java b/src/main/java/org/orekit/estimation/sequential/MeasurementDecorator.java index e32412ea411c658ceea6c8b08b7c4c6f3f3d5a20..be9f0ae44423b61f799f2bfc4ab843cb80182c97 100644 --- a/src/main/java/org/orekit/estimation/sequential/MeasurementDecorator.java +++ b/src/main/java/org/orekit/estimation/sequential/MeasurementDecorator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/sequential/Model.java b/src/main/java/org/orekit/estimation/sequential/Model.java index 9200569384d8c39366ff175f15121f5f3774d7b9..ed1d1aa7ca467e85515853bc0aabfde948e6c4b3 100644 --- a/src/main/java/org/orekit/estimation/sequential/Model.java +++ b/src/main/java/org/orekit/estimation/sequential/Model.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -692,7 +692,7 @@ public class Model implements KalmanEstimation, NonLinearProcess<MeasurementDeco // loop over all orbits involved in the measurement for (int k = 0; k < evaluationStates.length; ++k) { - final int p = observedMeasurement.getPropagatorsIndices().get(k); + final int p = observedMeasurement.getSatellites().get(k).getPropagatorIndex(); // Predicted orbit final Orbit predictedOrbit = evaluationStates[k].getOrbit(); diff --git a/src/main/java/org/orekit/estimation/sequential/UnivariateProcessNoise.java b/src/main/java/org/orekit/estimation/sequential/UnivariateProcessNoise.java index 1752c8d57f3cf6fd378ddb51fb5c25ece644273e..43cb50f03d10741f10d60e3b119743441b261235 100644 --- a/src/main/java/org/orekit/estimation/sequential/UnivariateProcessNoise.java +++ b/src/main/java/org/orekit/estimation/sequential/UnivariateProcessNoise.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/CCSDSFrame.java b/src/main/java/org/orekit/files/ccsds/CCSDSFrame.java index 2e4397fe3dc8a7271595cc86090205bb1378d439..06df243107d4ca02132db180d6f9c89ec0aadd1a 100644 --- a/src/main/java/org/orekit/files/ccsds/CCSDSFrame.java +++ b/src/main/java/org/orekit/files/ccsds/CCSDSFrame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/CenterName.java b/src/main/java/org/orekit/files/ccsds/CenterName.java index 21421a9fc2c1b27cddc5b08e9c2f130eb00b8667..ce2cd2dcac8f1c293423cee287047c6e97233ee5 100644 --- a/src/main/java/org/orekit/files/ccsds/CenterName.java +++ b/src/main/java/org/orekit/files/ccsds/CenterName.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/KeyValue.java b/src/main/java/org/orekit/files/ccsds/KeyValue.java index 870919cf471cf8c8f62c0e48a09c83db464b8b36..57cb7c59901cc3d9f9f03e207dc4dbbfdd3232c9 100644 --- a/src/main/java/org/orekit/files/ccsds/KeyValue.java +++ b/src/main/java/org/orekit/files/ccsds/KeyValue.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/Keyword.java b/src/main/java/org/orekit/files/ccsds/Keyword.java index bfad897d9176fb8c72499979fdeafc52e9ae84c4..ee7a2bfc03d3f31db8101708107a73719e188df0 100644 --- a/src/main/java/org/orekit/files/ccsds/Keyword.java +++ b/src/main/java/org/orekit/files/ccsds/Keyword.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/ODMFile.java b/src/main/java/org/orekit/files/ccsds/ODMFile.java index 7fa0db9baa848e12f38165be940b89a8b009d01e..ff5c3ad7c1a96ffb829d2a3c3dd0f0be6b65c5e7 100644 --- a/src/main/java/org/orekit/files/ccsds/ODMFile.java +++ b/src/main/java/org/orekit/files/ccsds/ODMFile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/ODMMetaData.java b/src/main/java/org/orekit/files/ccsds/ODMMetaData.java index 29536cbac082ee80bf9e552aaf6d2c65e837521b..ec95c5f09e9fb17c9e7db0db76c6980eb5eabc9a 100644 --- a/src/main/java/org/orekit/files/ccsds/ODMMetaData.java +++ b/src/main/java/org/orekit/files/ccsds/ODMMetaData.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/ODMParser.java b/src/main/java/org/orekit/files/ccsds/ODMParser.java index 56f3cbb03f86c95e8f9ad8b06ea782d2329385e6..f14f180f83d508cf3f002f34b6c1238b7568fcf9 100644 --- a/src/main/java/org/orekit/files/ccsds/ODMParser.java +++ b/src/main/java/org/orekit/files/ccsds/ODMParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OEMFile.java b/src/main/java/org/orekit/files/ccsds/OEMFile.java index 5cffd63a89d992dae12746c3a1804b61e2497f61..30c584d438fb1a768544e3b6c3ca2748a07fcdc5 100644 --- a/src/main/java/org/orekit/files/ccsds/OEMFile.java +++ b/src/main/java/org/orekit/files/ccsds/OEMFile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OEMParser.java b/src/main/java/org/orekit/files/ccsds/OEMParser.java index 42df19d48b80badb2c60bc55e07889f9bd2afe1e..9ac51ea1099578cda85d41f72990ad7b5ed93286 100644 --- a/src/main/java/org/orekit/files/ccsds/OEMParser.java +++ b/src/main/java/org/orekit/files/ccsds/OEMParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OGMFile.java b/src/main/java/org/orekit/files/ccsds/OGMFile.java index b1999009e967b7bb2a596e333fe3e692b011eacb..19153009405688552a143970b174ac4fc9e4c5ac 100644 --- a/src/main/java/org/orekit/files/ccsds/OGMFile.java +++ b/src/main/java/org/orekit/files/ccsds/OGMFile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OMMFile.java b/src/main/java/org/orekit/files/ccsds/OMMFile.java index 42fb05488fff74719331837708c6d0277aa97ee7..052aba2353bbb7e284fdec1e563352e41642cbde 100644 --- a/src/main/java/org/orekit/files/ccsds/OMMFile.java +++ b/src/main/java/org/orekit/files/ccsds/OMMFile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OMMParser.java b/src/main/java/org/orekit/files/ccsds/OMMParser.java index 8ce3dec90703319e3ab2e9c52ff55e2efaf5db33..d3dd6fa5a1c35009da9b99159c984bfb9663cc1f 100644 --- a/src/main/java/org/orekit/files/ccsds/OMMParser.java +++ b/src/main/java/org/orekit/files/ccsds/OMMParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OPMFile.java b/src/main/java/org/orekit/files/ccsds/OPMFile.java index 4b0237db78776e490d51b6b9f2dedd6dc2cb8309..1bed92892f5af3d90d904b28978d9ee48bfb5aa0 100644 --- a/src/main/java/org/orekit/files/ccsds/OPMFile.java +++ b/src/main/java/org/orekit/files/ccsds/OPMFile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OPMParser.java b/src/main/java/org/orekit/files/ccsds/OPMParser.java index 430563abe5069c653e896051d842163c7d9343b6..24632228bb9944715a7db3e88a1eba1d2426de4e 100644 --- a/src/main/java/org/orekit/files/ccsds/OPMParser.java +++ b/src/main/java/org/orekit/files/ccsds/OPMParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/TDMFile.java b/src/main/java/org/orekit/files/ccsds/TDMFile.java index f546b803ab009806ad1c6c375b99621ca31af73b..a00b28abaf6e2c6237244c068c593f2d995e68ef 100644 --- a/src/main/java/org/orekit/files/ccsds/TDMFile.java +++ b/src/main/java/org/orekit/files/ccsds/TDMFile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/TDMParser.java b/src/main/java/org/orekit/files/ccsds/TDMParser.java index 237a3c456edc9f1feb78ee2d2f4ef880ebf093b0..46fde797ab95653b724354bb0ca63a06bc023441 100644 --- a/src/main/java/org/orekit/files/ccsds/TDMParser.java +++ b/src/main/java/org/orekit/files/ccsds/TDMParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/package-info.java b/src/main/java/org/orekit/files/ccsds/package-info.java index 390bae07c0a936d2a94ea5d091730affb952f4a8..98a6ed9638224e7bd61f3dc9db8342ba9a385223 100644 --- a/src/main/java/org/orekit/files/ccsds/package-info.java +++ b/src/main/java/org/orekit/files/ccsds/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/general/package-info.java b/src/main/java/org/orekit/files/general/package-info.java index 28bf17f6847b6bd4473cb59364dfc1dc1ff008df..d45c27ba1b89567de4ee2db6891a875134e5ca96 100644 --- a/src/main/java/org/orekit/files/general/package-info.java +++ b/src/main/java/org/orekit/files/general/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/package-info.java b/src/main/java/org/orekit/files/package-info.java index b7f802321327a67662dd9232039360a1cb0a6992..770ded340240609bf1c062dc153cf85186213b04 100644 --- a/src/main/java/org/orekit/files/package-info.java +++ b/src/main/java/org/orekit/files/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/sp3/package-info.java b/src/main/java/org/orekit/files/sp3/package-info.java index 1c94ad8746cf4339603c0536335f5bfcb6cd7240..f19a51871938d3092a7c3c79709b7bb2df0d71f2 100644 --- a/src/main/java/org/orekit/files/sp3/package-info.java +++ b/src/main/java/org/orekit/files/sp3/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/AbstractForceModel.java b/src/main/java/org/orekit/forces/AbstractForceModel.java index e12171e59fd9096af84bcaabbbbf0e2a1b826758..081cca3bc902052f243ed068e25e7f99a04792aa 100644 --- a/src/main/java/org/orekit/forces/AbstractForceModel.java +++ b/src/main/java/org/orekit/forces/AbstractForceModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/AbstractParametricAcceleration.java b/src/main/java/org/orekit/forces/AbstractParametricAcceleration.java index 6ea77df8597a680e7a54b646dda2fd3f3d788153..d9152d11f8b4ac8ef4ea1a8bfe5c36caaa0848f8 100644 --- a/src/main/java/org/orekit/forces/AbstractParametricAcceleration.java +++ b/src/main/java/org/orekit/forces/AbstractParametricAcceleration.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/BoxAndSolarArraySpacecraft.java b/src/main/java/org/orekit/forces/BoxAndSolarArraySpacecraft.java index 8cc3ad8624b0edfb85cc1761c7b907d43abc7184..1f43683aef73283acd60c69a0807c8b414ae49a4 100644 --- a/src/main/java/org/orekit/forces/BoxAndSolarArraySpacecraft.java +++ b/src/main/java/org/orekit/forces/BoxAndSolarArraySpacecraft.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/ForceModel.java b/src/main/java/org/orekit/forces/ForceModel.java index e056f2b54d22a993dfc71b0c9aa8da74831415ba..7a866dcfc2c20fff936d13f53ea2d4e8f2026608 100644 --- a/src/main/java/org/orekit/forces/ForceModel.java +++ b/src/main/java/org/orekit/forces/ForceModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/HarmonicParametricAcceleration.java b/src/main/java/org/orekit/forces/HarmonicParametricAcceleration.java index 811a162ca31f1b11a9791a2c5f914208ad13759a..58624b60af9aa7d1f93b564e77236302760837f8 100644 --- a/src/main/java/org/orekit/forces/HarmonicParametricAcceleration.java +++ b/src/main/java/org/orekit/forces/HarmonicParametricAcceleration.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/PolynomialParametricAcceleration.java b/src/main/java/org/orekit/forces/PolynomialParametricAcceleration.java index b079dd8dfeb416f94a9f04c370e0c40a18db38dd..b8b6409a36f5615071fbe8ee470fb356c7055e3e 100644 --- a/src/main/java/org/orekit/forces/PolynomialParametricAcceleration.java +++ b/src/main/java/org/orekit/forces/PolynomialParametricAcceleration.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/DragForce.java b/src/main/java/org/orekit/forces/drag/DragForce.java index 7e53949ca76179c879810217033751676c435abb..4eafdfc404eb72266820bc3637304a4533a32c55 100644 --- a/src/main/java/org/orekit/forces/drag/DragForce.java +++ b/src/main/java/org/orekit/forces/drag/DragForce.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/DragSensitive.java b/src/main/java/org/orekit/forces/drag/DragSensitive.java index 1db52f0901ecd6a550cdcba6df34dd51c8667f60..ed3c3d0ac821267cd6686d445c05de139630e880 100644 --- a/src/main/java/org/orekit/forces/drag/DragSensitive.java +++ b/src/main/java/org/orekit/forces/drag/DragSensitive.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/IsotropicDrag.java b/src/main/java/org/orekit/forces/drag/IsotropicDrag.java index f2158986c2092c65c2b591e8c546afad42603567..2fd87a90deb03ce9ac870426381fa9b90103aa51 100644 --- a/src/main/java/org/orekit/forces/drag/IsotropicDrag.java +++ b/src/main/java/org/orekit/forces/drag/IsotropicDrag.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/Atmosphere.java b/src/main/java/org/orekit/forces/drag/atmosphere/Atmosphere.java index f14bc25def2cb59a537669bf524ea58a85029e8f..5d9f6fca217af129abd2898d2f263ac5f9d5de58 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/Atmosphere.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/Atmosphere.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/DTM2000.java b/src/main/java/org/orekit/forces/drag/atmosphere/DTM2000.java index 86c4582fa7ed0b4ab1155c8235621fc8ad431060..fb5739e2068a997dc13717268afd633ba898d68d 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/DTM2000.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/DTM2000.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/DTM2000InputParameters.java b/src/main/java/org/orekit/forces/drag/atmosphere/DTM2000InputParameters.java index 0f58c0f5dc37fb136a84c1eabca24f72f22b8717..73c12fd419f6cf4293dda38108f4c4404c6120ab 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/DTM2000InputParameters.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/DTM2000InputParameters.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/HarrisPriester.java b/src/main/java/org/orekit/forces/drag/atmosphere/HarrisPriester.java index 257d1bf8d0160716d18af280a300544b728a0ab4..42d21e5ea91f2de9364cf827cda1369ce915bed4 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/HarrisPriester.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/HarrisPriester.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/JB2008.java b/src/main/java/org/orekit/forces/drag/atmosphere/JB2008.java index 18081dc2fc8cb5966a8d763dfbadf7e32680a2bd..81e92fa1bafdb83f56aa4b270d11df9b9f79aed4 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/JB2008.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/JB2008.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/JB2008InputParameters.java b/src/main/java/org/orekit/forces/drag/atmosphere/JB2008InputParameters.java index 8546587301b8f8a853b06ffc9c69057494dc2730..5cd28bb9966f1915e88f84806ab06de9fb9e4bcc 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/JB2008InputParameters.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/JB2008InputParameters.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/NRLMSISE00.java b/src/main/java/org/orekit/forces/drag/atmosphere/NRLMSISE00.java index 3f41ea53a6bdf87416ec4a0924bdbe7a30bb346d..8b1725e796d878bdc051c2b266fdc3397eb854b0 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/NRLMSISE00.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/NRLMSISE00.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/NRLMSISE00InputParameters.java b/src/main/java/org/orekit/forces/drag/atmosphere/NRLMSISE00InputParameters.java index 7c01d1d6ee942bce6efb02133d98c2c4ea3a10d4..bd0da50e2200f9516c83a018abba195237279a51 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/NRLMSISE00InputParameters.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/NRLMSISE00InputParameters.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/SimpleExponentialAtmosphere.java b/src/main/java/org/orekit/forces/drag/atmosphere/SimpleExponentialAtmosphere.java index e81cb06762cffbd0812965c2c37c6e71d52e9665..c8281837a3b432588e44956fa12e13c016e40f00 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/SimpleExponentialAtmosphere.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/SimpleExponentialAtmosphere.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimation.java b/src/main/java/org/orekit/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimation.java index f4626da61217abbcab16bd4fbd381c16fc16cc4f..2653d0adf674aad4349482a9c9254eb48841b447 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimation.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/data/package-info.java b/src/main/java/org/orekit/forces/drag/atmosphere/data/package-info.java index d6df8ae480ceada67617dab39e1ab320c892b13c..21c6e92c0664e93fd0cda0c9541321cec93a1418 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/data/package-info.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/data/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/package-info.java b/src/main/java/org/orekit/forces/drag/atmosphere/package-info.java index 04568efa3c5f8c02b6cb98f16b8204ee5e382ceb..9bbcd755e6651dd2d4d73401ba8e55734d6d0489 100644 --- a/src/main/java/org/orekit/forces/drag/atmosphere/package-info.java +++ b/src/main/java/org/orekit/forces/drag/atmosphere/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/package-info.java b/src/main/java/org/orekit/forces/drag/package-info.java index c1a7d705a99153e11af6cf402e72dfa1d629cbf9..28ecef967a957a1a6f8ce0ba2df8a9d9229f9ad9 100644 --- a/src/main/java/org/orekit/forces/drag/package-info.java +++ b/src/main/java/org/orekit/forces/drag/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/HolmesFeatherstoneAttractionModel.java b/src/main/java/org/orekit/forces/gravity/HolmesFeatherstoneAttractionModel.java index fca5e4f765a393996c803eb9d739a3392bcc08de..734c3c699c1c6ea544cc513add218e3f05b11640 100644 --- a/src/main/java/org/orekit/forces/gravity/HolmesFeatherstoneAttractionModel.java +++ b/src/main/java/org/orekit/forces/gravity/HolmesFeatherstoneAttractionModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/OceanTides.java b/src/main/java/org/orekit/forces/gravity/OceanTides.java index 8050383b3ececcf6b21e5d71acaca0d715bcf7a2..dbbaf3b231236db7bcf19e6c592931b2474e9037 100644 --- a/src/main/java/org/orekit/forces/gravity/OceanTides.java +++ b/src/main/java/org/orekit/forces/gravity/OceanTides.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/OceanTidesField.java b/src/main/java/org/orekit/forces/gravity/OceanTidesField.java index ecafcd210a1e98e401cb31f7d5037836c89dde6f..e8836476f75e436ed613387cfece19d4f3f7b001 100644 --- a/src/main/java/org/orekit/forces/gravity/OceanTidesField.java +++ b/src/main/java/org/orekit/forces/gravity/OceanTidesField.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/SolidTides.java b/src/main/java/org/orekit/forces/gravity/SolidTides.java index 5a87ac35511cfbe48d1765a34d9df6521ba5af09..b7b65c227faca1987ade45ef88dc9a40661976e0 100644 --- a/src/main/java/org/orekit/forces/gravity/SolidTides.java +++ b/src/main/java/org/orekit/forces/gravity/SolidTides.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/SolidTidesField.java b/src/main/java/org/orekit/forces/gravity/SolidTidesField.java index d5cb4c23058a6df89d339b60419f2f97c0fb03af..4f31a83ecd1b86a85c91bc723a92fb429ca53720 100644 --- a/src/main/java/org/orekit/forces/gravity/SolidTidesField.java +++ b/src/main/java/org/orekit/forces/gravity/SolidTidesField.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/ThirdBodyAttraction.java b/src/main/java/org/orekit/forces/gravity/ThirdBodyAttraction.java index a88bfacff96a831d9dcf0754562d39612490270d..5fa1856a45c2697780c70a685238805ec04abad5 100644 --- a/src/main/java/org/orekit/forces/gravity/ThirdBodyAttraction.java +++ b/src/main/java/org/orekit/forces/gravity/ThirdBodyAttraction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/package-info.java b/src/main/java/org/orekit/forces/gravity/package-info.java index 11abb03f0eaf7cb2f58d70e309fce25241b693bb..b4a849161b1ba6f029e8600a0e2387e5d5fb5b74 100644 --- a/src/main/java/org/orekit/forces/gravity/package-info.java +++ b/src/main/java/org/orekit/forces/gravity/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/AstronomicalAmplitudeReader.java b/src/main/java/org/orekit/forces/gravity/potential/AstronomicalAmplitudeReader.java index 31dcf846f7cd66a5260ce4fee17bb46205506451..101ede303ac63aea613cee480989eb7684b07fa8 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/AstronomicalAmplitudeReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/AstronomicalAmplitudeReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/CachedNormalizedSphericalHarmonicsProvider.java b/src/main/java/org/orekit/forces/gravity/potential/CachedNormalizedSphericalHarmonicsProvider.java index be725fb4206d05fed09189d9fa4c12d30e11b586..9c56b1146c9e058a9cb69f6707617927cb2e20b7 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/CachedNormalizedSphericalHarmonicsProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/CachedNormalizedSphericalHarmonicsProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/ConstantSphericalHarmonics.java b/src/main/java/org/orekit/forces/gravity/potential/ConstantSphericalHarmonics.java index 20ed39e642026edb896b2426a061b8a8b5ab6795..87fb76b32dfadc1e5c47004e8fb6948f5919e6f6 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/ConstantSphericalHarmonics.java +++ b/src/main/java/org/orekit/forces/gravity/potential/ConstantSphericalHarmonics.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/EGMFormatReader.java b/src/main/java/org/orekit/forces/gravity/potential/EGMFormatReader.java index 352f478508ba4b007249270edd0c63ee242d6853..ba48deba478a4bf8cabb17ef62df70ef52bd945b 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/EGMFormatReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/EGMFormatReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/FESCHatEpsilonReader.java b/src/main/java/org/orekit/forces/gravity/potential/FESCHatEpsilonReader.java index 6a7e02fdef821462d4dcdc2c73c7ae5f2ca8a649..e457ac41b790b29f1e03b0861292d93fa90b226d 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/FESCHatEpsilonReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/FESCHatEpsilonReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/FESCnmSnmReader.java b/src/main/java/org/orekit/forces/gravity/potential/FESCnmSnmReader.java index 65d8cd8a64a550262b2a32f9f527043dd72e9bb5..0cc1286fcf16e4f09d27083bcaa37ceb8185598a 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/FESCnmSnmReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/FESCnmSnmReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/GRGSFormatReader.java b/src/main/java/org/orekit/forces/gravity/potential/GRGSFormatReader.java index ddefd406f6317342810205ee2a177b9dc46f2cb3..4fd4d519acf32bf876bbaeb29d4ec76fab08e069 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/GRGSFormatReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/GRGSFormatReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/GravityFieldFactory.java b/src/main/java/org/orekit/forces/gravity/potential/GravityFieldFactory.java index f973e1b3fc65b40134451189fb402b3c66a57ab6..6c6474dc7fae2b378150101b2695eca795dbfabb 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/GravityFieldFactory.java +++ b/src/main/java/org/orekit/forces/gravity/potential/GravityFieldFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/ICGEMFormatReader.java b/src/main/java/org/orekit/forces/gravity/potential/ICGEMFormatReader.java index c2ea6ec4f144f4d6c2470e525232062f05eb084c..b3e75c188cc4cf626219e5fb897061b9290073b2 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/ICGEMFormatReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/ICGEMFormatReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/NormalizedSphericalHarmonicsProvider.java b/src/main/java/org/orekit/forces/gravity/potential/NormalizedSphericalHarmonicsProvider.java index b82177f43c55d7f3b02ed4d95fe01ce2d939afb4..e5a190763021031618e5fa94687af968fd849e24 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/NormalizedSphericalHarmonicsProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/NormalizedSphericalHarmonicsProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/Normalizer.java b/src/main/java/org/orekit/forces/gravity/potential/Normalizer.java index 3d933fe52b8cc647dbfc79279c6fb0030dcbe41d..59f1dcf2d89092d7c8c271ae879623440417683a 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/Normalizer.java +++ b/src/main/java/org/orekit/forces/gravity/potential/Normalizer.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/OceanLoadDeformationCoefficients.java b/src/main/java/org/orekit/forces/gravity/potential/OceanLoadDeformationCoefficients.java index 6eef20ff091606ed73a3765147e1af8e67e61e7c..4fbef76439bb0d2183360deaec40a4e3eb180061 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/OceanLoadDeformationCoefficients.java +++ b/src/main/java/org/orekit/forces/gravity/potential/OceanLoadDeformationCoefficients.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/OceanTidesReader.java b/src/main/java/org/orekit/forces/gravity/potential/OceanTidesReader.java index 21afde9079741ff03746ed55cde198488005cdc4..c25ff2a772852b37f3b236347f604b671a216674 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/OceanTidesReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/OceanTidesReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/OceanTidesWave.java b/src/main/java/org/orekit/forces/gravity/potential/OceanTidesWave.java index f6f0c8e8d6f1326a642c9f77a370b121043f134a..39372d83fa547ff06a5393dd6723c7223ca8ca1e 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/OceanTidesWave.java +++ b/src/main/java/org/orekit/forces/gravity/potential/OceanTidesWave.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/PotentialCoefficientsReader.java b/src/main/java/org/orekit/forces/gravity/potential/PotentialCoefficientsReader.java index bbc52e6be28dffe6f04fe68e87cff02a3af8875e..2aebb9fcea210f2216f96acccc6cd6bfa9736acc 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/PotentialCoefficientsReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/PotentialCoefficientsReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/PulsatingSphericalHarmonics.java b/src/main/java/org/orekit/forces/gravity/potential/PulsatingSphericalHarmonics.java index 75b16d04ec9ff924dd57f38eef4d950203ddb0e0..de84d3d251784e5f407142c4024d17323c02ec17 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/PulsatingSphericalHarmonics.java +++ b/src/main/java/org/orekit/forces/gravity/potential/PulsatingSphericalHarmonics.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/RawSphericalHarmonicsProvider.java b/src/main/java/org/orekit/forces/gravity/potential/RawSphericalHarmonicsProvider.java index 6c8ef8b7365ca64a73e9eba0864b0a3b01b3a6d7..85937bce40c9089e287e22e89bf999a7b696b113 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/RawSphericalHarmonicsProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/RawSphericalHarmonicsProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/SHMFormatReader.java b/src/main/java/org/orekit/forces/gravity/potential/SHMFormatReader.java index 1ef1c970e72b2b6d334a8d5963ea1ce1e619a1b6..3939079864e54eb7f8cb40f2dcc1ce735aba4367 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/SHMFormatReader.java +++ b/src/main/java/org/orekit/forces/gravity/potential/SHMFormatReader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/SecularTrendSphericalHarmonics.java b/src/main/java/org/orekit/forces/gravity/potential/SecularTrendSphericalHarmonics.java index f4b6e96f85197ab26a13d95275702d24e8f7939a..65b72216ebb12db63bed168401b16f69bf72911e 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/SecularTrendSphericalHarmonics.java +++ b/src/main/java/org/orekit/forces/gravity/potential/SecularTrendSphericalHarmonics.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/SphericalHarmonicsProvider.java b/src/main/java/org/orekit/forces/gravity/potential/SphericalHarmonicsProvider.java index e76fdce94dc7383b0c9d11e64f6044a0aa3e9a2d..91bfcbc6a5bb6670025fb0948c34bce7bb556b7b 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/SphericalHarmonicsProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/SphericalHarmonicsProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/TideSystem.java b/src/main/java/org/orekit/forces/gravity/potential/TideSystem.java index 063e56e1ad7cb99bbfd9a85ab811b51725a34509..3b491ae3850a32c419f13e6cc2bfa0ad7736017e 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/TideSystem.java +++ b/src/main/java/org/orekit/forces/gravity/potential/TideSystem.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/TideSystemProvider.java b/src/main/java/org/orekit/forces/gravity/potential/TideSystemProvider.java index fcb0cb026efd047066422bb214bb3b1aee1ffe8a..518651936453263a71cae8fbf2bd4e17bae8377d 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/TideSystemProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/TideSystemProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/UnnormalizedSphericalHarmonicsProvider.java b/src/main/java/org/orekit/forces/gravity/potential/UnnormalizedSphericalHarmonicsProvider.java index b94876c771436a3f5e108b846660a79d80379f8b..072895e524ed9b2f7564e6090f5a3727e3084b51 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/UnnormalizedSphericalHarmonicsProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/UnnormalizedSphericalHarmonicsProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/Unnormalizer.java b/src/main/java/org/orekit/forces/gravity/potential/Unnormalizer.java index 436eaaba2d0e207a24aaca28a8e46ae159b1d155..f980969cd09c51679393cc0a783d691135934dae 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/Unnormalizer.java +++ b/src/main/java/org/orekit/forces/gravity/potential/Unnormalizer.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/WrappingNormalizedProvider.java b/src/main/java/org/orekit/forces/gravity/potential/WrappingNormalizedProvider.java index c18f737af3510736227c98c8a45220f17f5789d6..cc8ff27db28a733f1ac115035cf135b23db914d0 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/WrappingNormalizedProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/WrappingNormalizedProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/WrappingUnnormalizedProvider.java b/src/main/java/org/orekit/forces/gravity/potential/WrappingUnnormalizedProvider.java index 44f2a491d59ecab2ac7d09cf5f762b2ae4ad0bcc..b0a65a9764a6e6e41b7f59718e7d06c09f1f8178 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/WrappingUnnormalizedProvider.java +++ b/src/main/java/org/orekit/forces/gravity/potential/WrappingUnnormalizedProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/package-info.java b/src/main/java/org/orekit/forces/gravity/potential/package-info.java index 79f11599ef0f156b307c70d2bc3fd3da8079c511..63d378963cc21679eabcb9a0e8569f5afc4e0829 100644 --- a/src/main/java/org/orekit/forces/gravity/potential/package-info.java +++ b/src/main/java/org/orekit/forces/gravity/potential/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/ConstantThrustManeuver.java b/src/main/java/org/orekit/forces/maneuvers/ConstantThrustManeuver.java index 0c20e8e21c27107f29ad7d99e0e83b7c08309700..5d313aeaf443e54f8bba51d786ab20a3d59c9664 100644 --- a/src/main/java/org/orekit/forces/maneuvers/ConstantThrustManeuver.java +++ b/src/main/java/org/orekit/forces/maneuvers/ConstantThrustManeuver.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/ImpulseManeuver.java b/src/main/java/org/orekit/forces/maneuvers/ImpulseManeuver.java index 8d758a78c6879346ee26a46cfe2364124ebb5b52..882e5279dbb96c79cbf338fde3792f8bf5b3fba0 100644 --- a/src/main/java/org/orekit/forces/maneuvers/ImpulseManeuver.java +++ b/src/main/java/org/orekit/forces/maneuvers/ImpulseManeuver.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/SmallManeuverAnalyticalModel.java b/src/main/java/org/orekit/forces/maneuvers/SmallManeuverAnalyticalModel.java index 853e67709a49825a369f37fd6e88eeb158a0401b..587a2cccac4ca2096683ef6bbb6f9abaac521bdb 100644 --- a/src/main/java/org/orekit/forces/maneuvers/SmallManeuverAnalyticalModel.java +++ b/src/main/java/org/orekit/forces/maneuvers/SmallManeuverAnalyticalModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/package-info.java b/src/main/java/org/orekit/forces/maneuvers/package-info.java index 556ea2dc24a93765ec800e533aa4fccaeb1d7c52..bc2f9cc32c258dd0b1889d7fbbe9b82c893cc2e0 100644 --- a/src/main/java/org/orekit/forces/maneuvers/package-info.java +++ b/src/main/java/org/orekit/forces/maneuvers/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/package-info.java b/src/main/java/org/orekit/forces/package-info.java index b9c7a0fa133aec30ee08dcc8a78537378f29142a..78bbe6b74537fd62f8835102dd3fcd3aa4044d15 100644 --- a/src/main/java/org/orekit/forces/package-info.java +++ b/src/main/java/org/orekit/forces/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/radiation/IsotropicRadiationCNES95Convention.java b/src/main/java/org/orekit/forces/radiation/IsotropicRadiationCNES95Convention.java index 8c71d2cae6ce198e66acee27b80b8cd42122c5a3..6dca8b7a9caffbe3c9736536d68ebb38d6825993 100644 --- a/src/main/java/org/orekit/forces/radiation/IsotropicRadiationCNES95Convention.java +++ b/src/main/java/org/orekit/forces/radiation/IsotropicRadiationCNES95Convention.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/radiation/IsotropicRadiationClassicalConvention.java b/src/main/java/org/orekit/forces/radiation/IsotropicRadiationClassicalConvention.java index 255934bf7836c79733308937feea059fe8c370c7..28eb0eaaf37548f88e539e8283864ca9297c1c67 100644 --- a/src/main/java/org/orekit/forces/radiation/IsotropicRadiationClassicalConvention.java +++ b/src/main/java/org/orekit/forces/radiation/IsotropicRadiationClassicalConvention.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/radiation/IsotropicRadiationSingleCoefficient.java b/src/main/java/org/orekit/forces/radiation/IsotropicRadiationSingleCoefficient.java index 07dda1913adafcf58620c9084cba8c8c2c5150c8..0c69e2c8bb6277fa91b666b609a40a496b963634 100644 --- a/src/main/java/org/orekit/forces/radiation/IsotropicRadiationSingleCoefficient.java +++ b/src/main/java/org/orekit/forces/radiation/IsotropicRadiationSingleCoefficient.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/radiation/RadiationSensitive.java b/src/main/java/org/orekit/forces/radiation/RadiationSensitive.java index 33cd3d76cf9f11c0bc7ffb1c4825e86c59b42750..615f9cbe4f51a18624664f844cb7de7b02759d81 100644 --- a/src/main/java/org/orekit/forces/radiation/RadiationSensitive.java +++ b/src/main/java/org/orekit/forces/radiation/RadiationSensitive.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/radiation/SolarRadiationPressure.java b/src/main/java/org/orekit/forces/radiation/SolarRadiationPressure.java index 466481daf7ddbedeeecc8636a40377a1c6a06747..74ebce7f26c5599f84c10608ff3f9cd07c88ada1 100644 --- a/src/main/java/org/orekit/forces/radiation/SolarRadiationPressure.java +++ b/src/main/java/org/orekit/forces/radiation/SolarRadiationPressure.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/radiation/package-info.java b/src/main/java/org/orekit/forces/radiation/package-info.java index 4f1f77ed84b91ba53e5b04f8d71d9478b2e39993..eddf8a1d20726b9ce4f71f6a654628c7a2c2e831 100644 --- a/src/main/java/org/orekit/forces/radiation/package-info.java +++ b/src/main/java/org/orekit/forces/radiation/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/BulletinAFilesLoader.java b/src/main/java/org/orekit/frames/BulletinAFilesLoader.java index 88910d1bd258d517e03d8d75685d88e6a645429c..7d3f250af972d2155ba0f05b429ad163835a7289 100644 --- a/src/main/java/org/orekit/frames/BulletinAFilesLoader.java +++ b/src/main/java/org/orekit/frames/BulletinAFilesLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/BulletinBFilesLoader.java b/src/main/java/org/orekit/frames/BulletinBFilesLoader.java index edd59a517277343b9d672d35463684793788f898..b8e5e74797f441d573f223e359c3b04e5dcca123 100644 --- a/src/main/java/org/orekit/frames/BulletinBFilesLoader.java +++ b/src/main/java/org/orekit/frames/BulletinBFilesLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/CIRFProvider.java b/src/main/java/org/orekit/frames/CIRFProvider.java index 144eb64814f74c71f6129c3a9eb146db93dfc100..3bb23bc500a411e4213f62c3090b1f4999c439e1 100644 --- a/src/main/java/org/orekit/frames/CIRFProvider.java +++ b/src/main/java/org/orekit/frames/CIRFProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EME2000Provider.java b/src/main/java/org/orekit/frames/EME2000Provider.java index e66e8b9b28a5b5fcf1a8bd76d56e51f547f4338c..6297b4f565fff1bf611f71b117a7aeeb4d0291be 100644 --- a/src/main/java/org/orekit/frames/EME2000Provider.java +++ b/src/main/java/org/orekit/frames/EME2000Provider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EOPBasedTransformProvider.java b/src/main/java/org/orekit/frames/EOPBasedTransformProvider.java index 078c48fe8d9f45b3afb62c59f2de075c5d7abe75..c2442cafb23f3b09c9ca78023a7b26fc6ace4d21 100644 --- a/src/main/java/org/orekit/frames/EOPBasedTransformProvider.java +++ b/src/main/java/org/orekit/frames/EOPBasedTransformProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EOPC04FilesLoader.java b/src/main/java/org/orekit/frames/EOPC04FilesLoader.java index ba6bca26dfb2395868111028e049b2bcc5db84c8..481d14fa69f5a1b1cd75cafdff2e3f7f446aa6b5 100644 --- a/src/main/java/org/orekit/frames/EOPC04FilesLoader.java +++ b/src/main/java/org/orekit/frames/EOPC04FilesLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EOPEntry.java b/src/main/java/org/orekit/frames/EOPEntry.java index 333a653c9e87b542fa64ac8a528b62e3cd7e9927..d114e53921d00e11bd7733e0bdbac0bf8e4897f9 100644 --- a/src/main/java/org/orekit/frames/EOPEntry.java +++ b/src/main/java/org/orekit/frames/EOPEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EOPHistory.java b/src/main/java/org/orekit/frames/EOPHistory.java index 55fb75997e1922b752d94f9c8c41c269563fa509..a6fbe23a4289158aa896b6f06f04236fb59e78be 100644 --- a/src/main/java/org/orekit/frames/EOPHistory.java +++ b/src/main/java/org/orekit/frames/EOPHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EOPHistoryLoader.java b/src/main/java/org/orekit/frames/EOPHistoryLoader.java index ce58ba1754b0a55d6efd206a7930b007ff1c01b7..75932196373443459861923639a65ce8c28e83d0 100644 --- a/src/main/java/org/orekit/frames/EOPHistoryLoader.java +++ b/src/main/java/org/orekit/frames/EOPHistoryLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FactoryManagedFrame.java b/src/main/java/org/orekit/frames/FactoryManagedFrame.java index 5d5eaca2f7abcaf05c9a36a6be4c0b8ea01be240..6670aade82e9acf0be17ef720b017a62b3a93507 100644 --- a/src/main/java/org/orekit/frames/FactoryManagedFrame.java +++ b/src/main/java/org/orekit/frames/FactoryManagedFrame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FieldPoleCorrection.java b/src/main/java/org/orekit/frames/FieldPoleCorrection.java index 14cb1e176d0dc19f87992491960daeb94cb2c76b..181802dba78fab615336d10f4042f6c97a212f90 100644 --- a/src/main/java/org/orekit/frames/FieldPoleCorrection.java +++ b/src/main/java/org/orekit/frames/FieldPoleCorrection.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FieldTransform.java b/src/main/java/org/orekit/frames/FieldTransform.java index 4f3f739b144eab33d375d731456ed9ef1ca4c898..03e2de7eaabdbce3fde8a5400e96c1767dd52ddf 100644 --- a/src/main/java/org/orekit/frames/FieldTransform.java +++ b/src/main/java/org/orekit/frames/FieldTransform.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FieldTransformGenerator.java b/src/main/java/org/orekit/frames/FieldTransformGenerator.java index 988b0de1ed8eafc798fdecc1789313bd9fd3dea4..75474b2028ba798c1f8f48bb0186fff01939f753 100644 --- a/src/main/java/org/orekit/frames/FieldTransformGenerator.java +++ b/src/main/java/org/orekit/frames/FieldTransformGenerator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FixedTransformProvider.java b/src/main/java/org/orekit/frames/FixedTransformProvider.java index e35852159259903147ff52735a1b6d0315aa2438..86cfa9bd8810ae40a5642a691816ea8c89ade0ec 100644 --- a/src/main/java/org/orekit/frames/FixedTransformProvider.java +++ b/src/main/java/org/orekit/frames/FixedTransformProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/Frame.java b/src/main/java/org/orekit/frames/Frame.java index 18e404a730dfd0abe637c195a382cd8c340636f1..aca802e4de5303274713323a74ddb5bba1ab414c 100644 --- a/src/main/java/org/orekit/frames/Frame.java +++ b/src/main/java/org/orekit/frames/Frame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FramesFactory.java b/src/main/java/org/orekit/frames/FramesFactory.java index f0da312558502a82352a08ea8c583d3a78474cb9..4382b40a2decde17736208e890bdf666421a1740 100644 --- a/src/main/java/org/orekit/frames/FramesFactory.java +++ b/src/main/java/org/orekit/frames/FramesFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/GTODProvider.java b/src/main/java/org/orekit/frames/GTODProvider.java index aa4f5ca022f499bd98d019a00faf1cbd02c0ad76..d39f87de87538f4609c8f5fcc423ec275761e04e 100644 --- a/src/main/java/org/orekit/frames/GTODProvider.java +++ b/src/main/java/org/orekit/frames/GTODProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/HelmertTransformation.java b/src/main/java/org/orekit/frames/HelmertTransformation.java index 4d20ff85a57a9a07451969c99e84f66826a46ab3..ac01af1f96ed14e28efa97a20e598f737275e984 100644 --- a/src/main/java/org/orekit/frames/HelmertTransformation.java +++ b/src/main/java/org/orekit/frames/HelmertTransformation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ITRFProvider.java b/src/main/java/org/orekit/frames/ITRFProvider.java index 173efc2e6404d14198253844a9197dfd1d4c359e..10b015828236d9fc244ec5582d1c8bda5c0501c9 100644 --- a/src/main/java/org/orekit/frames/ITRFProvider.java +++ b/src/main/java/org/orekit/frames/ITRFProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ITRFVersion.java b/src/main/java/org/orekit/frames/ITRFVersion.java index d7d1649fb14c252efde50d8d78a48b191d26960b..a5262e8c0b1faeb0e5ed9fe7ab1042a52741050e 100644 --- a/src/main/java/org/orekit/frames/ITRFVersion.java +++ b/src/main/java/org/orekit/frames/ITRFVersion.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ITRFVersionLoader.java b/src/main/java/org/orekit/frames/ITRFVersionLoader.java index 9121048d3ad5cfe03f9f1f4b20f0fafb5e454dfb..e816a3cf558f284d96d82da5b926a455e5c769aa 100644 --- a/src/main/java/org/orekit/frames/ITRFVersionLoader.java +++ b/src/main/java/org/orekit/frames/ITRFVersionLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/InterpolatingTransformProvider.java b/src/main/java/org/orekit/frames/InterpolatingTransformProvider.java index 233b61fa93a1f28a3d38ba07f016beee5d3bf8d2..e839e5695c3d2a2eb3085d323e86c9050bd452bb 100644 --- a/src/main/java/org/orekit/frames/InterpolatingTransformProvider.java +++ b/src/main/java/org/orekit/frames/InterpolatingTransformProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/L1Frame.java b/src/main/java/org/orekit/frames/L1Frame.java index c487af2fd8ac4c817d58ebef6974f8a693a5f40c..c0ba7f845affd750a2390a7698ac3c5b53805713 100644 --- a/src/main/java/org/orekit/frames/L1Frame.java +++ b/src/main/java/org/orekit/frames/L1Frame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/L1TransformProvider.java b/src/main/java/org/orekit/frames/L1TransformProvider.java index fee04ef2ae13843f9e38811430b9cca1fbeb3d1c..10d2bb9e7e4edeae5f61ecad971a58ea1eef1a56 100644 --- a/src/main/java/org/orekit/frames/L1TransformProvider.java +++ b/src/main/java/org/orekit/frames/L1TransformProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/L2Frame.java b/src/main/java/org/orekit/frames/L2Frame.java index 01b3386330292b39e3d4eaf95d979b2d285b2e19..33d879f3a604f934fcce801dc264456be6fab80b 100644 --- a/src/main/java/org/orekit/frames/L2Frame.java +++ b/src/main/java/org/orekit/frames/L2Frame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/L2TransformProvider.java b/src/main/java/org/orekit/frames/L2TransformProvider.java index 13a7b922c8f0245a26bed1d35f5d7628b7d88f8e..d2c805c405b38a3795e8e7018a85e177df2c969b 100644 --- a/src/main/java/org/orekit/frames/L2TransformProvider.java +++ b/src/main/java/org/orekit/frames/L2TransformProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/LOFType.java b/src/main/java/org/orekit/frames/LOFType.java index 78c62643468a40c509be702a09429873cc6d5f85..9779bd752c47c75a84489ce31a044d65cfa10aac 100644 --- a/src/main/java/org/orekit/frames/LOFType.java +++ b/src/main/java/org/orekit/frames/LOFType.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/LocalOrbitalFrame.java b/src/main/java/org/orekit/frames/LocalOrbitalFrame.java index 743150a32373ea430ab964c9d30f143c68d13433..bf46d57ca345de04b2d48b318d274c7305c24215 100644 --- a/src/main/java/org/orekit/frames/LocalOrbitalFrame.java +++ b/src/main/java/org/orekit/frames/LocalOrbitalFrame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/MODProvider.java b/src/main/java/org/orekit/frames/MODProvider.java index f7cc9ece8f31a3dbcd7be9c0644ba8bac67b9c71..3e8ff63efefedd3bea1d035e5f992069c93e8b75 100644 --- a/src/main/java/org/orekit/frames/MODProvider.java +++ b/src/main/java/org/orekit/frames/MODProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/OrphanFrame.java b/src/main/java/org/orekit/frames/OrphanFrame.java index 1f004b45e35e36a504ecf4140e993174823f6371..a5d3078e1d4ef3f5ac8ca20c1f3be0be9d1ac75f 100644 --- a/src/main/java/org/orekit/frames/OrphanFrame.java +++ b/src/main/java/org/orekit/frames/OrphanFrame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/PoleCorrection.java b/src/main/java/org/orekit/frames/PoleCorrection.java index a4c9f4e0c7ded4c2f4f13d3ead296610d538afd6..012fed48d10bec7b342cda1667dfc7ff9debe201 100644 --- a/src/main/java/org/orekit/frames/PoleCorrection.java +++ b/src/main/java/org/orekit/frames/PoleCorrection.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/Predefined.java b/src/main/java/org/orekit/frames/Predefined.java index 90743a1dd36d578a9b76e13cb3c213b8303f506d..0acd822eed1b8210cc2dcafa7ea67bbd69cd438e 100644 --- a/src/main/java/org/orekit/frames/Predefined.java +++ b/src/main/java/org/orekit/frames/Predefined.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/RapidDataAndPredictionColumnsLoader.java b/src/main/java/org/orekit/frames/RapidDataAndPredictionColumnsLoader.java index ac80a495dd5a2bc9406976ee9ccfbe8fac5e356b..fec515f471461b1c927d47bced54f5f9d02d6a21 100644 --- a/src/main/java/org/orekit/frames/RapidDataAndPredictionColumnsLoader.java +++ b/src/main/java/org/orekit/frames/RapidDataAndPredictionColumnsLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/RapidDataAndPredictionXMLLoader.java b/src/main/java/org/orekit/frames/RapidDataAndPredictionXMLLoader.java index a1cba5bd14793d47e9bc119ec6bb168c763d14a4..579e82b471f809abde704154af6df8ad6032fcdf 100644 --- a/src/main/java/org/orekit/frames/RapidDataAndPredictionXMLLoader.java +++ b/src/main/java/org/orekit/frames/RapidDataAndPredictionXMLLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ShiftingTransformProvider.java b/src/main/java/org/orekit/frames/ShiftingTransformProvider.java index b226ec9816546345e3a602a971505eed056b6b56..7d7b1181938dc2b50dda4e60a184dda42eff5aed 100644 --- a/src/main/java/org/orekit/frames/ShiftingTransformProvider.java +++ b/src/main/java/org/orekit/frames/ShiftingTransformProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TEMEProvider.java b/src/main/java/org/orekit/frames/TEMEProvider.java index 25339b6d1c707b426d9b700f5b6d014d4b051e21..5a4d9adcfbcf03d914f6eece3d40f07503241811 100644 --- a/src/main/java/org/orekit/frames/TEMEProvider.java +++ b/src/main/java/org/orekit/frames/TEMEProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TIRFProvider.java b/src/main/java/org/orekit/frames/TIRFProvider.java index 34547c23cab69993e2d24c78f9a971e20f8e4f72..1bf331e7f6d553a9199981bd422864499b39049b 100644 --- a/src/main/java/org/orekit/frames/TIRFProvider.java +++ b/src/main/java/org/orekit/frames/TIRFProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TODProvider.java b/src/main/java/org/orekit/frames/TODProvider.java index b04a98932cd8253c63cfd9015d381dce3af56169..23a2510d5cda4e97ffb011b8c0e292baab4b3e13 100644 --- a/src/main/java/org/orekit/frames/TODProvider.java +++ b/src/main/java/org/orekit/frames/TODProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TopocentricFrame.java b/src/main/java/org/orekit/frames/TopocentricFrame.java index 67a0d886d047f8da16c15ac7f267cbc330f199d6..4eb5a3f2ba375901a2912fc4eaae6a2b40ff8f22 100644 --- a/src/main/java/org/orekit/frames/TopocentricFrame.java +++ b/src/main/java/org/orekit/frames/TopocentricFrame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/Transform.java b/src/main/java/org/orekit/frames/Transform.java index 35791d3540d26ce989951eba0e5efdcc0fe73970..8c94958396205794825f55b4deebd6600494520e 100644 --- a/src/main/java/org/orekit/frames/Transform.java +++ b/src/main/java/org/orekit/frames/Transform.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TransformGenerator.java b/src/main/java/org/orekit/frames/TransformGenerator.java index a0f591d1ac7bbb115b57a9095a75c31a8a95990b..25fd7b17c9a5551dcf39bf7bfa3a4cef73b6785a 100644 --- a/src/main/java/org/orekit/frames/TransformGenerator.java +++ b/src/main/java/org/orekit/frames/TransformGenerator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TransformProvider.java b/src/main/java/org/orekit/frames/TransformProvider.java index bae87b2334624f1527c3fd3c30632092eff83e2f..006a0720106b973762130171c10de8094ecd6c4c 100644 --- a/src/main/java/org/orekit/frames/TransformProvider.java +++ b/src/main/java/org/orekit/frames/TransformProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TransformProviderUtils.java b/src/main/java/org/orekit/frames/TransformProviderUtils.java index c3d5b26aee1dbf63c4d171ba40a23e2996ec7d17..de8421fcbc47803a5a20b788751bd3bd40bb30a9 100644 --- a/src/main/java/org/orekit/frames/TransformProviderUtils.java +++ b/src/main/java/org/orekit/frames/TransformProviderUtils.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/UpdatableFrame.java b/src/main/java/org/orekit/frames/UpdatableFrame.java index 3fac534d78ad883392c2caa2d5b263b04c6d7fc1..293293f9873bf96d350b47b4f7133257961b727b 100644 --- a/src/main/java/org/orekit/frames/UpdatableFrame.java +++ b/src/main/java/org/orekit/frames/UpdatableFrame.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/VEISProvider.java b/src/main/java/org/orekit/frames/VEISProvider.java index 250963b9b93592283a70ac910eae4f4e27b9be3d..972533b17345e64b573e82cb4c8c51b9fbecf721 100644 --- a/src/main/java/org/orekit/frames/VEISProvider.java +++ b/src/main/java/org/orekit/frames/VEISProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/VersionedITRF.java b/src/main/java/org/orekit/frames/VersionedITRF.java index 55881ea04e02c745034f277bc79ed3358ac13571..5ccdcd72cfe7af25cd4f18966fc86ad725555448 100644 --- a/src/main/java/org/orekit/frames/VersionedITRF.java +++ b/src/main/java/org/orekit/frames/VersionedITRF.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/VersionedITRFProvider.java b/src/main/java/org/orekit/frames/VersionedITRFProvider.java index af47ab712ea36565e695193db572b6f3667f22ad..2418b2c6333f66d099c219e0b00d2fb015e5b241 100644 --- a/src/main/java/org/orekit/frames/VersionedITRFProvider.java +++ b/src/main/java/org/orekit/frames/VersionedITRFProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/package-info.java b/src/main/java/org/orekit/frames/package-info.java index ce0c2d83f851da3492c5f4c2829c0e9c898d3cb7..bf30cd4961d8277224e74c245b7b08983047a172 100644 --- a/src/main/java/org/orekit/frames/package-info.java +++ b/src/main/java/org/orekit/frames/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/DOP.java b/src/main/java/org/orekit/gnss/DOP.java index ba48f8ca88a4114b409329235597662288628f43..8a0959fe7089288ea0f2dd6d8e4d2d18ee506531 100644 --- a/src/main/java/org/orekit/gnss/DOP.java +++ b/src/main/java/org/orekit/gnss/DOP.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/DOPComputer.java b/src/main/java/org/orekit/gnss/DOPComputer.java index 7d2b708642abad17531eebf7fa860b0544a14b9d..5b1083850d19d998c835fa137f07c9d5c1fd994c 100644 --- a/src/main/java/org/orekit/gnss/DOPComputer.java +++ b/src/main/java/org/orekit/gnss/DOPComputer.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/Frequency.java b/src/main/java/org/orekit/gnss/Frequency.java index 02234a4c8e93c1b2ccf30a482817bcff16cb4471..0e015371c4d7318a17bbc8a2068c8afffe2882f3 100644 --- a/src/main/java/org/orekit/gnss/Frequency.java +++ b/src/main/java/org/orekit/gnss/Frequency.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/GPSAlmanac.java b/src/main/java/org/orekit/gnss/GPSAlmanac.java index fe6777ea1411a8d07ad8d437d2ee0d428e58554c..b9b17f799599a7f68c40c7c89b2d58ef19e4f213 100644 --- a/src/main/java/org/orekit/gnss/GPSAlmanac.java +++ b/src/main/java/org/orekit/gnss/GPSAlmanac.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/MeasurementType.java b/src/main/java/org/orekit/gnss/MeasurementType.java index 9dd8b560254a972338bc55d0045ba6d744a109a9..8cd0f4a22f0da4a419fc6396b74f213f136d7f62 100644 --- a/src/main/java/org/orekit/gnss/MeasurementType.java +++ b/src/main/java/org/orekit/gnss/MeasurementType.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/ObservationData.java b/src/main/java/org/orekit/gnss/ObservationData.java index 1deac58ddc96e83889818031e866337deda57b53..79b849ad4307bbdf5ff15da27dc59051dace8173 100644 --- a/src/main/java/org/orekit/gnss/ObservationData.java +++ b/src/main/java/org/orekit/gnss/ObservationData.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/ObservationDataSet.java b/src/main/java/org/orekit/gnss/ObservationDataSet.java index 640cb65c12065877319a65fd689e94a09fc8fec8..cd72a99739b2dcaff3835b0cd460d19046c09f37 100644 --- a/src/main/java/org/orekit/gnss/ObservationDataSet.java +++ b/src/main/java/org/orekit/gnss/ObservationDataSet.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/ObservationType.java b/src/main/java/org/orekit/gnss/ObservationType.java index f7631f8f240f9550fae26cc7de18c9cb0e533f2d..7d6fb036e64a4213504ed55f3f83121d3e00ba0a 100644 --- a/src/main/java/org/orekit/gnss/ObservationType.java +++ b/src/main/java/org/orekit/gnss/ObservationType.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/RinexHeader.java b/src/main/java/org/orekit/gnss/RinexHeader.java index fc423d8775c97cb77979280085c4a4abe7151e19..099fc52a20f92e1166499e162151e5ba713eab67 100644 --- a/src/main/java/org/orekit/gnss/RinexHeader.java +++ b/src/main/java/org/orekit/gnss/RinexHeader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/RinexLoader.java b/src/main/java/org/orekit/gnss/RinexLoader.java index 29e59b33a398362694cc0fecc6566d154e20fadf..edb84b064f70296cadabfa81981648c060f08cf7 100644 --- a/src/main/java/org/orekit/gnss/RinexLoader.java +++ b/src/main/java/org/orekit/gnss/RinexLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/SEMParser.java b/src/main/java/org/orekit/gnss/SEMParser.java index ebc6df99e8c9d93d360842b82b1232bc68813ef4..7ec930ba842a9342f28a1deeccd4943bc335e992 100644 --- a/src/main/java/org/orekit/gnss/SEMParser.java +++ b/src/main/java/org/orekit/gnss/SEMParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/SatelliteSystem.java b/src/main/java/org/orekit/gnss/SatelliteSystem.java index 6ac6213e629d102a006050e6b6fadf7a83ee61f7..ee1c20c3d30932286d4e0764f20ddb89fe9aac66 100644 --- a/src/main/java/org/orekit/gnss/SatelliteSystem.java +++ b/src/main/java/org/orekit/gnss/SatelliteSystem.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/YUMAParser.java b/src/main/java/org/orekit/gnss/YUMAParser.java index cc24b52b7e2d34ede0089c7429f27dd68e2b24c8..f6305150cf6a02e22a69d88a0353a9ca272740fd 100644 --- a/src/main/java/org/orekit/gnss/YUMAParser.java +++ b/src/main/java/org/orekit/gnss/YUMAParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/Antenna.java b/src/main/java/org/orekit/gnss/antenna/Antenna.java index 76ab165c711dbd084265a457ef2fb8cbca22d4d4..bd3e529a1e9de04767f84e33d3f0d7b04fcb989c 100644 --- a/src/main/java/org/orekit/gnss/antenna/Antenna.java +++ b/src/main/java/org/orekit/gnss/antenna/Antenna.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/AntexLoader.java b/src/main/java/org/orekit/gnss/antenna/AntexLoader.java index 60c5f1bfee4e6e3d9dc19d97ad8b000030f3fd78..03b6b0fafc8d167477fdf4dbac95a8ae14a5470c 100644 --- a/src/main/java/org/orekit/gnss/antenna/AntexLoader.java +++ b/src/main/java/org/orekit/gnss/antenna/AntexLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/FrequencyPattern.java b/src/main/java/org/orekit/gnss/antenna/FrequencyPattern.java index 1652e66aab461283948672b5bd0637e1fccb6256..2e65a7cafd0bbaedc03a0cb024f6b45caa017cf8 100644 --- a/src/main/java/org/orekit/gnss/antenna/FrequencyPattern.java +++ b/src/main/java/org/orekit/gnss/antenna/FrequencyPattern.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/OneDVariation.java b/src/main/java/org/orekit/gnss/antenna/OneDVariation.java index 278088658708b17ddd882752a0e6ed5e9f556e2a..e9fde413710c3bae013965ca5e177356bb308404 100644 --- a/src/main/java/org/orekit/gnss/antenna/OneDVariation.java +++ b/src/main/java/org/orekit/gnss/antenna/OneDVariation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/PhaseCenterVariationFunction.java b/src/main/java/org/orekit/gnss/antenna/PhaseCenterVariationFunction.java index a7dcaa138368cbf1a2c70558ad371714105a6a51..b991e592354906113e4aa407ef10194f59994af6 100644 --- a/src/main/java/org/orekit/gnss/antenna/PhaseCenterVariationFunction.java +++ b/src/main/java/org/orekit/gnss/antenna/PhaseCenterVariationFunction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/ReceiverAntenna.java b/src/main/java/org/orekit/gnss/antenna/ReceiverAntenna.java index 13a5aa600d85ab7d72000bb2e16a9a27a6941cae..4a7556b798ff2d28325f5ff4164dfb4249c55e21 100644 --- a/src/main/java/org/orekit/gnss/antenna/ReceiverAntenna.java +++ b/src/main/java/org/orekit/gnss/antenna/ReceiverAntenna.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/SatelliteAntenna.java b/src/main/java/org/orekit/gnss/antenna/SatelliteAntenna.java index 16d351ab79e0399f260d5041d8db351b618e7bda..dd6fafadd073c43cd5281f18cc69190746c5e640 100644 --- a/src/main/java/org/orekit/gnss/antenna/SatelliteAntenna.java +++ b/src/main/java/org/orekit/gnss/antenna/SatelliteAntenna.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/SatelliteAntennaCode.java b/src/main/java/org/orekit/gnss/antenna/SatelliteAntennaCode.java index 9e99d1e510abeaeca6b1f9c378476461ed4699a2..c6355842fc9127c1151958819237987e404f712c 100644 --- a/src/main/java/org/orekit/gnss/antenna/SatelliteAntennaCode.java +++ b/src/main/java/org/orekit/gnss/antenna/SatelliteAntennaCode.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/SatelliteType.java b/src/main/java/org/orekit/gnss/antenna/SatelliteType.java index 0199a624d23275d05ea8a77e0d34e06cb77462a6..8bd5ea18c2ebbbf5d6a978e4715cdb8abefac053 100644 --- a/src/main/java/org/orekit/gnss/antenna/SatelliteType.java +++ b/src/main/java/org/orekit/gnss/antenna/SatelliteType.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/TwoDVariation.java b/src/main/java/org/orekit/gnss/antenna/TwoDVariation.java index 7d7b2ce3fd8b0349c8c5a85fcb60624aa447385a..709928fe48f9b01dd0bd9f95155f046b31eb9e31 100644 --- a/src/main/java/org/orekit/gnss/antenna/TwoDVariation.java +++ b/src/main/java/org/orekit/gnss/antenna/TwoDVariation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/package-info.java b/src/main/java/org/orekit/gnss/antenna/package-info.java index 457a33ec541da397715e9cc1f3f27b2b521df269..3a3a8bf113158ac718d2aed3a716658446cadc7c 100644 --- a/src/main/java/org/orekit/gnss/antenna/package-info.java +++ b/src/main/java/org/orekit/gnss/antenna/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/AbstractGNSSAttitudeProvider.java b/src/main/java/org/orekit/gnss/attitude/AbstractGNSSAttitudeProvider.java index b96deaa0950e58e9a0edad61196545893619da06..b2c9864d730a8d29c8fe0f3527848434036d5d8d 100644 --- a/src/main/java/org/orekit/gnss/attitude/AbstractGNSSAttitudeProvider.java +++ b/src/main/java/org/orekit/gnss/attitude/AbstractGNSSAttitudeProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/BeidouGeo.java b/src/main/java/org/orekit/gnss/attitude/BeidouGeo.java index 82dea467af0334045b86093ab39906fb93c06957..3808d8961b8f48d8b01575730b22f9f55277d3c1 100644 --- a/src/main/java/org/orekit/gnss/attitude/BeidouGeo.java +++ b/src/main/java/org/orekit/gnss/attitude/BeidouGeo.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/BeidouIGSO.java b/src/main/java/org/orekit/gnss/attitude/BeidouIGSO.java index f4e5798b93dfc35c3157854e584df2495f5596a2..33e9182778e4052c0fe3aa15f88c190249feb25b 100644 --- a/src/main/java/org/orekit/gnss/attitude/BeidouIGSO.java +++ b/src/main/java/org/orekit/gnss/attitude/BeidouIGSO.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/BeidouMeo.java b/src/main/java/org/orekit/gnss/attitude/BeidouMeo.java index b46d89e20be768acf7cfe3b344cea9641baf99dd..59d72a173b85d1d48ea68f5f3eb8bb1a3cb80631 100644 --- a/src/main/java/org/orekit/gnss/attitude/BeidouMeo.java +++ b/src/main/java/org/orekit/gnss/attitude/BeidouMeo.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/FieldTurnSpan.java b/src/main/java/org/orekit/gnss/attitude/FieldTurnSpan.java index 50251e560061e6566399c40c23eaf6da6bdf053a..8b29972074896b71ceaf2044ce86d2ddc2a9c7d4 100644 --- a/src/main/java/org/orekit/gnss/attitude/FieldTurnSpan.java +++ b/src/main/java/org/orekit/gnss/attitude/FieldTurnSpan.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GNSSAttitudeContext.java b/src/main/java/org/orekit/gnss/attitude/GNSSAttitudeContext.java index add92752c57dfd0c2048bda0950e3ddf8333027b..f5046d90351c06484697c36d2f4031a913b6d60b 100644 --- a/src/main/java/org/orekit/gnss/attitude/GNSSAttitudeContext.java +++ b/src/main/java/org/orekit/gnss/attitude/GNSSAttitudeContext.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GNSSAttitudeProvider.java b/src/main/java/org/orekit/gnss/attitude/GNSSAttitudeProvider.java index 23993f660c5a6b01514a64dd4616ce68a5e3ec5d..1462737935dea9d6b4e5e66220e83e137610e88c 100644 --- a/src/main/java/org/orekit/gnss/attitude/GNSSAttitudeProvider.java +++ b/src/main/java/org/orekit/gnss/attitude/GNSSAttitudeProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GNSSFieldAttitudeContext.java b/src/main/java/org/orekit/gnss/attitude/GNSSFieldAttitudeContext.java index 0f238257348ab4208adcd8dfd02a8eed8a3cee2d..d90837a42d1696c8467c0c4f3ea097f9a425a00a 100644 --- a/src/main/java/org/orekit/gnss/attitude/GNSSFieldAttitudeContext.java +++ b/src/main/java/org/orekit/gnss/attitude/GNSSFieldAttitudeContext.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GPSBlockIIA.java b/src/main/java/org/orekit/gnss/attitude/GPSBlockIIA.java index 74d72060b04f99159623ded3117c8e9764efba3e..e491faa9630fad01d2da9ff28b69e82db859dd26 100644 --- a/src/main/java/org/orekit/gnss/attitude/GPSBlockIIA.java +++ b/src/main/java/org/orekit/gnss/attitude/GPSBlockIIA.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GPSBlockIIF.java b/src/main/java/org/orekit/gnss/attitude/GPSBlockIIF.java index 7838b7fe16bfc8d185940ba3906781db32c850be..0b381f4ddd6424639f834895a519e7b226a125ec 100644 --- a/src/main/java/org/orekit/gnss/attitude/GPSBlockIIF.java +++ b/src/main/java/org/orekit/gnss/attitude/GPSBlockIIF.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GPSBlockIIR.java b/src/main/java/org/orekit/gnss/attitude/GPSBlockIIR.java index 1548ccab28e7ad51d73da40191fb95bb3d31553d..f29188150b710ca04cdc06f30ee8c466d78a1d33 100644 --- a/src/main/java/org/orekit/gnss/attitude/GPSBlockIIR.java +++ b/src/main/java/org/orekit/gnss/attitude/GPSBlockIIR.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/Galileo.java b/src/main/java/org/orekit/gnss/attitude/Galileo.java index 64f5abc1fa63f0d508f311bcf3f66e79c7f8a745..7bc304d9c4459ae45757e21cfb72cc0e18f2bb13 100644 --- a/src/main/java/org/orekit/gnss/attitude/Galileo.java +++ b/src/main/java/org/orekit/gnss/attitude/Galileo.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GenericGNSS.java b/src/main/java/org/orekit/gnss/attitude/GenericGNSS.java index d9d193f57e6d55e2b7d68f3f61c9aa7c06dc09ed..9768bf83bcbf32976d9fb904681436ce2e66f5cd 100644 --- a/src/main/java/org/orekit/gnss/attitude/GenericGNSS.java +++ b/src/main/java/org/orekit/gnss/attitude/GenericGNSS.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/Glonass.java b/src/main/java/org/orekit/gnss/attitude/Glonass.java index ab70c72abfbb605254cee806fde584c9d436161c..8b761c1aea2602576a01ffce1344c6e07cb45d60 100644 --- a/src/main/java/org/orekit/gnss/attitude/Glonass.java +++ b/src/main/java/org/orekit/gnss/attitude/Glonass.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/TurnSpan.java b/src/main/java/org/orekit/gnss/attitude/TurnSpan.java index 995c4b7d0f23151fe2b5bd1007922907edf6adc4..5cccdcef893fffe8f7c6810b4d9170e44875e493 100644 --- a/src/main/java/org/orekit/gnss/attitude/TurnSpan.java +++ b/src/main/java/org/orekit/gnss/attitude/TurnSpan.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/package-info.java b/src/main/java/org/orekit/gnss/attitude/package-info.java index 5e24bc49f62473b8ed8ea9d2c67e12ca8cc31833..6a10a219c70e4fe97c6a376bccb96a90c527cde7 100644 --- a/src/main/java/org/orekit/gnss/attitude/package-info.java +++ b/src/main/java/org/orekit/gnss/attitude/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/package-info.java b/src/main/java/org/orekit/gnss/package-info.java index 2dbf35d035fd699eaaf7887d689877f5bfb5d13f..a01ca1e8acbcbfb0d6f9ae967fb84e257a95f33f 100644 --- a/src/main/java/org/orekit/gnss/package-info.java +++ b/src/main/java/org/orekit/gnss/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/IonosphericModel.java b/src/main/java/org/orekit/models/earth/IonosphericModel.java index a893648c1a5e364037d092e75af876679c291aeb..ea8461fa19deadb37caa91268122a2b11ed28cef 100644 --- a/src/main/java/org/orekit/models/earth/IonosphericModel.java +++ b/src/main/java/org/orekit/models/earth/IonosphericModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/KlobucharIonoCoefficientsLoader.java b/src/main/java/org/orekit/models/earth/KlobucharIonoCoefficientsLoader.java index 0fb49bfe0323bc339925d363fa93a0e4dca6ccc7..c1b3ede97b011d581aa9c946f1c07a9079f67270 100644 --- a/src/main/java/org/orekit/models/earth/KlobucharIonoCoefficientsLoader.java +++ b/src/main/java/org/orekit/models/earth/KlobucharIonoCoefficientsLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/KlobucharIonoModel.java b/src/main/java/org/orekit/models/earth/KlobucharIonoModel.java index 117b6329b46e4f17cbffbdca2476b8753c202d93..f7eab06a3eea598277b8971fea35661fae2630d3 100644 --- a/src/main/java/org/orekit/models/earth/KlobucharIonoModel.java +++ b/src/main/java/org/orekit/models/earth/KlobucharIonoModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/MariniMurrayModel.java b/src/main/java/org/orekit/models/earth/MariniMurrayModel.java index 6b8655a74fa7d7c068d97c7dd521fd907307e9d6..033b5d4a0ede98fe83a6e54285d86f1bf7b38d8a 100644 --- a/src/main/java/org/orekit/models/earth/MariniMurrayModel.java +++ b/src/main/java/org/orekit/models/earth/MariniMurrayModel.java @@ -67,13 +67,13 @@ public class MariniMurrayModel implements TroposphericModel { /** Create a new Marini-Murray model using a standard atmosphere model. * * <ul> - * <li>temperature: 20 degree Celsius - * <li>pressure: 1013.25 mbar - * <li>humidity: 50% + * <li>temperature: 20 degree Celsius</li> + * <li>pressure: 1013.25 mbar</li> + * <li>humidity: 50%</li> * </ul> * * @param latitude site latitude - * @param lambda laser wavelength, nm + * @param lambda laser wavelength (c/f), nm * * @return a Marini-Murray model with standard environmental values */ diff --git a/src/main/java/org/orekit/models/earth/displacement/OceanLoading.java b/src/main/java/org/orekit/models/earth/displacement/OceanLoading.java index dfa63feba0098c5d8fc60d0c685e0797525950ee..5aaf19973c026d826b254788871dfd5f8229d5bd 100644 --- a/src/main/java/org/orekit/models/earth/displacement/OceanLoading.java +++ b/src/main/java/org/orekit/models/earth/displacement/OceanLoading.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/displacement/OceanLoadingCoefficients.java b/src/main/java/org/orekit/models/earth/displacement/OceanLoadingCoefficients.java index 1d36a94a25670fa8787bfd2d76299417fa6a2c33..529a3f0b6bf9e427bfd52e873bba675eb0fcb128 100644 --- a/src/main/java/org/orekit/models/earth/displacement/OceanLoadingCoefficients.java +++ b/src/main/java/org/orekit/models/earth/displacement/OceanLoadingCoefficients.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/displacement/OceanLoadingCoefficientsBLQFactory.java b/src/main/java/org/orekit/models/earth/displacement/OceanLoadingCoefficientsBLQFactory.java index 7cf6b1c1e4204edf57e86f5aba43eb5e0cebb77c..7464c16651c0d61244ba51ba954f1ecac378f036 100644 --- a/src/main/java/org/orekit/models/earth/displacement/OceanLoadingCoefficientsBLQFactory.java +++ b/src/main/java/org/orekit/models/earth/displacement/OceanLoadingCoefficientsBLQFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/displacement/StationDisplacement.java b/src/main/java/org/orekit/models/earth/displacement/StationDisplacement.java index 67cb1b7e61a61749852b93a438d6a889ca76d126..ef5d01c89496469b4f1bd15e99c47d762d1d2faf 100644 --- a/src/main/java/org/orekit/models/earth/displacement/StationDisplacement.java +++ b/src/main/java/org/orekit/models/earth/displacement/StationDisplacement.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/displacement/TidalDisplacement.java b/src/main/java/org/orekit/models/earth/displacement/TidalDisplacement.java index 86b17b826c56d179d2ef63e0aa57c68342871886..3b6541369eff60c7a4049cf9f8c0bce411544d32 100644 --- a/src/main/java/org/orekit/models/earth/displacement/TidalDisplacement.java +++ b/src/main/java/org/orekit/models/earth/displacement/TidalDisplacement.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/displacement/Tide.java b/src/main/java/org/orekit/models/earth/displacement/Tide.java index f07ee04cc10f2db182f7e28c053a6a5ef91f2b9d..6dcccfed5c2c38e1ae4c6d4fc7cbbb04cc3994b0 100644 --- a/src/main/java/org/orekit/models/earth/displacement/Tide.java +++ b/src/main/java/org/orekit/models/earth/displacement/Tide.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/displacement/package-info.java b/src/main/java/org/orekit/models/earth/displacement/package-info.java index 109081c4030c320ab41fa4a46132b1e8be35adde..32a99820edb48cc5983d99c7a0295ca8a4a6aa1c 100644 --- a/src/main/java/org/orekit/models/earth/displacement/package-info.java +++ b/src/main/java/org/orekit/models/earth/displacement/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/package-info.java b/src/main/java/org/orekit/models/earth/package-info.java index 5aae7cf81694a33aca810fbb77a6392585feae6a..21dc0c78d2f9f72bf6ef565b9c8d8534a35891d6 100644 --- a/src/main/java/org/orekit/models/earth/package-info.java +++ b/src/main/java/org/orekit/models/earth/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/AlongTrackAiming.java b/src/main/java/org/orekit/models/earth/tessellation/AlongTrackAiming.java index 9e689099ec4446b77a49f676774b9508f87393dc..0731fe17490ac4585eeb4fa0c0588e8f06244a41 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/AlongTrackAiming.java +++ b/src/main/java/org/orekit/models/earth/tessellation/AlongTrackAiming.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/ConstantAzimuthAiming.java b/src/main/java/org/orekit/models/earth/tessellation/ConstantAzimuthAiming.java index 7db9575c02a1cde27f55e902092483ae08565d9f..7ea438889d3bcf55d97ab988d242b427912aa910 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/ConstantAzimuthAiming.java +++ b/src/main/java/org/orekit/models/earth/tessellation/ConstantAzimuthAiming.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/Direction.java b/src/main/java/org/orekit/models/earth/tessellation/Direction.java index 0540a5ac78301fa15fc0d499125c907c9b5b9939..8a0ca9d720a6b7340041a964a0734b314c84f300 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/Direction.java +++ b/src/main/java/org/orekit/models/earth/tessellation/Direction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/EllipsoidTessellator.java b/src/main/java/org/orekit/models/earth/tessellation/EllipsoidTessellator.java index a4185729257eabd62cb50ac2b074a90dad818cd5..cdc56035e9b42d140f0151385e6a96a429715604 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/EllipsoidTessellator.java +++ b/src/main/java/org/orekit/models/earth/tessellation/EllipsoidTessellator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/HalfTrackSampler.java b/src/main/java/org/orekit/models/earth/tessellation/HalfTrackSampler.java index 673bae758cc463cb8fd65ec94264271be5247339..7755cd8b7864dc5d95f423f1a1eec0f8f239090b 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/HalfTrackSampler.java +++ b/src/main/java/org/orekit/models/earth/tessellation/HalfTrackSampler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/HalfTrackSpanHandler.java b/src/main/java/org/orekit/models/earth/tessellation/HalfTrackSpanHandler.java index e3d9823119c3c1d30197e7d952db18bb5e882ea7..5f7cf2434a86ab0104dd9e105aad54795f410d2d 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/HalfTrackSpanHandler.java +++ b/src/main/java/org/orekit/models/earth/tessellation/HalfTrackSpanHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/InsidePointFinder.java b/src/main/java/org/orekit/models/earth/tessellation/InsidePointFinder.java index 73ef0a0871ec0c067eb71016ff2bdfbfeaa9023b..f63f814c69a0f723baff8083b8c0aac60d28e861 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/InsidePointFinder.java +++ b/src/main/java/org/orekit/models/earth/tessellation/InsidePointFinder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/Mesh.java b/src/main/java/org/orekit/models/earth/tessellation/Mesh.java index 43f1b756fa27ea6ece685d4246566972f2a14def..98dc396cf2918acf82675298fc7e48d3425b1637 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/Mesh.java +++ b/src/main/java/org/orekit/models/earth/tessellation/Mesh.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/Tile.java b/src/main/java/org/orekit/models/earth/tessellation/Tile.java index d337388765d82aaf32534fc709f26bd4454a6143..592a3d306143f403901a61e36163fd9d96c53860 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/Tile.java +++ b/src/main/java/org/orekit/models/earth/tessellation/Tile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/TileAiming.java b/src/main/java/org/orekit/models/earth/tessellation/TileAiming.java index eb5929b5d2767e8f26f7a3145ba446aa555350e5..6e0afbdcacd181c15a01605b6491abdefeb7777d 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/TileAiming.java +++ b/src/main/java/org/orekit/models/earth/tessellation/TileAiming.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/package-info.java b/src/main/java/org/orekit/models/earth/tessellation/package-info.java index ff59d899b8a5b0d4f32af61c5f64bdfabfdf350e..e630b08a7740e7a333b0ed3db5d5a3a43739e422 100644 --- a/src/main/java/org/orekit/models/earth/tessellation/package-info.java +++ b/src/main/java/org/orekit/models/earth/tessellation/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/package-info.java b/src/main/java/org/orekit/models/package-info.java index 83126d920ca382d28433a116587ea4ea5222920d..b263ecc78edba0f6142912227788d53c4b046079 100644 --- a/src/main/java/org/orekit/models/package-info.java +++ b/src/main/java/org/orekit/models/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/CartesianOrbit.java b/src/main/java/org/orekit/orbits/CartesianOrbit.java index 80a6cfedf8f587492b0af8025b855435f633160e..d56cb18ec126e34254bf0cf58dd656ea19a27357 100644 --- a/src/main/java/org/orekit/orbits/CartesianOrbit.java +++ b/src/main/java/org/orekit/orbits/CartesianOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/CircularOrbit.java b/src/main/java/org/orekit/orbits/CircularOrbit.java index 8a8a021664167b05b4863654febc55a541ebd5bb..65c509340fbd09f41a47afd9d29e4a96facb2fd4 100644 --- a/src/main/java/org/orekit/orbits/CircularOrbit.java +++ b/src/main/java/org/orekit/orbits/CircularOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/EquinoctialOrbit.java b/src/main/java/org/orekit/orbits/EquinoctialOrbit.java index f921739c99edfaa1f0f48955892a212c31ca2ece..250f9bc3398f246aceceefb3a718a5d1f0fbd139 100644 --- a/src/main/java/org/orekit/orbits/EquinoctialOrbit.java +++ b/src/main/java/org/orekit/orbits/EquinoctialOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldCartesianOrbit.java b/src/main/java/org/orekit/orbits/FieldCartesianOrbit.java index 99d67b0494f6f95cb5d627e1ce79d9988f18da75..502e1d23dda8784e2a94b4a76a587c5c25df81f3 100644 --- a/src/main/java/org/orekit/orbits/FieldCartesianOrbit.java +++ b/src/main/java/org/orekit/orbits/FieldCartesianOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldCircularOrbit.java b/src/main/java/org/orekit/orbits/FieldCircularOrbit.java index e8e2e195cb3024e8bea17d9975116527b3bbc2b8..c9d27be4d9b20a7d8a0d44b1327b35ba987cb5c5 100644 --- a/src/main/java/org/orekit/orbits/FieldCircularOrbit.java +++ b/src/main/java/org/orekit/orbits/FieldCircularOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldEquinoctialOrbit.java b/src/main/java/org/orekit/orbits/FieldEquinoctialOrbit.java index e1cb221095dd86ad80d5663887ef99f61f678205..88579dda8855fa961436ec1a205b9bf80a900cb1 100644 --- a/src/main/java/org/orekit/orbits/FieldEquinoctialOrbit.java +++ b/src/main/java/org/orekit/orbits/FieldEquinoctialOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldKeplerianOrbit.java b/src/main/java/org/orekit/orbits/FieldKeplerianOrbit.java index cf18ca8e06c1c20fe5bd9b351f9972fc7494b39f..70c5ade2a96a6c956e5e25ce109b20f8fb1d6692 100644 --- a/src/main/java/org/orekit/orbits/FieldKeplerianOrbit.java +++ b/src/main/java/org/orekit/orbits/FieldKeplerianOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldOrbit.java b/src/main/java/org/orekit/orbits/FieldOrbit.java index 917cf22dff34cd2c9aebf56ed5404d0507f47dbe..2ec80031f8e7790d0ea1bb97f754bc4913f70550 100644 --- a/src/main/java/org/orekit/orbits/FieldOrbit.java +++ b/src/main/java/org/orekit/orbits/FieldOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/KeplerianOrbit.java b/src/main/java/org/orekit/orbits/KeplerianOrbit.java index 1c1c7065fa78658222d44bf34f6afb4136bb3e65..7881edb323370737651212321191a016129bd25c 100644 --- a/src/main/java/org/orekit/orbits/KeplerianOrbit.java +++ b/src/main/java/org/orekit/orbits/KeplerianOrbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/Orbit.java b/src/main/java/org/orekit/orbits/Orbit.java index 0861b6cab4596e0b5ee6094731ebb2261906918a..10e791fe43b4e81b3560804864f966f65c6065fa 100644 --- a/src/main/java/org/orekit/orbits/Orbit.java +++ b/src/main/java/org/orekit/orbits/Orbit.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/OrbitType.java b/src/main/java/org/orekit/orbits/OrbitType.java index c6492940124bdc23aa2b41fc1b794adfc3987dc8..bc3e0a47e96efdeee714bbc7e579ee97217c40ff 100644 --- a/src/main/java/org/orekit/orbits/OrbitType.java +++ b/src/main/java/org/orekit/orbits/OrbitType.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/PositionAngle.java b/src/main/java/org/orekit/orbits/PositionAngle.java index 23573c739ebd71c79100cf87ae2c43711ee047df..715c07731146a8075e412779044123d62953a5a4 100644 --- a/src/main/java/org/orekit/orbits/PositionAngle.java +++ b/src/main/java/org/orekit/orbits/PositionAngle.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/package-info.java b/src/main/java/org/orekit/orbits/package-info.java index ddd761f07d5af43cdad8a5ecf50093776443da9b..b6825f254f7e65a75c8dba00d5127409cdcfb18a 100644 --- a/src/main/java/org/orekit/orbits/package-info.java +++ b/src/main/java/org/orekit/orbits/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/overview.html b/src/main/java/org/orekit/overview.html index df9099674512aad4f4d9a80fbdefbd72d26ab8ea..f8b5e7cc180e8849379a76c16dacfa8bf7ae0b9a 100644 --- a/src/main/java/org/orekit/overview.html +++ b/src/main/java/org/orekit/overview.html @@ -208,8 +208,8 @@ discrete events. Here is a short list of the features offered by the library:</p <li>orbital parameters estimation (or only a subset if desired)</li> <li>force model parameters estimation (drag coefficients, radiation pressure coefficients, central attraction, maneuver thrust or flow rate)</li> - <li>measurements parameters estimation (biases, station position, pole motion and rate, - prime meridian correction and rate)</li> + <li>measurements parameters estimation (biases, satellite clock offset, station clock offset, + station position, pole motion and rate, prime meridian correction and rate)</li> </ul> </li> <li>multi-satellites orbit determination</li> diff --git a/src/main/java/org/orekit/propagation/AbstractPropagator.java b/src/main/java/org/orekit/propagation/AbstractPropagator.java index 345986701b763f263180f7146f69170f2950bfbe..3cd4d834e24a664c62414bfb343bf424a5d57e05 100644 --- a/src/main/java/org/orekit/propagation/AbstractPropagator.java +++ b/src/main/java/org/orekit/propagation/AbstractPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/AdditionalStateProvider.java b/src/main/java/org/orekit/propagation/AdditionalStateProvider.java index 61eb047b3a21fc92b62961b5ecfb7feec869310b..d227fa19e08c57e009fc4c8d1215dccd9346ecc6 100644 --- a/src/main/java/org/orekit/propagation/AdditionalStateProvider.java +++ b/src/main/java/org/orekit/propagation/AdditionalStateProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/BoundedPropagator.java b/src/main/java/org/orekit/propagation/BoundedPropagator.java index 492aa770db9831d7d4cb30d7a74fe668173dfecd..223e5c4cd4aa19aa6b12291b17eb8de0e29e3928 100644 --- a/src/main/java/org/orekit/propagation/BoundedPropagator.java +++ b/src/main/java/org/orekit/propagation/BoundedPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/FieldAbstractPropagator.java b/src/main/java/org/orekit/propagation/FieldAbstractPropagator.java index c5656a90245a6de5a53cda7e1c5942741e38cb48..754273a666a0a3718eb62ba4f9136f5f1dc7ded5 100644 --- a/src/main/java/org/orekit/propagation/FieldAbstractPropagator.java +++ b/src/main/java/org/orekit/propagation/FieldAbstractPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/FieldAdditionalStateProvider.java b/src/main/java/org/orekit/propagation/FieldAdditionalStateProvider.java index 2adc5e12ed90ba8cf1fd2694766153ec379fc880..d1c421bb0c1bcf673a09ad84527ee4f15657ec18 100644 --- a/src/main/java/org/orekit/propagation/FieldAdditionalStateProvider.java +++ b/src/main/java/org/orekit/propagation/FieldAdditionalStateProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/FieldBoundedPropagator.java b/src/main/java/org/orekit/propagation/FieldBoundedPropagator.java index f0773e9a48814e9ca53ab6ffeadf70baa3c3348c..aa77d2d4e88177c53c28985da7574cb1b79f9b66 100644 --- a/src/main/java/org/orekit/propagation/FieldBoundedPropagator.java +++ b/src/main/java/org/orekit/propagation/FieldBoundedPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/FieldPropagator.java b/src/main/java/org/orekit/propagation/FieldPropagator.java index 85f9876613765ffebde1d903808d33df8bed89d7..a0c3635e4558e96bbaea3601aafc514a11624c60 100644 --- a/src/main/java/org/orekit/propagation/FieldPropagator.java +++ b/src/main/java/org/orekit/propagation/FieldPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/FieldSpacecraftState.java b/src/main/java/org/orekit/propagation/FieldSpacecraftState.java index 27da00e2f60b4d2751c30e94b1d91c23cac8c73f..1751f8aa4a402099b3896e95a0fb2ed2de7887d9 100644 --- a/src/main/java/org/orekit/propagation/FieldSpacecraftState.java +++ b/src/main/java/org/orekit/propagation/FieldSpacecraftState.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/Propagator.java b/src/main/java/org/orekit/propagation/Propagator.java index cb5345d706e9c58f127155cf98bd2072805879a5..1b83b05c37f6c03476c984455bb72d3b7751553b 100644 --- a/src/main/java/org/orekit/propagation/Propagator.java +++ b/src/main/java/org/orekit/propagation/Propagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,7 +37,17 @@ import org.orekit.utils.PVCoordinatesProvider; * using rich force models and by continuous models built after numerical * integration has been completed and dense output data as been * gathered.</p> - + * <p>Note that one single propagator cannot be called from multiple threads. + * Its configuration can be changed as there is at least a {@link + * #resetInitialState(SpacecraftState)} method, and even propagators that do + * not support resetting state (like the {@link + * org.orekit.propagation.analytical.tle.TLEPropagator TLEPropagator} do + * cache some internal data during computation. However, as long as they + * are configured with independent building blocks (mainly event handlers + * and step handlers that may preserve some internal state), and as long + * as they are called from one thread only, they <em>can</em> be used in + * multi-threaded applications. Synchronizing several propagators to run in + * parallel is also possible using {@link PropagatorsParallelizer}.</p> * @author Luc Maisonobe * @author Véronique Pommier-Maurussane * diff --git a/src/main/java/org/orekit/propagation/PropagatorsParallelizer.java b/src/main/java/org/orekit/propagation/PropagatorsParallelizer.java index 422509a3295d578a38fd9eefbda4d68535a2772a..9e9d246e8d22a133bc5d0a8bb66eef7480e91311 100644 --- a/src/main/java/org/orekit/propagation/PropagatorsParallelizer.java +++ b/src/main/java/org/orekit/propagation/PropagatorsParallelizer.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/SpacecraftState.java b/src/main/java/org/orekit/propagation/SpacecraftState.java index 30374a9c2a70e83801ebaacfa6fbd3ccb85054f6..50810e8ab08a2151f793adc53c1d230ad65f4fd5 100644 --- a/src/main/java/org/orekit/propagation/SpacecraftState.java +++ b/src/main/java/org/orekit/propagation/SpacecraftState.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -518,8 +518,8 @@ public class SpacecraftState return orbit.getHy(); } - /** Get the true latitude argument (as per equinoctial parameters). - * @return v + ω + Ω true latitude argument (rad) + /** Get the true longitude argument (as per equinoctial parameters). + * @return v + ω + Ω true longitude argument (rad) * @see #getLE() * @see #getLM() */ @@ -527,8 +527,8 @@ public class SpacecraftState return orbit.getLv(); } - /** Get the eccentric latitude argument (as per equinoctial parameters). - * @return E + ω + Ω eccentric latitude argument (rad) + /** Get the eccentric longitude argument (as per equinoctial parameters). + * @return E + ω + Ω eccentric longitude argument (rad) * @see #getLv() * @see #getLM() */ @@ -536,8 +536,8 @@ public class SpacecraftState return orbit.getLE(); } - /** Get the mean latitude argument (as per equinoctial parameters). - * @return M + ω + Ω mean latitude argument (rad) + /** Get the mean longitude argument (as per equinoctial parameters). + * @return M + ω + Ω mean longitude argument (rad) * @see #getLv() * @see #getLE() */ diff --git a/src/main/java/org/orekit/propagation/analytical/AbstractAnalyticalPropagator.java b/src/main/java/org/orekit/propagation/analytical/AbstractAnalyticalPropagator.java index 7a1a507b2e2461c9df2c95cfa9255188d3d8ee3c..d21b8f100611440d2f6a64b20d0d68ad1f26ca68 100644 --- a/src/main/java/org/orekit/propagation/analytical/AbstractAnalyticalPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/AbstractAnalyticalPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/AdapterPropagator.java b/src/main/java/org/orekit/propagation/analytical/AdapterPropagator.java index aa15c3a70ac25bc4b0759fe3054620c5967f9b86..06b0a4295bd029be2fd97b111ec54bdecd94705f 100644 --- a/src/main/java/org/orekit/propagation/analytical/AdapterPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/AdapterPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/EcksteinHechlerPropagator.java b/src/main/java/org/orekit/propagation/analytical/EcksteinHechlerPropagator.java index 43515ef72f1bfc0475d32b5ad2436a568c31575f..1ead708c15c8124efd31e7f96216ae671ccda325 100644 --- a/src/main/java/org/orekit/propagation/analytical/EcksteinHechlerPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/EcksteinHechlerPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/Ephemeris.java b/src/main/java/org/orekit/propagation/analytical/Ephemeris.java index f6e2ea90671387d51322df047683f466f942ceff..e5e2f16eb8e9afe1349dd071f449b9e28475097d 100644 --- a/src/main/java/org/orekit/propagation/analytical/Ephemeris.java +++ b/src/main/java/org/orekit/propagation/analytical/Ephemeris.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/FieldAbstractAnalyticalPropagator.java b/src/main/java/org/orekit/propagation/analytical/FieldAbstractAnalyticalPropagator.java index ea2a64606e1e93a2b40eb23574ee0b0011c5f8ab..a0b352c0a4f288dcd6f80f16445d8758ddfbf9af 100644 --- a/src/main/java/org/orekit/propagation/analytical/FieldAbstractAnalyticalPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/FieldAbstractAnalyticalPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/FieldEcksteinHechlerPropagator.java b/src/main/java/org/orekit/propagation/analytical/FieldEcksteinHechlerPropagator.java index 419c2e4adb6b8b64b4db36bb752db2f3dd67df86..20e4943ffa4ff36d26af045605d71094eb5aacab 100644 --- a/src/main/java/org/orekit/propagation/analytical/FieldEcksteinHechlerPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/FieldEcksteinHechlerPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/FieldKeplerianPropagator.java b/src/main/java/org/orekit/propagation/analytical/FieldKeplerianPropagator.java index 39a5a14979e329d6547ed25de411110bb95906a1..9cc7961e977c21945e92c87424b291caf13c9803 100644 --- a/src/main/java/org/orekit/propagation/analytical/FieldKeplerianPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/FieldKeplerianPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/J2DifferentialEffect.java b/src/main/java/org/orekit/propagation/analytical/J2DifferentialEffect.java index 930e214f4946048d2b420032145728b595588a11..1f70f7506686fa4a86157e643c02301f10d17b8c 100644 --- a/src/main/java/org/orekit/propagation/analytical/J2DifferentialEffect.java +++ b/src/main/java/org/orekit/propagation/analytical/J2DifferentialEffect.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/KeplerianPropagator.java b/src/main/java/org/orekit/propagation/analytical/KeplerianPropagator.java index a881c1c2cdfee970b5ab2ad1dd72e48732f56fc6..7f78f0d92bd6c95763a53074ebde2af0bf73986c 100644 --- a/src/main/java/org/orekit/propagation/analytical/KeplerianPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/KeplerianPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/gnss/GPSOrbitalElements.java b/src/main/java/org/orekit/propagation/analytical/gnss/GPSOrbitalElements.java index e8fa258d75858dd35d71f6c5995a68058738d020..65c5484f7e17a7321f2810ec8010fbd0d8eff44d 100644 --- a/src/main/java/org/orekit/propagation/analytical/gnss/GPSOrbitalElements.java +++ b/src/main/java/org/orekit/propagation/analytical/gnss/GPSOrbitalElements.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/gnss/GPSPropagator.java b/src/main/java/org/orekit/propagation/analytical/gnss/GPSPropagator.java index 40bc15864d8e11c858c369e1773fc98ef26dc502..652c6acaed80c76fa7c9406032d77660a79d384d 100644 --- a/src/main/java/org/orekit/propagation/analytical/gnss/GPSPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/gnss/GPSPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/gnss/package-info.java b/src/main/java/org/orekit/propagation/analytical/gnss/package-info.java index 0673683fa2be39f7a2a3de761bed1b9550a469d9..22b16db5cde3c3c8b5b59c7ce61d8e9879c32379 100644 --- a/src/main/java/org/orekit/propagation/analytical/gnss/package-info.java +++ b/src/main/java/org/orekit/propagation/analytical/gnss/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/package-info.java b/src/main/java/org/orekit/propagation/analytical/package-info.java index fe186d9a7c1fe963d9cf13988373649dea459e09..98e14fe5e94ad8135d634af2b4cbfeecc9fe564b 100644 --- a/src/main/java/org/orekit/propagation/analytical/package-info.java +++ b/src/main/java/org/orekit/propagation/analytical/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/DeepSDP4.java b/src/main/java/org/orekit/propagation/analytical/tle/DeepSDP4.java index cc4779b74c2190b2e80d31b0b63e279f1e95539c..c214ee9b2a6d6a21a9b08d3b8419acb19ccd35f3 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/DeepSDP4.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/DeepSDP4.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/SDP4.java b/src/main/java/org/orekit/propagation/analytical/tle/SDP4.java index 542c0dba5ea3a32d6742eaae58c6909dac870af4..9e6300c73e9c1e29f058371c1df4ec68f01caac7 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/SDP4.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/SDP4.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/SGP4.java b/src/main/java/org/orekit/propagation/analytical/tle/SGP4.java index 9db5a7dde36d69553cdc1ced3b6fdfa3805cc1b8..83baa9dc067240338ca15bc7d489df8d383cb67a 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/SGP4.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/SGP4.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/TLE.java b/src/main/java/org/orekit/propagation/analytical/tle/TLE.java index 6afa40d44ba60867c10fbf5a2a14ea260ee1b968..2325e1a823fcbd6410343023e9ca50000d9e8065 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/TLE.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/TLE.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/TLEConstants.java b/src/main/java/org/orekit/propagation/analytical/tle/TLEConstants.java index 0927dbbdcd70ae4fb9490bb4fb0d381984d5cdfe..dd1c1bdf0b479351a693e1223e223894fae2541c 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/TLEConstants.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/TLEConstants.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/TLEPropagator.java b/src/main/java/org/orekit/propagation/analytical/tle/TLEPropagator.java index 457b72898f1fe8aca0a5388040a1244aeac2a2ff..71754d62cf5380813d83ebe612896a6a7f812d07 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/TLEPropagator.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/TLEPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/TLESeries.java b/src/main/java/org/orekit/propagation/analytical/tle/TLESeries.java index a0577c2d799b19397c20583aab216c574d5dc866..278a5628604e083c65b558dbdebd708a013ad60b 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/TLESeries.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/TLESeries.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/package-info.java b/src/main/java/org/orekit/propagation/analytical/tle/package-info.java index 3f5bc3a842d5028c0c3bfd2369998fcf1ef5edcd..b2126e28bbf0de7caac0ce2bc0c538a0a8585823 100644 --- a/src/main/java/org/orekit/propagation/analytical/tle/package-info.java +++ b/src/main/java/org/orekit/propagation/analytical/tle/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/AbstractPropagatorBuilder.java b/src/main/java/org/orekit/propagation/conversion/AbstractPropagatorBuilder.java index 0da43efc6cf65cc76f14292d662202e29fc3e3a2..51cac983f67382c4dfeac71eb692c451fa661bc4 100644 --- a/src/main/java/org/orekit/propagation/conversion/AbstractPropagatorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/AbstractPropagatorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/AbstractPropagatorConverter.java b/src/main/java/org/orekit/propagation/conversion/AbstractPropagatorConverter.java index 4a3a0effa09c18cdcf143275ffa6e4c1c77aaa2d..007e73dc920a2b9106c8d0089ead4a061abd1e59 100644 --- a/src/main/java/org/orekit/propagation/conversion/AbstractPropagatorConverter.java +++ b/src/main/java/org/orekit/propagation/conversion/AbstractPropagatorConverter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/AdamsBashforthIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/AdamsBashforthIntegratorBuilder.java index 91b251cf3f49491a6ec9b0f80120c13911dd2fa4..df3b348f384f5fa234646e741dfd1f935a91a834 100644 --- a/src/main/java/org/orekit/propagation/conversion/AdamsBashforthIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/AdamsBashforthIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/AdamsMoultonIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/AdamsMoultonIntegratorBuilder.java index 937ed7d83a19c1f53ae60312199c8747b31cddab..943ca11bc2660f05d3e654df188a7f846a50c22f 100644 --- a/src/main/java/org/orekit/propagation/conversion/AdamsMoultonIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/AdamsMoultonIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/ClassicalRungeKuttaIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/ClassicalRungeKuttaIntegratorBuilder.java index fd7577deafeca58b33a671db6cde78f1af473923..f841ccd97850803acba256edc39185def02c5b93 100644 --- a/src/main/java/org/orekit/propagation/conversion/ClassicalRungeKuttaIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/ClassicalRungeKuttaIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/DormandPrince54IntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/DormandPrince54IntegratorBuilder.java index 3d180bf05adcad4efeb7407d5bab4b81fccddcb7..12e280476cdbe570eb946b08964bca02d27c30bd 100644 --- a/src/main/java/org/orekit/propagation/conversion/DormandPrince54IntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/DormandPrince54IntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/DormandPrince853IntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/DormandPrince853IntegratorBuilder.java index a736febadbafd2ae245afb03d7bea5c2763f6cd6..b4a0f468e0d7d0bb069346f25d7b93e7afbb7b46 100644 --- a/src/main/java/org/orekit/propagation/conversion/DormandPrince853IntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/DormandPrince853IntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/EcksteinHechlerPropagatorBuilder.java b/src/main/java/org/orekit/propagation/conversion/EcksteinHechlerPropagatorBuilder.java index 2790824311fac35f86ec8d6c50ea62c7111007b1..cba2a9fb8e8289e6d1a52c1ba4d680fad41bd701 100644 --- a/src/main/java/org/orekit/propagation/conversion/EcksteinHechlerPropagatorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/EcksteinHechlerPropagatorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/EulerIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/EulerIntegratorBuilder.java index 41a12a7ff6ae904c40f1600e9bab340cb249c694..c4a21b63b399d80b96300e97de1125c022e25fae 100644 --- a/src/main/java/org/orekit/propagation/conversion/EulerIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/EulerIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/FiniteDifferencePropagatorConverter.java b/src/main/java/org/orekit/propagation/conversion/FiniteDifferencePropagatorConverter.java index bbf347db25a6a2bab02b53750add64c7012c252a..b43026841bab9fcc751e2dda8dc677c289e0478e 100644 --- a/src/main/java/org/orekit/propagation/conversion/FiniteDifferencePropagatorConverter.java +++ b/src/main/java/org/orekit/propagation/conversion/FiniteDifferencePropagatorConverter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/GillIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/GillIntegratorBuilder.java index c04b712d763bc2929b60e5b3a0729e6ba54c4be5..8588c7caa07e580a101d17621fbff053e147cea2 100644 --- a/src/main/java/org/orekit/propagation/conversion/GillIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/GillIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/GraggBulirschStoerIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/GraggBulirschStoerIntegratorBuilder.java index 1ac077b7eb305665b2692357fadf496d82be87e6..450f01a463d7a1e210a61ced641abae5355af729 100644 --- a/src/main/java/org/orekit/propagation/conversion/GraggBulirschStoerIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/GraggBulirschStoerIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/HighamHall54IntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/HighamHall54IntegratorBuilder.java index 52cbc41159df24d90ed7f4d78d71346a178d9cf0..69495907150941e7d25dc5ed0157a3cde272c9d5 100644 --- a/src/main/java/org/orekit/propagation/conversion/HighamHall54IntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/HighamHall54IntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/JacobianPropagatorConverter.java b/src/main/java/org/orekit/propagation/conversion/JacobianPropagatorConverter.java index 4091c79954adaad64e12a1884a2432d07c53d407..5e8c34117bbc8ee508f287d54473a2f6270e3e07 100644 --- a/src/main/java/org/orekit/propagation/conversion/JacobianPropagatorConverter.java +++ b/src/main/java/org/orekit/propagation/conversion/JacobianPropagatorConverter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/KeplerianPropagatorBuilder.java b/src/main/java/org/orekit/propagation/conversion/KeplerianPropagatorBuilder.java index bf8760822ffcfcbd4828fdb3dc0032de72bdc2c9..8fc5a55359c7828b01b1b74665b1f40dcd7262b0 100644 --- a/src/main/java/org/orekit/propagation/conversion/KeplerianPropagatorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/KeplerianPropagatorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/LutherIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/LutherIntegratorBuilder.java index d4040d4d8f79977bb9a40e60076b4fdde6c9621f..b01d9b86d6f33ae9732c490847a497fee412b068 100644 --- a/src/main/java/org/orekit/propagation/conversion/LutherIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/LutherIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/MidpointIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/MidpointIntegratorBuilder.java index 73165f31fe8bd5d843d50c91fbd6ea2d87bb3663..bac928ece64cb2e64fbda03bafb213d5633e5fcb 100644 --- a/src/main/java/org/orekit/propagation/conversion/MidpointIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/MidpointIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/NumericalPropagatorBuilder.java b/src/main/java/org/orekit/propagation/conversion/NumericalPropagatorBuilder.java index c5592b6138ad41b6779c53dda196112c3770ed71..7f01154729734dfcf31de8d2532a9e9b2321585b 100644 --- a/src/main/java/org/orekit/propagation/conversion/NumericalPropagatorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/NumericalPropagatorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/ODEIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/ODEIntegratorBuilder.java index 362f681a45721e106a45ab4e8550f9a4adc8862c..1ca245a8b00355f78f3c6db0faf48cac459a16e2 100644 --- a/src/main/java/org/orekit/propagation/conversion/ODEIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/ODEIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/OsculatingToMeanElementsConverter.java b/src/main/java/org/orekit/propagation/conversion/OsculatingToMeanElementsConverter.java index fa0b1e749b459dd3f8230c7e443143bb35dd7a92..80efda8d04610f1d114a4634e219cf87881debbb 100644 --- a/src/main/java/org/orekit/propagation/conversion/OsculatingToMeanElementsConverter.java +++ b/src/main/java/org/orekit/propagation/conversion/OsculatingToMeanElementsConverter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/PropagatorBuilder.java b/src/main/java/org/orekit/propagation/conversion/PropagatorBuilder.java index a766909943e197de98fa6dc7af7a29998ce4202c..dda5a7cac834a282d4d574fba3236fb4af8c40ef 100644 --- a/src/main/java/org/orekit/propagation/conversion/PropagatorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/PropagatorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/PropagatorConverter.java b/src/main/java/org/orekit/propagation/conversion/PropagatorConverter.java index 3864e4ed28d0070ca2ca9fc4524f23d22a190305..b5d34b502d5df1b92e49fe11ccf7718a8db8a9e4 100644 --- a/src/main/java/org/orekit/propagation/conversion/PropagatorConverter.java +++ b/src/main/java/org/orekit/propagation/conversion/PropagatorConverter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/TLEPropagatorBuilder.java b/src/main/java/org/orekit/propagation/conversion/TLEPropagatorBuilder.java index b33033b0abecb1a36d59bd9c39311dcb594b8677..3c1eb18e96861308239f5380d7a7bf00ba83d5c1 100644 --- a/src/main/java/org/orekit/propagation/conversion/TLEPropagatorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/TLEPropagatorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/ThreeEighthesIntegratorBuilder.java b/src/main/java/org/orekit/propagation/conversion/ThreeEighthesIntegratorBuilder.java index 0f72196162cf5ffe9c2a569a8e4415232a7e4db9..bdd3725cd8f647323343923d2b6bffeb6af2996f 100644 --- a/src/main/java/org/orekit/propagation/conversion/ThreeEighthesIntegratorBuilder.java +++ b/src/main/java/org/orekit/propagation/conversion/ThreeEighthesIntegratorBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/package-info.java b/src/main/java/org/orekit/propagation/conversion/package-info.java index da03bcc2ac126eb1a6f4c0bfda23ea55ab5a049b..2b6d883e152278484a506bb1b50b5399ee6783d1 100644 --- a/src/main/java/org/orekit/propagation/conversion/package-info.java +++ b/src/main/java/org/orekit/propagation/conversion/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AbstractDetector.java b/src/main/java/org/orekit/propagation/events/AbstractDetector.java index 158d0bd52f184c5dc64d3206d06919c712414770..28c4cac72df76c515c5e794a6f1db4795ef67b1a 100644 --- a/src/main/java/org/orekit/propagation/events/AbstractDetector.java +++ b/src/main/java/org/orekit/propagation/events/AbstractDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AdapterDetector.java b/src/main/java/org/orekit/propagation/events/AdapterDetector.java index 50f66ae3a7bc1755d0eed6d8e71907a58699456a..54f0a61dc63c82254df52c23219e5b503f0161fe 100644 --- a/src/main/java/org/orekit/propagation/events/AdapterDetector.java +++ b/src/main/java/org/orekit/propagation/events/AdapterDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AlignmentDetector.java b/src/main/java/org/orekit/propagation/events/AlignmentDetector.java index d37b4339959332f388188b5c20ee848591a5a88e..2b638d85a8e589b0c202de86c2a7c54c76c9c99f 100644 --- a/src/main/java/org/orekit/propagation/events/AlignmentDetector.java +++ b/src/main/java/org/orekit/propagation/events/AlignmentDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AltitudeDetector.java b/src/main/java/org/orekit/propagation/events/AltitudeDetector.java index 7ce8790357f64eb07b5cbb4a8d4cf49dd6c26f84..9f1e73c89ac5adb7a73ca82dc8ba441699341b82 100644 --- a/src/main/java/org/orekit/propagation/events/AltitudeDetector.java +++ b/src/main/java/org/orekit/propagation/events/AltitudeDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AngularSeparationDetector.java b/src/main/java/org/orekit/propagation/events/AngularSeparationDetector.java index 4ccc873f42ffa5efd68917053ff7b63637e10fee..3730f872294eaee3d86f9e9558293a5cda528f81 100644 --- a/src/main/java/org/orekit/propagation/events/AngularSeparationDetector.java +++ b/src/main/java/org/orekit/propagation/events/AngularSeparationDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/ApsideDetector.java b/src/main/java/org/orekit/propagation/events/ApsideDetector.java index 3ce0d266f20ecc2f9b046e0159dbab28b62f09d3..d07462617bc16ff45ee061a3d152e92196bdf077 100644 --- a/src/main/java/org/orekit/propagation/events/ApsideDetector.java +++ b/src/main/java/org/orekit/propagation/events/ApsideDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/CircularFieldOfViewDetector.java b/src/main/java/org/orekit/propagation/events/CircularFieldOfViewDetector.java index 879a9338699689519e5e4755718274b56dbdfcf2..3f112d452a503bdf6e9a32eadd4234d35cab8e57 100644 --- a/src/main/java/org/orekit/propagation/events/CircularFieldOfViewDetector.java +++ b/src/main/java/org/orekit/propagation/events/CircularFieldOfViewDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/DateDetector.java b/src/main/java/org/orekit/propagation/events/DateDetector.java index 5a4cca0137682e7fbf380761428b88bd0920f714..57a004f1fb0469f3b00880d4273a43145c54c3e5 100644 --- a/src/main/java/org/orekit/propagation/events/DateDetector.java +++ b/src/main/java/org/orekit/propagation/events/DateDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EclipseDetector.java b/src/main/java/org/orekit/propagation/events/EclipseDetector.java index 90484b361a13a7b5c8e84592a5ad8dd1024b25d4..441c68fec6f61469bfd1cd5acff45699caccb377 100644 --- a/src/main/java/org/orekit/propagation/events/EclipseDetector.java +++ b/src/main/java/org/orekit/propagation/events/EclipseDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/ElevationDetector.java b/src/main/java/org/orekit/propagation/events/ElevationDetector.java index fd3c91c707e7312295d790b5c25395bfe4ddeb6e..c4700495f1be74ce5be838b71be8c66c37882266 100644 --- a/src/main/java/org/orekit/propagation/events/ElevationDetector.java +++ b/src/main/java/org/orekit/propagation/events/ElevationDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/ElevationExtremumDetector.java b/src/main/java/org/orekit/propagation/events/ElevationExtremumDetector.java index 8bd03c2eb81fe353f838c007c2f6d3cf7ad54a64..b76d958dc9bcfaf78b5344e05b1ef6167bbfec35 100644 --- a/src/main/java/org/orekit/propagation/events/ElevationExtremumDetector.java +++ b/src/main/java/org/orekit/propagation/events/ElevationExtremumDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EnablingPredicate.java b/src/main/java/org/orekit/propagation/events/EnablingPredicate.java index 7fcbb4b103fec18208f333a47cc345b749c50943..c30a8d71cdaf2a4c9604231e725dc69e6ef3d4b0 100644 --- a/src/main/java/org/orekit/propagation/events/EnablingPredicate.java +++ b/src/main/java/org/orekit/propagation/events/EnablingPredicate.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventDetector.java b/src/main/java/org/orekit/propagation/events/EventDetector.java index 0252b8dbb64a7b1945eb0521075cc6fb9b32966a..21a5035710363ceaab0f7f8e2e41f528a502ec34 100644 --- a/src/main/java/org/orekit/propagation/events/EventDetector.java +++ b/src/main/java/org/orekit/propagation/events/EventDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventEnablingPredicateFilter.java b/src/main/java/org/orekit/propagation/events/EventEnablingPredicateFilter.java index 0b2c51535f0052806a12aa47c45ae1b535f8b94d..a2f33151c0e7b170893c18210d9fee776dab7654 100644 --- a/src/main/java/org/orekit/propagation/events/EventEnablingPredicateFilter.java +++ b/src/main/java/org/orekit/propagation/events/EventEnablingPredicateFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventShifter.java b/src/main/java/org/orekit/propagation/events/EventShifter.java index a29e5db1a2647174917ba782577503df2766f0a1..43b36b42fea7818f82e7a17c119476f381bc08c1 100644 --- a/src/main/java/org/orekit/propagation/events/EventShifter.java +++ b/src/main/java/org/orekit/propagation/events/EventShifter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventsLogger.java b/src/main/java/org/orekit/propagation/events/EventsLogger.java index 3ddba013b8755051bd36f356b370c62758bfddbe..83f3fceec88b8af9165290ac0daf7e23161b6836 100644 --- a/src/main/java/org/orekit/propagation/events/EventsLogger.java +++ b/src/main/java/org/orekit/propagation/events/EventsLogger.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldAbstractDetector.java b/src/main/java/org/orekit/propagation/events/FieldAbstractDetector.java index 3bbc7e290a16940e4a6d93e373790700d32929e8..3cb7777c3bd86fc2ee8902a393ab7b0aa132f5a0 100644 --- a/src/main/java/org/orekit/propagation/events/FieldAbstractDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldAbstractDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldAltitudeDetector.java b/src/main/java/org/orekit/propagation/events/FieldAltitudeDetector.java index 4ba1f6f4e6ffcb7397f06abf209879ba74e04f9f..d35b2f33748b14b0ff6efccd01158a4db6894d1a 100644 --- a/src/main/java/org/orekit/propagation/events/FieldAltitudeDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldAltitudeDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldApsideDetector.java b/src/main/java/org/orekit/propagation/events/FieldApsideDetector.java index 5cdcde718a37404dfed04aa5a51ae7c875f25edc..4766719a5219c9a3bb33df774192ecc506f23718 100644 --- a/src/main/java/org/orekit/propagation/events/FieldApsideDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldApsideDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldDateDetector.java b/src/main/java/org/orekit/propagation/events/FieldDateDetector.java index b01392e9accbed251b9d9afe56c83fc718adcc11..07d7b80f7b5340e370182e70a764254aab84b755 100644 --- a/src/main/java/org/orekit/propagation/events/FieldDateDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldDateDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldEclipseDetector.java b/src/main/java/org/orekit/propagation/events/FieldEclipseDetector.java index 9ec5008f409eb4ef65c444c6ac07a348b66a6642..86f28e648b38ce499c8cabb661e09b7f5581b8e5 100644 --- a/src/main/java/org/orekit/propagation/events/FieldEclipseDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldEclipseDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldElevationDetector.java b/src/main/java/org/orekit/propagation/events/FieldElevationDetector.java index 26fd024ab90874ad5fc4f507e3c5f3829146e111..8312a7ddf45f80a36917b40b91938749b36e8374 100644 --- a/src/main/java/org/orekit/propagation/events/FieldElevationDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldElevationDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldEventDetector.java b/src/main/java/org/orekit/propagation/events/FieldEventDetector.java index 03c6e33c29be063704f8b5f20502edea5750f55a..9607790b27734f7fe8b8bc34dae4455c8e9ce764 100644 --- a/src/main/java/org/orekit/propagation/events/FieldEventDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldEventDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldEventsLogger.java b/src/main/java/org/orekit/propagation/events/FieldEventsLogger.java index 71690a1f1c56fcd6d28b6fde8ab3cbbf96337c33..ddcc4e5156a71d2b8da5e40f9e0019aadfed1c74 100644 --- a/src/main/java/org/orekit/propagation/events/FieldEventsLogger.java +++ b/src/main/java/org/orekit/propagation/events/FieldEventsLogger.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldNodeDetector.java b/src/main/java/org/orekit/propagation/events/FieldNodeDetector.java index 5627d7d92e0d3739aaacb6a7dcd9a3c30b78fd3f..e73abb2bf4847831eb55dc1398cb14fbf1c49cc5 100644 --- a/src/main/java/org/orekit/propagation/events/FieldNodeDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldNodeDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldOfView.java b/src/main/java/org/orekit/propagation/events/FieldOfView.java index 7c204abef9281eb5b27a4e6d743bcdb992c2b7a4..fc205d05187d8fc1129973be5efaf26dd75fef3b 100644 --- a/src/main/java/org/orekit/propagation/events/FieldOfView.java +++ b/src/main/java/org/orekit/propagation/events/FieldOfView.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldOfViewDetector.java b/src/main/java/org/orekit/propagation/events/FieldOfViewDetector.java index 9997449daccc4d1bc61c1f01d25d0e810962356d..37f54b472fc4752fcc76c28e11dc0556faeb4521 100644 --- a/src/main/java/org/orekit/propagation/events/FieldOfViewDetector.java +++ b/src/main/java/org/orekit/propagation/events/FieldOfViewDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FootprintOverlapDetector.java b/src/main/java/org/orekit/propagation/events/FootprintOverlapDetector.java index 56f303e54c32289151b13e342c8e11947f46bc78..ef21ab3a603bee3a2ba7e50fd82b1a2d3c028311 100644 --- a/src/main/java/org/orekit/propagation/events/FootprintOverlapDetector.java +++ b/src/main/java/org/orekit/propagation/events/FootprintOverlapDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/GeographicZoneDetector.java b/src/main/java/org/orekit/propagation/events/GeographicZoneDetector.java index 3d30e908ba531aa7b35e9db836ebcae14db0d2f5..a0e90d5a5c87c25f6387edebed57d3526ba2d7bc 100644 --- a/src/main/java/org/orekit/propagation/events/GeographicZoneDetector.java +++ b/src/main/java/org/orekit/propagation/events/GeographicZoneDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/GroundAtNightDetector.java b/src/main/java/org/orekit/propagation/events/GroundAtNightDetector.java index 39d151767e5a71b00ca95eaff70d903c04d14a47..4a54503112609aecdf61a5a324400ea48f898059 100644 --- a/src/main/java/org/orekit/propagation/events/GroundAtNightDetector.java +++ b/src/main/java/org/orekit/propagation/events/GroundAtNightDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/GroundFieldOfViewDetector.java b/src/main/java/org/orekit/propagation/events/GroundFieldOfViewDetector.java index 08f2c48497480e154d2a804cb8b41d6a97d2d268..ba83b84e94612730ccec5501ae085fab39500662 100644 --- a/src/main/java/org/orekit/propagation/events/GroundFieldOfViewDetector.java +++ b/src/main/java/org/orekit/propagation/events/GroundFieldOfViewDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/InterSatDirectViewDetector.java b/src/main/java/org/orekit/propagation/events/InterSatDirectViewDetector.java index edccfb6c016d61d0b8eac6b2b835e3002e0425c1..747b3b6076a553d6de9e051f4c7295e4590498d8 100644 --- a/src/main/java/org/orekit/propagation/events/InterSatDirectViewDetector.java +++ b/src/main/java/org/orekit/propagation/events/InterSatDirectViewDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LatitudeCrossingDetector.java b/src/main/java/org/orekit/propagation/events/LatitudeCrossingDetector.java index ef951daa7f9c61d99f97eb26d0988f36890b504a..3e1bf2c382476a048738a694d6235f978568bc9a 100644 --- a/src/main/java/org/orekit/propagation/events/LatitudeCrossingDetector.java +++ b/src/main/java/org/orekit/propagation/events/LatitudeCrossingDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LatitudeExtremumDetector.java b/src/main/java/org/orekit/propagation/events/LatitudeExtremumDetector.java index e5ddca4f2a87e2563126b8184fd286073220bb1d..e6cc84a99fcc3d38c56dd8a42343607cd885bfce 100644 --- a/src/main/java/org/orekit/propagation/events/LatitudeExtremumDetector.java +++ b/src/main/java/org/orekit/propagation/events/LatitudeExtremumDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LongitudeCrossingDetector.java b/src/main/java/org/orekit/propagation/events/LongitudeCrossingDetector.java index c2442195d2dd6e6d296d63960a34207fc392c6af..ae3f93e420df79c4cc94d1ee22c7f244f5d391bd 100644 --- a/src/main/java/org/orekit/propagation/events/LongitudeCrossingDetector.java +++ b/src/main/java/org/orekit/propagation/events/LongitudeCrossingDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LongitudeExtremumDetector.java b/src/main/java/org/orekit/propagation/events/LongitudeExtremumDetector.java index 31f674947ab14670b22c7ece34d98dec32c6576f..326721ed6e285b2a22cb2a7d8e7557314f5f48d3 100644 --- a/src/main/java/org/orekit/propagation/events/LongitudeExtremumDetector.java +++ b/src/main/java/org/orekit/propagation/events/LongitudeExtremumDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/NodeDetector.java b/src/main/java/org/orekit/propagation/events/NodeDetector.java index cf6711603373d71ca7dc517b8370ea7edef98913..a96a90197d76a5899e8ad2d2b3287c6ca6085d16 100644 --- a/src/main/java/org/orekit/propagation/events/NodeDetector.java +++ b/src/main/java/org/orekit/propagation/events/NodeDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/PositionAngleDetector.java b/src/main/java/org/orekit/propagation/events/PositionAngleDetector.java index 29a9fddd0a733d4d42053a52d5febfe74c97fdbe..5a9eef3b32b831b15f6990cc73a3f46613ee7d91 100644 --- a/src/main/java/org/orekit/propagation/events/PositionAngleDetector.java +++ b/src/main/java/org/orekit/propagation/events/PositionAngleDetector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/package-info.java b/src/main/java/org/orekit/propagation/events/handlers/package-info.java index e9ac75ee47f4caee5b4ce2058c22a408e192ec6a..59d38f96a8c6d83c5e8ba01199c92e97314d5818 100644 --- a/src/main/java/org/orekit/propagation/events/handlers/package-info.java +++ b/src/main/java/org/orekit/propagation/events/handlers/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/package-info.java b/src/main/java/org/orekit/propagation/events/package-info.java index 87e57ddb9fe0aba39e3662de0a36d975089fcb7a..13729ea34d5ccc6d980689607e5d1665416fb7a6 100644 --- a/src/main/java/org/orekit/propagation/events/package-info.java +++ b/src/main/java/org/orekit/propagation/events/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/AbstractIntegratedPropagator.java b/src/main/java/org/orekit/propagation/integration/AbstractIntegratedPropagator.java index 3ae943b8a13347dfe914f923bfd47da3cd9f1a8d..952cec657b333e15a87ea5ee92f1d620441f8db2 100644 --- a/src/main/java/org/orekit/propagation/integration/AbstractIntegratedPropagator.java +++ b/src/main/java/org/orekit/propagation/integration/AbstractIntegratedPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/FieldAbstractIntegratedPropagator.java b/src/main/java/org/orekit/propagation/integration/FieldAbstractIntegratedPropagator.java index f25bf073ca18db21e638b29e73697923d0662851..4feef45ec135c84e28c49a3d759a8d7691acf6d2 100644 --- a/src/main/java/org/orekit/propagation/integration/FieldAbstractIntegratedPropagator.java +++ b/src/main/java/org/orekit/propagation/integration/FieldAbstractIntegratedPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/FieldIntegratedEphemeris.java b/src/main/java/org/orekit/propagation/integration/FieldIntegratedEphemeris.java index 3d00ddc213066ecfc5f6829cc4e6de938d3d00e7..4c39cc452399a7e2d00c66cfbdd56c8e9fac50d3 100644 --- a/src/main/java/org/orekit/propagation/integration/FieldIntegratedEphemeris.java +++ b/src/main/java/org/orekit/propagation/integration/FieldIntegratedEphemeris.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/FieldStateMapper.java b/src/main/java/org/orekit/propagation/integration/FieldStateMapper.java index 5c44ae7732f0abe89aa1630e8b31fa850d694044..ea3115a90c76ec2acac166aab4ca1532d68367f1 100644 --- a/src/main/java/org/orekit/propagation/integration/FieldStateMapper.java +++ b/src/main/java/org/orekit/propagation/integration/FieldStateMapper.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/IntegratedEphemeris.java b/src/main/java/org/orekit/propagation/integration/IntegratedEphemeris.java index c9a10e4f06ecbf33af98f14702d560c91cba34a5..1b6cb045fdcbda1758cadb30f1ac4a8bc0308817 100644 --- a/src/main/java/org/orekit/propagation/integration/IntegratedEphemeris.java +++ b/src/main/java/org/orekit/propagation/integration/IntegratedEphemeris.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/StateMapper.java b/src/main/java/org/orekit/propagation/integration/StateMapper.java index 07e9c82eee27771afbcf1460598edfaa68a9a959..102782ccdb05c4aac713be9d1ea483c56204e6a9 100644 --- a/src/main/java/org/orekit/propagation/integration/StateMapper.java +++ b/src/main/java/org/orekit/propagation/integration/StateMapper.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/package-info.java b/src/main/java/org/orekit/propagation/integration/package-info.java index 1b33cf4078e03cdcfa31df68c969dfc47cf6f5b8..222118b05fe19c1b59c5d25dd5164bcdd412317d 100644 --- a/src/main/java/org/orekit/propagation/integration/package-info.java +++ b/src/main/java/org/orekit/propagation/integration/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/DSConverter.java b/src/main/java/org/orekit/propagation/numerical/DSConverter.java index 92afa5f07551531546b7fec89cd60b2f7ac994fc..3fe210ee64a352a1c0271e4d4fd3016d21a6d512 100644 --- a/src/main/java/org/orekit/propagation/numerical/DSConverter.java +++ b/src/main/java/org/orekit/propagation/numerical/DSConverter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/FieldNumericalPropagator.java b/src/main/java/org/orekit/propagation/numerical/FieldNumericalPropagator.java index 8abed60d9655b0248bdce184b0961d43a52a74fb..e489b0f8b64d38df715d7f381fa5b2c747d8cf5c 100644 --- a/src/main/java/org/orekit/propagation/numerical/FieldNumericalPropagator.java +++ b/src/main/java/org/orekit/propagation/numerical/FieldNumericalPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/FieldTimeDerivativesEquations.java b/src/main/java/org/orekit/propagation/numerical/FieldTimeDerivativesEquations.java index cc58ba7909a305588f10cc2f35b9d14eeaf30824..8191929b2c94d6acf6e77d4daec5ddea2a7c6448 100644 --- a/src/main/java/org/orekit/propagation/numerical/FieldTimeDerivativesEquations.java +++ b/src/main/java/org/orekit/propagation/numerical/FieldTimeDerivativesEquations.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/JacobiansMapper.java b/src/main/java/org/orekit/propagation/numerical/JacobiansMapper.java index 911fc975f0ba604db4e12f6d741ce0cb020b987c..30607ac2dcc5659c8b7d803f62a9faf039978e97 100644 --- a/src/main/java/org/orekit/propagation/numerical/JacobiansMapper.java +++ b/src/main/java/org/orekit/propagation/numerical/JacobiansMapper.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/NumericalPropagator.java b/src/main/java/org/orekit/propagation/numerical/NumericalPropagator.java index 38653d6af2e9a66974f3d4d39a6778e971e94d55..f6a77688362d2c4891f2eb3a78665aa7ba030ac3 100644 --- a/src/main/java/org/orekit/propagation/numerical/NumericalPropagator.java +++ b/src/main/java/org/orekit/propagation/numerical/NumericalPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/TimeDerivativesEquations.java b/src/main/java/org/orekit/propagation/numerical/TimeDerivativesEquations.java index 1efab9b676c7f26b988b8eb2adf523a460f0f84f..4ad3eda1a53f8a2aeb735917d0faac3f616b2086 100644 --- a/src/main/java/org/orekit/propagation/numerical/TimeDerivativesEquations.java +++ b/src/main/java/org/orekit/propagation/numerical/TimeDerivativesEquations.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/package-info.java b/src/main/java/org/orekit/propagation/numerical/package-info.java index 2adbd42a22dd60a9bcf87f5b990d2dbfe544d29c..1f9250861d591d6030ef8d0ef117fdeef7e73f96 100644 --- a/src/main/java/org/orekit/propagation/numerical/package-info.java +++ b/src/main/java/org/orekit/propagation/numerical/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/package-info.java b/src/main/java/org/orekit/propagation/package-info.java index 8fda47ef2f64f48e6b800111e8d6d4efc6d264b2..17f2931995b7fd54090a43d082b9e88c493a7e08 100644 --- a/src/main/java/org/orekit/propagation/package-info.java +++ b/src/main/java/org/orekit/propagation/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/FieldOrekitFixedStepHandler.java b/src/main/java/org/orekit/propagation/sampling/FieldOrekitFixedStepHandler.java index d7137859de0e27b9a902858e3d1d8c1a7edc578f..e750e0b5e28d6ce14644ea85f952e5fe31e4c033 100644 --- a/src/main/java/org/orekit/propagation/sampling/FieldOrekitFixedStepHandler.java +++ b/src/main/java/org/orekit/propagation/sampling/FieldOrekitFixedStepHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/FieldOrekitStepHandler.java b/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepHandler.java index 4dae1e738aa420bc51ac611450273996de7991fb..71a679c659e032b0b7609a4e8ed9e0cb3dccbf7d 100644 --- a/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepHandler.java +++ b/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/FieldOrekitStepHandlerMultiplexer.java b/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepHandlerMultiplexer.java index 84b40aae1341cc154bfeb8b349054edf039a8b47..ffb81eee3cb15aa544b2764ebd4bce4a0b37b176 100644 --- a/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepHandlerMultiplexer.java +++ b/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepHandlerMultiplexer.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/FieldOrekitStepInterpolator.java b/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepInterpolator.java index 93ebe5ce93ceededbb5bcf2d96dfd4ef778db6f8..bb9c08420de9aca2c6b7456c726b41eb2cc79b75 100644 --- a/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepInterpolator.java +++ b/src/main/java/org/orekit/propagation/sampling/FieldOrekitStepInterpolator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/MultiSatStepHandler.java b/src/main/java/org/orekit/propagation/sampling/MultiSatStepHandler.java index d46e838bae746e78f39a867307d3c2c378ed5ee9..d74cb592d875b6a839015bf3b6913d09584b03e6 100644 --- a/src/main/java/org/orekit/propagation/sampling/MultiSatStepHandler.java +++ b/src/main/java/org/orekit/propagation/sampling/MultiSatStepHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/OrekitFixedStepHandler.java b/src/main/java/org/orekit/propagation/sampling/OrekitFixedStepHandler.java index b1d321ad396140b8f598fc153ca2dc8708fcc2ca..8d43136340a536396b23e0a380534a96f26a8bbd 100644 --- a/src/main/java/org/orekit/propagation/sampling/OrekitFixedStepHandler.java +++ b/src/main/java/org/orekit/propagation/sampling/OrekitFixedStepHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/OrekitStepHandler.java b/src/main/java/org/orekit/propagation/sampling/OrekitStepHandler.java index e9ba5c158f882964e31894bb8c89514863fab5fa..8d9f66a6b8246aa92146ac3ed1edc6a4172add32 100644 --- a/src/main/java/org/orekit/propagation/sampling/OrekitStepHandler.java +++ b/src/main/java/org/orekit/propagation/sampling/OrekitStepHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/OrekitStepHandlerMultiplexer.java b/src/main/java/org/orekit/propagation/sampling/OrekitStepHandlerMultiplexer.java index 5c6a484891f2e8c201641989ae6e3b8bd65a30cb..6cb2baf4ec0555b10fb234ab26869c9f01b8d41f 100644 --- a/src/main/java/org/orekit/propagation/sampling/OrekitStepHandlerMultiplexer.java +++ b/src/main/java/org/orekit/propagation/sampling/OrekitStepHandlerMultiplexer.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/OrekitStepInterpolator.java b/src/main/java/org/orekit/propagation/sampling/OrekitStepInterpolator.java index b1c04833d7595f869acc1a05741b7b8f1751937c..f25e2a278d637c013130c3f6f94b4f4ca46f1a5e 100644 --- a/src/main/java/org/orekit/propagation/sampling/OrekitStepInterpolator.java +++ b/src/main/java/org/orekit/propagation/sampling/OrekitStepInterpolator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/package-info.java b/src/main/java/org/orekit/propagation/sampling/package-info.java index 0ff826ce6be10eb77d5f8a994eb50021b69935c8..abdb04442c2422a27f67ac956327c0d1f5f9aaa4 100644 --- a/src/main/java/org/orekit/propagation/sampling/package-info.java +++ b/src/main/java/org/orekit/propagation/sampling/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/DSSTPropagator.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/DSSTPropagator.java index 4be43f06248f0ff90e0f532c09946828ad7a0e35..731c1f3a4da203c143f3f75f08fffcbd42c6fc31 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/DSSTPropagator.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/DSSTPropagator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/AbstractGaussianContribution.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/AbstractGaussianContribution.java index 80c46b7f4c06b2e2733010a8970bd28e4c42fc25..1b73c62816ce6657faec58cf25f1f31dec012d7a 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/AbstractGaussianContribution.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/AbstractGaussianContribution.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/DSSTAtmosphericDrag.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTAtmosphericDrag.java index 24d4015bb0b8ee4b086cb9877f635c8da9ca68c1..07d73889d544138a7e07398cc519f898a73c9802 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTAtmosphericDrag.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTAtmosphericDrag.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/DSSTForceModel.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTForceModel.java index ad8f34973245dfcfead022b5ecf78b80e0ccc058..a8f668cf217788a92b3f4f11637966f61237ea42 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTForceModel.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTForceModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/DSSTSolarRadiationPressure.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTSolarRadiationPressure.java index a36f30a55728e0378a78ef46b9bd95cdb5cb1da7..8b03ea046875410a08c5c0dd4808299eea0e2f1e 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTSolarRadiationPressure.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTSolarRadiationPressure.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/DSSTTesseral.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTTesseral.java index 879ad33f46b8339574edfc198c6c336d08de5d08..6048be53260f33939a0ac3edf79d9296fd53d506 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTTesseral.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTTesseral.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/DSSTThirdBody.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTThirdBody.java index d2dab1ba045b3a8bc51847a363655b4b0fba0e0e..b9aad864adb39fdaf9c095fbb26caf415ac00d6a 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTThirdBody.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTThirdBody.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/DSSTZonal.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTZonal.java index 0d6d5747481a95d3f8fbe8717df3fd4993344143..c18d172c33cb386d5e7eac150219ffc8432a2664 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTZonal.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTZonal.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/ShortPeriodTerms.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/ShortPeriodTerms.java index 6b0676d2f4e480fdf9885af7b867004d9a0497c0..7c86695930074e6889c0378593f7e126ecfca722 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/ShortPeriodTerms.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/ShortPeriodTerms.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/forces/package-info.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/package-info.java index ffb7dc022297e18f5d2f739df2b8d3028d50de62..abbf7c2f945ed01aeacf27d7e6bbbe3d54054c41 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/package-info.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/forces/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/package-info.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/package-info.java index 6ab76357ee93fa51f47437f098e7929a1a4b072b..f192dc6927ff511a0394b86e7e25d7330a1e94f5 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/package-info.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/AuxiliaryElements.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/AuxiliaryElements.java index ae2421b0d57320482f96225d26b836442653016a..f8d896108171941f791e6350f3d872cf40117f44 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/AuxiliaryElements.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/AuxiliaryElements.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/CjSjCoefficient.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/CjSjCoefficient.java index 26f9667ade43f3dd8c732a9b71336571510c6c01..6b5f362e0ef68e56acd2ae323147c620aafb0705 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/CjSjCoefficient.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/CjSjCoefficient.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/CoefficientsFactory.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/CoefficientsFactory.java index 0c0e92e2c44c06c498ebd354339b5fda0d1f6d45..5776e3650ad483cb0266926a9ff74a1e3e06585a 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/CoefficientsFactory.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/CoefficientsFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/FixedNumberInterpolationGrid.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/FixedNumberInterpolationGrid.java index 6bb9afd474a26bee603b5e884b07d6504972901a..e996bb1c2d4f5d6ca690a62ba2b934b0f8d96a43 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/FixedNumberInterpolationGrid.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/FixedNumberInterpolationGrid.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/GHIJjsPolynomials.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GHIJjsPolynomials.java index cfd17c5427edf4da8d69df7a79df553e3b3c62f3..bebbb2f8ef278d414f89bf3c1c0b72bb7ab4ad19 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GHIJjsPolynomials.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GHIJjsPolynomials.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/GHmsjPolynomials.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GHmsjPolynomials.java index f8898e60cf057dae7e010a01a5f5490029b49435..b8bf68caca2290fa6696aebb275ae88b92858528 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GHmsjPolynomials.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GHmsjPolynomials.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/GammaMnsFunction.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GammaMnsFunction.java index 9579afeade220703dafd7e0e5236be74e44fc981..bcf6af22a73208f97753f4ceae135a690ee8086a 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GammaMnsFunction.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/GammaMnsFunction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/InterpolationGrid.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/InterpolationGrid.java index debddcbebde890d01c1bcf8785e3f1cb03c177df..ff7ed824aaa0cc0c1cd450ba44963118b4666320 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/InterpolationGrid.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/InterpolationGrid.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/JacobiPolynomials.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/JacobiPolynomials.java index 5cbb27fe452230ab1236b51f79533ed3335af23e..e7fdaff4b49e4183495bbae5286b0391aaaada8b 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/JacobiPolynomials.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/JacobiPolynomials.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/LnsCoefficients.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/LnsCoefficients.java index a0df601e6da755b23d56e255c3a75ff08ee2def3..6677a422dcc120609247c5421c14ca188268d132 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/LnsCoefficients.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/LnsCoefficients.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/MaxGapInterpolationGrid.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/MaxGapInterpolationGrid.java index e91c3118b1a948e8c41299f36206651b701d7c09..ddd886abe952206e4f4d42c5ffe10ee4249efaae 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/MaxGapInterpolationGrid.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/MaxGapInterpolationGrid.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/NewcombOperators.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/NewcombOperators.java index d13732aabcf9c736a676e8a2500eaa442a3264dc..323709a9fb9d3ca7ce1d386d79e6b2a51b96fa5c 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/NewcombOperators.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/NewcombOperators.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/ShortPeriodicsInterpolatedCoefficient.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/ShortPeriodicsInterpolatedCoefficient.java index a347096bcba0fc3e94c97bbc6617c11d94e433e9..906a364faba8045347c6776f58fcbbcfc387680a 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/ShortPeriodicsInterpolatedCoefficient.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/ShortPeriodicsInterpolatedCoefficient.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/UpperBounds.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/UpperBounds.java index a9e88379efe423eed9ec148f6703094290bfa2c2..8e61a67f8c8a9c4d9aa6069629b57a76c5e92808 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/UpperBounds.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/UpperBounds.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/hansen/HansenTesseralLinear.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenTesseralLinear.java index d92b2a69d84be2dc0d32fd81517e87c83c86f07b..8cb6b01e9c4f8a008dcabe133d1f5406955ebe21 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenTesseralLinear.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenTesseralLinear.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinear.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinear.java index 8a94a97246e1ad04134204e630f678fc2949c60b..f6fe599e14eddbcffcead643ca3492b839368992 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinear.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinear.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/hansen/HansenUtilities.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenUtilities.java index dedfe20b88d86af358a90316be4cd533f2df5a6b..23687b2561a31abedf650d4d450c810e79021964 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenUtilities.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenUtilities.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/hansen/HansenZonalLinear.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenZonalLinear.java index 2a700347f28e2f50f9ed5207c64ad72598efa328..672a33ab4b3b9dfd13bc49854cd3d18d29bd07c2 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenZonalLinear.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenZonalLinear.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/hansen/PolynomialFunctionMatrix.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/PolynomialFunctionMatrix.java index 8607538370002145d3e084cab954d176f1289d32..17d89133e6d7dc57f3fb99e1dae83c58593d4958 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/PolynomialFunctionMatrix.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/PolynomialFunctionMatrix.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/hansen/package-info.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/package-info.java index 6f33b882abadff99aeb458d6dc631e46af40fc74..2ceb5211701ee358ccc2a71947bcb5c820335248 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/package-info.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/package-info.java b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/package-info.java index f576a95cd95b3205a56f1ca45a179681dc0f3f64..e0017040bf908bd1732fa4703c93ffa51a6d758a 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/package-info.java +++ b/src/main/java/org/orekit/propagation/semianalytical/dsst/utilities/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/package-info.java b/src/main/java/org/orekit/propagation/semianalytical/package-info.java index b00d38fceceba3fe3ab20452525631e34a849675..6cc975b4845f7e41c50de4d93678bfde52cff744 100644 --- a/src/main/java/org/orekit/propagation/semianalytical/package-info.java +++ b/src/main/java/org/orekit/propagation/semianalytical/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/AbsoluteDate.java b/src/main/java/org/orekit/time/AbsoluteDate.java index cbe5ba0b070bd8262940ea0b431f4f64a218089c..c458b6ea557c9fba1f0bc4ca5f6e99e6cf79bd23 100644 --- a/src/main/java/org/orekit/time/AbsoluteDate.java +++ b/src/main/java/org/orekit/time/AbsoluteDate.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/BDTScale.java b/src/main/java/org/orekit/time/BDTScale.java index 0045fb08fbb31bd9657c9165860d965aba0548fb..5ca60f792cb384fa4c0473d35b2fd4af4969e556 100644 --- a/src/main/java/org/orekit/time/BDTScale.java +++ b/src/main/java/org/orekit/time/BDTScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2017 CS Systèmes d'Information +/* Copyright 2002-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/time/BurstSelector.java b/src/main/java/org/orekit/time/BurstSelector.java index 0f68b077f4d9eac937bf19c220edd6d9b142ef33..3c1fbe53b48c1ed17299c73b6f3c66fec125a288 100644 --- a/src/main/java/org/orekit/time/BurstSelector.java +++ b/src/main/java/org/orekit/time/BurstSelector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/ChronologicalComparator.java b/src/main/java/org/orekit/time/ChronologicalComparator.java index f2f2143e2fa040b314b0a34b4b04ffa85c4f6d88..fe788a09ea70f5480b329143441c71394e79cf77 100644 --- a/src/main/java/org/orekit/time/ChronologicalComparator.java +++ b/src/main/java/org/orekit/time/ChronologicalComparator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/DateComponents.java b/src/main/java/org/orekit/time/DateComponents.java index e6c81e13b14ab6911c7ec3886a51cb536eb353b9..c3eade51c62a6e3274d42305b837ef205bef682c 100644 --- a/src/main/java/org/orekit/time/DateComponents.java +++ b/src/main/java/org/orekit/time/DateComponents.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/DateTimeComponents.java b/src/main/java/org/orekit/time/DateTimeComponents.java index 0c351998e5f4b76cc786def6e497ff0605bd8c4c..4c7131b3bfe803bcc40408e2f539fd95e9c0a0f9 100644 --- a/src/main/java/org/orekit/time/DateTimeComponents.java +++ b/src/main/java/org/orekit/time/DateTimeComponents.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/DatesSelector.java b/src/main/java/org/orekit/time/DatesSelector.java index 46b3bfab0907c759f69243a4b5409fb5aee4ed3c..323fa08529627f29d4e4ce88db33f2505df616f4 100644 --- a/src/main/java/org/orekit/time/DatesSelector.java +++ b/src/main/java/org/orekit/time/DatesSelector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/FieldAbsoluteDate.java b/src/main/java/org/orekit/time/FieldAbsoluteDate.java index 1a43ad1f623e46ba4477af6de55b6392e1311512..8dbf3b7b6dd6bd8a707b5aca06810eaba8c73567 100644 --- a/src/main/java/org/orekit/time/FieldAbsoluteDate.java +++ b/src/main/java/org/orekit/time/FieldAbsoluteDate.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/FieldTimeInterpolable.java b/src/main/java/org/orekit/time/FieldTimeInterpolable.java index f206ddd33f2dde49d819cb3442bff0caa816703c..972ef29ef27ca9f3ed65c6fd8036c8b82c66ee8f 100644 --- a/src/main/java/org/orekit/time/FieldTimeInterpolable.java +++ b/src/main/java/org/orekit/time/FieldTimeInterpolable.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/FieldTimeShiftable.java b/src/main/java/org/orekit/time/FieldTimeShiftable.java index 3b6505021a93ff785dfa096c8727199d47d7f9e2..8762dc07d64ef3f97001caab1d9a52b30fe77e8e 100644 --- a/src/main/java/org/orekit/time/FieldTimeShiftable.java +++ b/src/main/java/org/orekit/time/FieldTimeShiftable.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/FieldTimeStamped.java b/src/main/java/org/orekit/time/FieldTimeStamped.java index b9c9bb8ee90b9220f5bb0ada9e31f391166d49a6..3982d0e9ff5a3a6ddc79b2d72a8883a1aa58656b 100644 --- a/src/main/java/org/orekit/time/FieldTimeStamped.java +++ b/src/main/java/org/orekit/time/FieldTimeStamped.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/FixedStepSelector.java b/src/main/java/org/orekit/time/FixedStepSelector.java index f9fdabd4e55ee55c4a1b61bfee63f83bbc75fc47..91c4e753a5cf05971d3c05dd41b321503d9039ec 100644 --- a/src/main/java/org/orekit/time/FixedStepSelector.java +++ b/src/main/java/org/orekit/time/FixedStepSelector.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GLONASSScale.java b/src/main/java/org/orekit/time/GLONASSScale.java index e0e50929ccbcff9badf5114f51b55567f6047968..ef5d5d0dc7882536859f0e73968f07f8b4e19398 100644 --- a/src/main/java/org/orekit/time/GLONASSScale.java +++ b/src/main/java/org/orekit/time/GLONASSScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GMSTScale.java b/src/main/java/org/orekit/time/GMSTScale.java index 8666ea5e9effe6de8e82ee1a055156bd31b43679..c388b99e6e890653f191ee9003ef59485900902e 100644 --- a/src/main/java/org/orekit/time/GMSTScale.java +++ b/src/main/java/org/orekit/time/GMSTScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GPSDate.java b/src/main/java/org/orekit/time/GPSDate.java index 591d9c763414d5daecc0daebfad1f1f78a3deacb..5205e54900d23f805237d6b1e35a973769398103 100644 --- a/src/main/java/org/orekit/time/GPSDate.java +++ b/src/main/java/org/orekit/time/GPSDate.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GPSScale.java b/src/main/java/org/orekit/time/GPSScale.java index 147d82c1bd84a091d6769ec6765e8f3749e9a70b..0a31cb80f5618f732e2725061d0c9484caf78149 100644 --- a/src/main/java/org/orekit/time/GPSScale.java +++ b/src/main/java/org/orekit/time/GPSScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GalileoScale.java b/src/main/java/org/orekit/time/GalileoScale.java index 2c5416885378066c135b7a3a314360262b4c179b..b7432675ddd1e8d0aa3a3193168cdda2f6c7d98a 100644 --- a/src/main/java/org/orekit/time/GalileoScale.java +++ b/src/main/java/org/orekit/time/GalileoScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/IRNSSScale.java b/src/main/java/org/orekit/time/IRNSSScale.java index 9a1b27927f5ff5168fbb071625f3f393b03ce071..21e1aa43aec3345b6fad5887d63e86ed5dc36c75 100644 --- a/src/main/java/org/orekit/time/IRNSSScale.java +++ b/src/main/java/org/orekit/time/IRNSSScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2017 CS Systèmes d'Information +/* Copyright 2002-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/time/Month.java b/src/main/java/org/orekit/time/Month.java index 8e2a07fba3566082733d5a3ac772b364c4a9628c..ab0420b6e5a0d30936f46ceb28b2077c4878b2d4 100644 --- a/src/main/java/org/orekit/time/Month.java +++ b/src/main/java/org/orekit/time/Month.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/OffsetModel.java b/src/main/java/org/orekit/time/OffsetModel.java index fb2c6c2d5da5465fea3e57a267f48599e0d02ab1..7eeacaaff9109c2a201e84c66ee0972661878a4f 100644 --- a/src/main/java/org/orekit/time/OffsetModel.java +++ b/src/main/java/org/orekit/time/OffsetModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/QZSSScale.java b/src/main/java/org/orekit/time/QZSSScale.java index 18bd7b38fdfcdb76e33cf84c56592752f5f7bf20..54eded1fe3e3eeed664d32e7086ac8c979e3e0c2 100644 --- a/src/main/java/org/orekit/time/QZSSScale.java +++ b/src/main/java/org/orekit/time/QZSSScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TAIScale.java b/src/main/java/org/orekit/time/TAIScale.java index 496c176e4b3e6ec51580aec01dc37016e623a6a4..8f20bcc08f2c1f2f97a8ecf02b5e1bd2e56878f0 100644 --- a/src/main/java/org/orekit/time/TAIScale.java +++ b/src/main/java/org/orekit/time/TAIScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TAIUTCDatFilesLoader.java b/src/main/java/org/orekit/time/TAIUTCDatFilesLoader.java index 548ace711c9d63c8e20a89bcd8ef2f62d4f08764..b6f6b7cdd6035a26f8f2d81a8f0667924a61f78c 100644 --- a/src/main/java/org/orekit/time/TAIUTCDatFilesLoader.java +++ b/src/main/java/org/orekit/time/TAIUTCDatFilesLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TCBScale.java b/src/main/java/org/orekit/time/TCBScale.java index 34a9bd3a5fa77c9242a55b010d1ab904ba17dc8f..2f605f753fde350bbaaa97e4b8234d9a98df306e 100644 --- a/src/main/java/org/orekit/time/TCBScale.java +++ b/src/main/java/org/orekit/time/TCBScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TCGScale.java b/src/main/java/org/orekit/time/TCGScale.java index a6b017dfb7a3532c611f41196fc4a5204206503a..db4c5adc21088dc73fc52cb95d18091bc002859e 100644 --- a/src/main/java/org/orekit/time/TCGScale.java +++ b/src/main/java/org/orekit/time/TCGScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TDBScale.java b/src/main/java/org/orekit/time/TDBScale.java index 8e55fcdb3cde987931dfa6f98c78fe1492126363..2798cde340696c5f2562d34d71a2a648cd78a8df 100644 --- a/src/main/java/org/orekit/time/TDBScale.java +++ b/src/main/java/org/orekit/time/TDBScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TTScale.java b/src/main/java/org/orekit/time/TTScale.java index de5e75a23f88dbde3378c68a7809013536863c0a..437085e7e6dc69c2eb8c71f88cf57e77de9ffa23 100644 --- a/src/main/java/org/orekit/time/TTScale.java +++ b/src/main/java/org/orekit/time/TTScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeComponents.java b/src/main/java/org/orekit/time/TimeComponents.java index d75ce30bc866f0d88433d7c3c6d63cc3a4c01cb7..a4043b88fa8ff34b39a9eb2515b1770415db782f 100644 --- a/src/main/java/org/orekit/time/TimeComponents.java +++ b/src/main/java/org/orekit/time/TimeComponents.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeInterpolable.java b/src/main/java/org/orekit/time/TimeInterpolable.java index decc5ee6cd6930e345584e01611d7cf00a71b4da..b49b73073246edd1b92b7d761f9173bba69ab989 100644 --- a/src/main/java/org/orekit/time/TimeInterpolable.java +++ b/src/main/java/org/orekit/time/TimeInterpolable.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeScalarFunction.java b/src/main/java/org/orekit/time/TimeScalarFunction.java index fa52b2cd0e9aab3c3177a0f36dcde92754d7ea12..4af9acc96dda32d2b4e94dc9e9fbbfe086972ebe 100644 --- a/src/main/java/org/orekit/time/TimeScalarFunction.java +++ b/src/main/java/org/orekit/time/TimeScalarFunction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeScale.java b/src/main/java/org/orekit/time/TimeScale.java index 776d7bdf77496b9faca6e4853297973ed8ea5c61..f6107aa29dbf80d08c62e67a54eea3bcb9075554 100644 --- a/src/main/java/org/orekit/time/TimeScale.java +++ b/src/main/java/org/orekit/time/TimeScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeScalesFactory.java b/src/main/java/org/orekit/time/TimeScalesFactory.java index 7dacc73d068e3c632c5d027c53ef64effa13ff1e..a5f1dcd89a0afd9cab7194b9089be446e30f6f68 100644 --- a/src/main/java/org/orekit/time/TimeScalesFactory.java +++ b/src/main/java/org/orekit/time/TimeScalesFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeShiftable.java b/src/main/java/org/orekit/time/TimeShiftable.java index 16d2cea2261ca04dfeab2c89c65f1fd213cc4e5c..3c0a3814eedec0548cbd0a1ed9a08a42fbeb64de 100644 --- a/src/main/java/org/orekit/time/TimeShiftable.java +++ b/src/main/java/org/orekit/time/TimeShiftable.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeStamped.java b/src/main/java/org/orekit/time/TimeStamped.java index 44a0d14627b903418338c94b1bc09e6dacb22c5f..b106741744bf14a26990fee826a036446fb0e81b 100644 --- a/src/main/java/org/orekit/time/TimeStamped.java +++ b/src/main/java/org/orekit/time/TimeStamped.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeVectorFunction.java b/src/main/java/org/orekit/time/TimeVectorFunction.java index 9ba1f707ac5ea3f1072bb943cf641e7d4eb449ea..379b9ed4f09180360aacbe4479703862579945df 100644 --- a/src/main/java/org/orekit/time/TimeVectorFunction.java +++ b/src/main/java/org/orekit/time/TimeVectorFunction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UT1Scale.java b/src/main/java/org/orekit/time/UT1Scale.java index b206174151f0ddaf614313f67d7d25204965f825..0bd469ae5228bd59636ef0e0b8a2522df620ba2f 100644 --- a/src/main/java/org/orekit/time/UT1Scale.java +++ b/src/main/java/org/orekit/time/UT1Scale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCScale.java b/src/main/java/org/orekit/time/UTCScale.java index adce0b904c305c5e398c5c092601d956fd052d75..52a2e5c0124199a42e60e2c73395a8d88755efea 100644 --- a/src/main/java/org/orekit/time/UTCScale.java +++ b/src/main/java/org/orekit/time/UTCScale.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIBulletinAFilesLoader.java b/src/main/java/org/orekit/time/UTCTAIBulletinAFilesLoader.java index 0a6976ff9aa5739dc955d08559f7c235c1407699..32a4d503217f067a337f01aadd1642957f553e64 100644 --- a/src/main/java/org/orekit/time/UTCTAIBulletinAFilesLoader.java +++ b/src/main/java/org/orekit/time/UTCTAIBulletinAFilesLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIHistoryFilesLoader.java b/src/main/java/org/orekit/time/UTCTAIHistoryFilesLoader.java index 6878b42fead7458fc04f3342dcfc4b40812cc36e..7999f810fd9f2031c681deecc0774333c69cbb2b 100644 --- a/src/main/java/org/orekit/time/UTCTAIHistoryFilesLoader.java +++ b/src/main/java/org/orekit/time/UTCTAIHistoryFilesLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIOffset.java b/src/main/java/org/orekit/time/UTCTAIOffset.java index f7282aad4e4815d2e1dbb55299c4605ef177eaf1..f36edd6283c5b5358fd4e9040eedf382cf4dc946 100644 --- a/src/main/java/org/orekit/time/UTCTAIOffset.java +++ b/src/main/java/org/orekit/time/UTCTAIOffset.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIOffsetsLoader.java b/src/main/java/org/orekit/time/UTCTAIOffsetsLoader.java index a78265d53f07eaf9c1f417af57e2a2cf54ec1dc6..c117916aac51b7ed4dc7456267940f785379da5d 100644 --- a/src/main/java/org/orekit/time/UTCTAIOffsetsLoader.java +++ b/src/main/java/org/orekit/time/UTCTAIOffsetsLoader.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/package-info.java b/src/main/java/org/orekit/time/package-info.java index efff931e1895a5018afefa85cc40fb81f71a58ee..68486739b1aed151b6bd3fe03293adbcc5ba3ad8 100644 --- a/src/main/java/org/orekit/time/package-info.java +++ b/src/main/java/org/orekit/time/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/AngularCoordinates.java b/src/main/java/org/orekit/utils/AngularCoordinates.java index c9f908e5560544e39c4f312661e04aba8de0a42a..673db781b68f9f6fc2b6e6612cc259c898491a9a 100644 --- a/src/main/java/org/orekit/utils/AngularCoordinates.java +++ b/src/main/java/org/orekit/utils/AngularCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/AngularDerivativesFilter.java b/src/main/java/org/orekit/utils/AngularDerivativesFilter.java index 9f35f1270255fab40042da21fb9ae9cc7cede5d1..0b8995e6656173f909f1bd9e8db5cea9b3bcda51 100644 --- a/src/main/java/org/orekit/utils/AngularDerivativesFilter.java +++ b/src/main/java/org/orekit/utils/AngularDerivativesFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/CartesianDerivativesFilter.java b/src/main/java/org/orekit/utils/CartesianDerivativesFilter.java index fc5755609fc50b5e49b34849cd3a7bb70970ab66..89cedeee6bbbfb4c27843ee212354a7c7ad6bc77 100644 --- a/src/main/java/org/orekit/utils/CartesianDerivativesFilter.java +++ b/src/main/java/org/orekit/utils/CartesianDerivativesFilter.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/Constants.java b/src/main/java/org/orekit/utils/Constants.java index afede78819a5611e1ba8a4ad0b2ce6af3fbb31fb..10dc38176dbee75c0f9e0a7c7c2683b56c0a0106 100644 --- a/src/main/java/org/orekit/utils/Constants.java +++ b/src/main/java/org/orekit/utils/Constants.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/Differentiation.java b/src/main/java/org/orekit/utils/Differentiation.java index c4b521f2b7c3a3dd5d6b4dc58fa56497a1d41618..03006374887772c62f10ecad823a8e1a77bd22f5 100644 --- a/src/main/java/org/orekit/utils/Differentiation.java +++ b/src/main/java/org/orekit/utils/Differentiation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,11 +21,8 @@ import org.hipparchus.analysis.UnivariateVectorFunction; import org.hipparchus.analysis.differentiation.DSFactory; import org.hipparchus.analysis.differentiation.DerivativeStructure; import org.hipparchus.analysis.differentiation.FiniteDifferencesDifferentiator; -import org.hipparchus.analysis.differentiation.UnivariateDifferentiableFunction; import org.hipparchus.analysis.differentiation.UnivariateDifferentiableVectorFunction; import org.orekit.attitudes.AttitudeProvider; -import org.orekit.errors.OrekitException; -import org.orekit.errors.OrekitMessages; import org.orekit.orbits.Orbit; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngle; @@ -50,41 +47,52 @@ public class Differentiation { * @param function function to differentiate * @param driver driver for the parameter * @param nbPoints number of points used for finite differences - * @param step step for finite differences + * @param normalizedStep step for finite differences, in <em>normalized</em> units * @return scalar function evaluating to the derivative of the original function + * @deprecated as of 9.3, replaced by {@link #differentiate(ParameterFunction, int, double)} + */ + @Deprecated + public static ParameterFunction differentiate(final ParameterFunction function, final ParameterDriver driver, + final int nbPoints, final double normalizedStep) { + return differentiate(function, nbPoints, normalizedStep * driver.getScale()); + } + + /** Differentiate a scalar function using finite differences. + * @param function function to differentiate + * @param nbPoints number of points used for finite differences + * @param step step for finite differences, in <em>physical</em> units + * @return scalar function evaluating to the derivative of the original function + * @since 9.3 */ public static ParameterFunction differentiate(final ParameterFunction function, - final ParameterDriver driver, final int nbPoints, final double step) { - final UnivariateFunction uf = new UnivariateFunction() { - /** {@inheritDoc} */ - @Override - public double value(final double normalizedValue) { - final double saved = driver.getNormalizedValue(); - driver.setNormalizedValue(normalizedValue); - final double functionValue = function.value(driver); - driver.setNormalizedValue(saved); - return functionValue; - } - }; + return new ParameterFunction() { - final FiniteDifferencesDifferentiator differentiator = - new FiniteDifferencesDifferentiator(nbPoints, step); - final UnivariateDifferentiableFunction differentiated = - differentiator.differentiate(uf); + /** Finite differences differentiator to use. */ + private final FiniteDifferencesDifferentiator differentiator = + new FiniteDifferencesDifferentiator(nbPoints, step); - return new ParameterFunction() { /** {@inheritDoc} */ @Override - public double value(final ParameterDriver parameterDriver) { - if (!parameterDriver.getName().equals(driver.getName())) { - throw new OrekitException(OrekitMessages.UNSUPPORTED_PARAMETER_NAME, - parameterDriver.getName(), driver.getName()); - } - final DerivativeStructure dsParam = FACTORY.variable(0, parameterDriver.getNormalizedValue()); - final DerivativeStructure dsValue = differentiated.value(dsParam); + public double value(final ParameterDriver driver) { + + final UnivariateFunction uf = new UnivariateFunction() { + /** {@inheritDoc} */ + @Override + public double value(final double value) { + final double saved = driver.getValue(); + driver.setValue(value); + final double functionValue = function.value(driver); + driver.setValue(saved); + return functionValue; + } + }; + + final DerivativeStructure dsParam = FACTORY.variable(0, driver.getValue()); + final DerivativeStructure dsValue = differentiator.differentiate(uf).value(dsParam); return dsValue.getPartialDerivative(1); + } }; diff --git a/src/main/java/org/orekit/utils/ExtendedPVCoordinatesProvider.java b/src/main/java/org/orekit/utils/ExtendedPVCoordinatesProvider.java index 4118ea884324d5497e26e77d4cbd025c7945979e..d9fdee747d3ddb84c6681abdda65820fa3cb357c 100644 --- a/src/main/java/org/orekit/utils/ExtendedPVCoordinatesProvider.java +++ b/src/main/java/org/orekit/utils/ExtendedPVCoordinatesProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/FieldAngularCoordinates.java b/src/main/java/org/orekit/utils/FieldAngularCoordinates.java index f3c20082303f07b6c16c275e6f2600fd3b2f9999..5614df010976fab6dd9e73e453051febaaff9c80 100644 --- a/src/main/java/org/orekit/utils/FieldAngularCoordinates.java +++ b/src/main/java/org/orekit/utils/FieldAngularCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/FieldPVCoordinates.java b/src/main/java/org/orekit/utils/FieldPVCoordinates.java index 9b5d503ee85f5a6966d5a3a604c3d3702b533148..5576658ac3cf4f75f8e70d0f27300aeb511ccae2 100644 --- a/src/main/java/org/orekit/utils/FieldPVCoordinates.java +++ b/src/main/java/org/orekit/utils/FieldPVCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/FieldPVCoordinatesProvider.java b/src/main/java/org/orekit/utils/FieldPVCoordinatesProvider.java index aeb879cc3f6fbe0d21a46054bdd5742a7f9d51e5..9cc0548e6292a95b805f6ef378cc2b5c2a11cb66 100644 --- a/src/main/java/org/orekit/utils/FieldPVCoordinatesProvider.java +++ b/src/main/java/org/orekit/utils/FieldPVCoordinatesProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/FieldTimeSpanMap.java b/src/main/java/org/orekit/utils/FieldTimeSpanMap.java index 0bfa3a5bd2d02ee7e5085dd6650571f439058538..82dec30061b42468f1ff98943fb5de7f691aec55 100644 --- a/src/main/java/org/orekit/utils/FieldTimeSpanMap.java +++ b/src/main/java/org/orekit/utils/FieldTimeSpanMap.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/GenericTimeStampedCache.java b/src/main/java/org/orekit/utils/GenericTimeStampedCache.java index e4bd97d03862b08ba0a079459520953d5a577cf5..1746a5aac234b9a7172e63f216b4297618d4e7c8 100644 --- a/src/main/java/org/orekit/utils/GenericTimeStampedCache.java +++ b/src/main/java/org/orekit/utils/GenericTimeStampedCache.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/IERSConventions.java b/src/main/java/org/orekit/utils/IERSConventions.java index 65fc23393c14d207d74d6616116b79c9ca32b10a..0bfa822b6da441f6087da2b6799f34ec8aed2b92 100644 --- a/src/main/java/org/orekit/utils/IERSConventions.java +++ b/src/main/java/org/orekit/utils/IERSConventions.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/LoveNumbers.java b/src/main/java/org/orekit/utils/LoveNumbers.java index 7a137c75ac831ac22f815bdf776b6c6fd041f2fc..20e99d965fb1bfba41851be201a49afcda8855cc 100644 --- a/src/main/java/org/orekit/utils/LoveNumbers.java +++ b/src/main/java/org/orekit/utils/LoveNumbers.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/OrekitConfiguration.java b/src/main/java/org/orekit/utils/OrekitConfiguration.java index a1d99e9295b42fda7568aad7ce5f99a3ddac465c..3960744744178b536b80daec9aa653a103465b00 100644 --- a/src/main/java/org/orekit/utils/OrekitConfiguration.java +++ b/src/main/java/org/orekit/utils/OrekitConfiguration.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/PVCoordinates.java b/src/main/java/org/orekit/utils/PVCoordinates.java index 90be025c6fa8f289955736fb84189e173173c5a4..b83ea6f7008b7259e14691c23beda94030e6faa5 100644 --- a/src/main/java/org/orekit/utils/PVCoordinates.java +++ b/src/main/java/org/orekit/utils/PVCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/PVCoordinatesProvider.java b/src/main/java/org/orekit/utils/PVCoordinatesProvider.java index e0001991322f5f356bb44995989d3c2477c91ac1..a102d97dbae3a5fe753baee46f3438d6ae180092 100644 --- a/src/main/java/org/orekit/utils/PVCoordinatesProvider.java +++ b/src/main/java/org/orekit/utils/PVCoordinatesProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/ParameterDriver.java b/src/main/java/org/orekit/utils/ParameterDriver.java index 97a5b73a81a4bc1cffbe272c57250ee6564d1e34..87c19893a62b0cf2ab06b2c9e93a0ca08887e741 100644 --- a/src/main/java/org/orekit/utils/ParameterDriver.java +++ b/src/main/java/org/orekit/utils/ParameterDriver.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Map; +import org.hipparchus.analysis.differentiation.DSFactory; +import org.hipparchus.analysis.differentiation.DerivativeStructure; import org.hipparchus.util.FastMath; import org.hipparchus.util.Precision; import org.orekit.errors.OrekitException; @@ -188,8 +191,7 @@ public class ParameterDriver { * @since 9.3 * @param referenceValue the reference value to set. */ - public void setReferenceValue(final double referenceValue) - { + public void setReferenceValue(final double referenceValue) { final double previousReferenceValue = this.referenceValue; this.referenceValue = referenceValue; for (final ParameterObserver observer : observers) { @@ -208,8 +210,7 @@ public class ParameterDriver { * @since 9.3 * @param minValue the minimum value to set. */ - public void setMinValue(final double minValue) - { + public void setMinValue(final double minValue) { final double previousMinValue = this.minValue; this.minValue = minValue; for (final ParameterObserver observer : observers) { @@ -230,8 +231,7 @@ public class ParameterDriver { * @since 9.3 * @param maxValue the maximum value to set. */ - public void setMaxValue(final double maxValue) - { + public void setMaxValue(final double maxValue) { final double previousMaxValue = this.maxValue; this.maxValue = maxValue; for (final ParameterObserver observer : observers) { @@ -252,8 +252,7 @@ public class ParameterDriver { * @since 9.3 * @param scale the scale to set. */ - public void setScale(final double scale) - { + public void setScale(final double scale) { final double previousScale = this.scale; this.scale = scale; for (final ParameterObserver observer : observers) { @@ -312,6 +311,17 @@ public class ParameterDriver { return value; } + /** Get the value as a derivative structure. + * @param factory factory for the derivatives + * @param indices indices of the differentiation parameters in derivatives computations + * @return value with derivatives + * @since 9.3 + */ + public DerivativeStructure getValue(final DSFactory factory, final Map<String, Integer> indices) { + final Integer index = indices.get(name); + return (index == null) ? factory.constant(value) : factory.variable(index, value); + } + /** Set parameter value. * <p> * If {@code newValue} is below {@link #getMinValue()}, it will diff --git a/src/main/java/org/orekit/utils/ParameterDriversList.java b/src/main/java/org/orekit/utils/ParameterDriversList.java index 92992a0ba143e7cd20cf214e22e87f04d566c1a7..0b2b3a414f5a229de962c51629910777f506914a 100644 --- a/src/main/java/org/orekit/utils/ParameterDriversList.java +++ b/src/main/java/org/orekit/utils/ParameterDriversList.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/ParameterFunction.java b/src/main/java/org/orekit/utils/ParameterFunction.java index 7e51cb60af5f9e226b1546e4dc003afa3096b28e..57c78ef3868c040a99d51b0949c91edafd42b32c 100644 --- a/src/main/java/org/orekit/utils/ParameterFunction.java +++ b/src/main/java/org/orekit/utils/ParameterFunction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/ParameterObserver.java b/src/main/java/org/orekit/utils/ParameterObserver.java index 3b478612c91891f1b8dc03c5cf36fe2ca3934cc8..5f1548bcd148f213942781af7c7a174abb0cd5c2 100644 --- a/src/main/java/org/orekit/utils/ParameterObserver.java +++ b/src/main/java/org/orekit/utils/ParameterObserver.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/SecularAndHarmonic.java b/src/main/java/org/orekit/utils/SecularAndHarmonic.java index 9fde5cb181c9971f3115353a2af1e9ff7c09e819..a4f41e05179d220087aa1f3969e19894deb2885c 100644 --- a/src/main/java/org/orekit/utils/SecularAndHarmonic.java +++ b/src/main/java/org/orekit/utils/SecularAndHarmonic.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/SphericalPolygonsSetTransferObject.java b/src/main/java/org/orekit/utils/SphericalPolygonsSetTransferObject.java index c5cbcc96c862997f957d121163c9396660c961ca..4f383ec5f50fed8187e9268e40816b3eea1a55b8 100644 --- a/src/main/java/org/orekit/utils/SphericalPolygonsSetTransferObject.java +++ b/src/main/java/org/orekit/utils/SphericalPolygonsSetTransferObject.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/StateFunction.java b/src/main/java/org/orekit/utils/StateFunction.java index 5bb4918aef6fa4e6c811b4040e67f28b8ba890a8..0f7b1a8466231827cff56534ca990c0d823060e1 100644 --- a/src/main/java/org/orekit/utils/StateFunction.java +++ b/src/main/java/org/orekit/utils/StateFunction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/StateJacobian.java b/src/main/java/org/orekit/utils/StateJacobian.java index 668b08bc35cf9ec0d3736b4944becbd792534ca9..586784aa0b63b47a713193e907b0dd664286690f 100644 --- a/src/main/java/org/orekit/utils/StateJacobian.java +++ b/src/main/java/org/orekit/utils/StateJacobian.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeSpanMap.java b/src/main/java/org/orekit/utils/TimeSpanMap.java index 452f50a92ca43469ef7caac570f3798189d0b323..5b1b9a29e4dd1e432ce51cd5fa5acfe5905b918b 100644 --- a/src/main/java/org/orekit/utils/TimeSpanMap.java +++ b/src/main/java/org/orekit/utils/TimeSpanMap.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedAngularCoordinates.java b/src/main/java/org/orekit/utils/TimeStampedAngularCoordinates.java index 0f3037f3b02d7a28222ec97836462f9dae793b2f..eae0983bafe636446dd2cca6778afc2b5b4edbb1 100644 --- a/src/main/java/org/orekit/utils/TimeStampedAngularCoordinates.java +++ b/src/main/java/org/orekit/utils/TimeStampedAngularCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedCache.java b/src/main/java/org/orekit/utils/TimeStampedCache.java index 428e8cb83254fe135fce9a6bb57abbf4ac61c591..abbd2ae4c7d7ff26084e7700f657462d08722ca4 100644 --- a/src/main/java/org/orekit/utils/TimeStampedCache.java +++ b/src/main/java/org/orekit/utils/TimeStampedCache.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedFieldAngularCoordinates.java b/src/main/java/org/orekit/utils/TimeStampedFieldAngularCoordinates.java index 0185ab6992ccb0d69de2fee1efaa1faafe6abbfc..8cd08cdbf25be99262f3c7d86c6769576151661e 100644 --- a/src/main/java/org/orekit/utils/TimeStampedFieldAngularCoordinates.java +++ b/src/main/java/org/orekit/utils/TimeStampedFieldAngularCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedFieldPVCoordinates.java b/src/main/java/org/orekit/utils/TimeStampedFieldPVCoordinates.java index 0c1e985180691b0da456ea51c5c7ee9c4a55c140..179077f5ba1a71230593ddf058ee8b91af1d2501 100644 --- a/src/main/java/org/orekit/utils/TimeStampedFieldPVCoordinates.java +++ b/src/main/java/org/orekit/utils/TimeStampedFieldPVCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -617,7 +617,7 @@ public class TimeStampedFieldPVCoordinates<T extends RealFieldElement<T>> */ public TimeStampedFieldPVCoordinates<T> shiftedBy(final T dt) { final FieldPVCoordinates<T> spv = super.shiftedBy(dt); - return new TimeStampedFieldPVCoordinates<>(date.shiftedBy(dt.getReal()), + return new TimeStampedFieldPVCoordinates<>(date.shiftedBy(dt), spv.getPosition(), spv.getVelocity(), spv.getAcceleration()); } diff --git a/src/main/java/org/orekit/utils/TimeStampedGenerator.java b/src/main/java/org/orekit/utils/TimeStampedGenerator.java index dea08ae543593f0072aa9928e80f28b8ac297757..de0227f2bc4c6ee55b9553569516b8ab924e24ed 100644 --- a/src/main/java/org/orekit/utils/TimeStampedGenerator.java +++ b/src/main/java/org/orekit/utils/TimeStampedGenerator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedPVCoordinates.java b/src/main/java/org/orekit/utils/TimeStampedPVCoordinates.java index 2a2810368f4812f01bb7b7c9c060af052c62da59..cc75f19579de2816dd6ba81540fe4f2f521031f1 100644 --- a/src/main/java/org/orekit/utils/TimeStampedPVCoordinates.java +++ b/src/main/java/org/orekit/utils/TimeStampedPVCoordinates.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/package-info.java b/src/main/java/org/orekit/utils/package-info.java index 5f1aa2156f44ba7db59ac6807ebd38aee56a1dd6..1a718fbb133f0b5db7381aebeb8a99aacb8ecc8b 100644 --- a/src/main/java/org/orekit/utils/package-info.java +++ b/src/main/java/org/orekit/utils/package-info.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/site/markdown/architecture/attitudes.md b/src/site/markdown/architecture/attitudes.md index 27a022150a43e801cd46564c83f00615014943c3..e623ee15d3122b500cc9a090f8f70ef42b0fcf75 100644 --- a/src/site/markdown/architecture/attitudes.md +++ b/src/site/markdown/architecture/attitudes.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/bodies.md b/src/site/markdown/architecture/bodies.md index 7863f5e50c02c237f7c3601fbcbceb2c5611cd9e..69fab7127d02c1b4b565033c762596f2faa56e8c 100644 --- a/src/site/markdown/architecture/bodies.md +++ b/src/site/markdown/architecture/bodies.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/errors.md b/src/site/markdown/architecture/errors.md index 98bacf760e49cf82de9dc7001ff606d7bcc1d75a..76391f5227201034a5fbdba24afe4fa45ef2f305 100644 --- a/src/site/markdown/architecture/errors.md +++ b/src/site/markdown/architecture/errors.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/estimation.md b/src/site/markdown/architecture/estimation.md index 7836c75c52ea331f0c03ad12bbb8772567fe6fa1..25a7b0174229c8c9deada3a3e979dc4df7818022 100644 --- a/src/site/markdown/architecture/estimation.md +++ b/src/site/markdown/architecture/estimation.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/forces.md b/src/site/markdown/architecture/forces.md index 942e68fd03adda4247f8e1d7780da40d8ef42e00..be5127271e011f8e4ecd050702183af1ec0d96e7 100644 --- a/src/site/markdown/architecture/forces.md +++ b/src/site/markdown/architecture/forces.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/frames.md b/src/site/markdown/architecture/frames.md index d55746269ef0363152e5be6466a109638886b84f..3d39557ea8b737d9abc8ea5fe5c22271a512047e 100644 --- a/src/site/markdown/architecture/frames.md +++ b/src/site/markdown/architecture/frames.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/orbits.md b/src/site/markdown/architecture/orbits.md index 027b3e11700ce74fb2d9d8a9a04ab2288937493a..1c38011533ba56470d9008e1a7eb9ac446e62637 100644 --- a/src/site/markdown/architecture/orbits.md +++ b/src/site/markdown/architecture/orbits.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/propagation.md b/src/site/markdown/architecture/propagation.md index 61e785a6548f41977cea3e4e5416c878d36c90b8..0c400baf300d5d093530a5165274edab66c48980 100644 --- a/src/site/markdown/architecture/propagation.md +++ b/src/site/markdown/architecture/propagation.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/tessellation.md b/src/site/markdown/architecture/tessellation.md index 8d939ece8c717e00401bf7d828d67e10d199b70c..1fb1d638869899060eebb169d212a6558af30d50 100644 --- a/src/site/markdown/architecture/tessellation.md +++ b/src/site/markdown/architecture/tessellation.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/time.md b/src/site/markdown/architecture/time.md index 35c05445ce8ceb77a4f71fc942270eb54aefde20..d1f8a0452831ab811a2083728aa2a45b2fec084f 100644 --- a/src/site/markdown/architecture/time.md +++ b/src/site/markdown/architecture/time.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/tle.md b/src/site/markdown/architecture/tle.md index 827dd1fd32d905bd619dce46ecd2440c3a09e4da..6a7077ed10674e7e9b06a97c8f745062930f9909 100644 --- a/src/site/markdown/architecture/tle.md +++ b/src/site/markdown/architecture/tle.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/architecture/utils.md b/src/site/markdown/architecture/utils.md index 984bae805fb1b8a33546c8f2643fb8d7eca631e8..972e422475af1131d859f58bf38d7c1d9f385e67 100644 --- a/src/site/markdown/architecture/utils.md +++ b/src/site/markdown/architecture/utils.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/building.md b/src/site/markdown/building.md index ad1f6fdec7651cf4b6f65ce3b542d3c65f374ae4..6e4fb2a1391db90b119fa23496f70af8d23ec1b1 100644 --- a/src/site/markdown/building.md +++ b/src/site/markdown/building.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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 @@ -97,7 +97,7 @@ The simplest way to use Orekit with Eclipse is to follow these steps: * using your operating system tools, unpack the source distribution directly inside your Eclipse workspace. The source distribution file name has a name - of the form orekit-x.y-sources.zip where x.y is the version number. Unpacking + of the form orekit-x.y-src.zip where x.y is the version number. Unpacking this zip file should create a folder of the form orekit-x.y in your workspace. * using Eclipse, import the project by selecting in the top level "File" menu diff --git a/src/site/markdown/configuration.md b/src/site/markdown/configuration.md index 37db8a1772f2fafc62c5653a23676638e116c246..3122f460299a554a3212d7ae0ece5b037678c525 100644 --- a/src/site/markdown/configuration.md +++ b/src/site/markdown/configuration.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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 @@ -228,21 +228,19 @@ announced above. ## Quick setup using default data -For convenience, a zip file containing some default data is available for -download on orekit forge: -[https://gitlab.orekit.org/orekit/orekit-data/-/archive/master/orekit-data-master.zip](https://gitlab.orekit.org/orekit/orekit-data/-/archive/master/orekit-data-master.zip). -For a start, the simplest configuration is to download the `orekit-data-master.zip` file from the download page, -to unzip it anywhere you want, note the path of the `orekit-data-master` folder that will be created and add the -following lines at the start of your program: +For convenience, 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-master"); + + File orekitData = new File("/path/to/the/folder/orekit-data"); DataProvidersManager manager = DataProvidersManager.getInstance(); manager.addProvider(new DirectoryCrawler(orekitData)); This zip file contains JPL DE 430 ephemerides from 1990 -to 2069, IERS Earth orientation parameters from 1973 -to June 2016 with predicted date to fall 2016 (both IAU-1980 -and IAU-2000), UTC-TAI history from 1972 to end of 2016, +to 2069, IERS Earth orientation parameters from 1973 (both IAU-1980 +and IAU-2000), UTC-TAI history from 1972, Marshall Solar Activity Futur Estimation from 1999 to mid 2016, the Eigen 06S gravity field and the FES 2004 ocean tides model. diff --git a/src/site/markdown/contact.md b/src/site/markdown/contact.md index 55befe90af3eefa06c12a82fe625771f63f60db3..7c0e768b576ff2316d1b27ff39ea75260a71f16d 100644 --- a/src/site/markdown/contact.md +++ b/src/site/markdown/contact.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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 @@ -18,6 +18,7 @@ Most discussions should occur on the public forums [https://forum.orekit.org/](https://forum.orekit.org/). The main categories are: + | category | URL | |---------------|----------------------------------------------------------------------------------------------------| | announces | [https://forum.orekit.org/c/orekit-announcements](https://forum.orekit.org/c/orekit-announcements) | diff --git a/src/site/markdown/contributing.md b/src/site/markdown/contributing.md index 34fdd3bde9ab3279879930bd22f1937e11943574..f6f28743bee0a0a0ee7af41443eb4c4daa091daf 100644 --- a/src/site/markdown/contributing.md +++ b/src/site/markdown/contributing.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/downloads.md b/src/site/markdown/downloads.md index 557f1c4dbf8bfd4ff5005648e44287d627394bc9..ee147aff224adea509f924e6a8ea42b82301d281 100644 --- a/src/site/markdown/downloads.md +++ b/src/site/markdown/downloads.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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 @@ -198,9 +198,11 @@ needed for their computation. * 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. + * 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. diff --git a/src/site/markdown/faq.md b/src/site/markdown/faq.md index 6bfdf3efa7d0c3875bb6814036fa1e3df54bf447..41e8905986570ade1e408a88ef786edc3f3da27a 100644 --- a/src/site/markdown/faq.md +++ b/src/site/markdown/faq.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/guidelines.md b/src/site/markdown/guidelines.md index 71fee4ee8910fefeeaef6a110759702a26433f0b..bef580ecf047c8f23a8a44073a60ede6eb4e9413 100644 --- a/src/site/markdown/guidelines.md +++ b/src/site/markdown/guidelines.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/index.md b/src/site/markdown/index.md index 6f7bc6e45d502ef0b542bfb5423b2de1f04ecdfd..87b17c12e53c60f006752e5228c177550011e199 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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 @@ -185,8 +185,8 @@ * orbital parameters estimation (or only a subset if desired) * force model parameters estimation (drag coefficients, radiation pressure coefficients, central attraction, maneuver thrust or flow rate) - * measurements parameters estimation (biases, station position, pole motion and rate, - prime meridian correction and rate) + * measurements parameters estimation (biases, satellite clock offset, station clock offset, + station position, pole motion and rate, prime meridian correction and rate) * multi-satellites orbit determination * ground stations displacements due to solid tides diff --git a/src/site/markdown/sources.md b/src/site/markdown/sources.md index c77fdb3a6e29b663022db7eec65494f88cf0c88f..664a3edcef81d7eea3d157b516478bf80cb61a87 100644 --- a/src/site/markdown/sources.md +++ b/src/site/markdown/sources.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/training.md b/src/site/markdown/training.md index 6b0c272b371e39ff12619a61c8b923fe3f7b0e1b..0fe0c255908095571218c004c63af997a3116616 100644 --- a/src/site/markdown/training.md +++ b/src/site/markdown/training.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/tutorial/attitude.md b/src/site/markdown/tutorial/attitude.md index 24e9761a871051aa06f9a6114bed07d3d7c822a2..468782db8a75f5107aeb6950f070cdb93e87658d 100644 --- a/src/site/markdown/tutorial/attitude.md +++ b/src/site/markdown/tutorial/attitude.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/tutorial/frames.md b/src/site/markdown/tutorial/frames.md index 74d2fa5683f9b4c8e599d1983d421f2cf929ff49..5a3f90a97a106d96a9c17fc1a70caacf1942e777 100644 --- a/src/site/markdown/tutorial/frames.md +++ b/src/site/markdown/tutorial/frames.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/tutorial/geomagnetic-field.md b/src/site/markdown/tutorial/geomagnetic-field.md index 2d9988267e9403e4d17d7394185eedd654bd5c3d..6c111e7bc28187cb932df163a8a69dacb7d732f2 100644 --- a/src/site/markdown/tutorial/geomagnetic-field.md +++ b/src/site/markdown/tutorial/geomagnetic-field.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/tutorial/integration-in-other-languages.md b/src/site/markdown/tutorial/integration-in-other-languages.md index 62c7f5e11780ac9dd49b1a4f1e653800c4c47093..4eb8410fab178284267d8118306acebb2d8923c7 100644 --- a/src/site/markdown/tutorial/integration-in-other-languages.md +++ b/src/site/markdown/tutorial/integration-in-other-languages.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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 @@ -31,7 +31,7 @@ javaaddpath to set the paths. Note that as of Matlab version 7.5.0 this needs to from the script to the Matlab prompt. % - % /* Copyright 2002-2018 CS Systèmes d'Information + % /* Copyright 2002-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. @@ -174,7 +174,7 @@ as your Jython files. This example is a translation of the SlaveMode.java example to Jython, showing a stepped Keplerian propagation. - /* Copyright 2002-2018 CS Systèmes d'Information + /* Copyright 2002-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. @@ -268,7 +268,7 @@ Keplerian propagation. This example is based on the VisiblityCheck.java, translated into Jython. It includes an example of subclassing of a Java object into a jython object. - /* Copyright 2002-2018 CS Systèmes d'Information + /* Copyright 2002-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/site/markdown/tutorial/propagation.md b/src/site/markdown/tutorial/propagation.md index 689db81327727443493a6d1d10ca1f2737b0ad87..c7ea1f48917025070c640b867f1a4f29d1b97e98 100644 --- a/src/site/markdown/tutorial/propagation.md +++ b/src/site/markdown/tutorial/propagation.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/markdown/tutorial/time.md b/src/site/markdown/tutorial/time.md index 2b39ab174c4a0dac0d940ba9de0ada24ba27d04b..2b5953d01c18be1964a531e4434c6215cb0fe116 100644 --- a/src/site/markdown/tutorial/time.md +++ b/src/site/markdown/tutorial/time.md @@ -1,4 +1,4 @@ -<!--- Copyright 2002-2018 CS Systèmes d'Information +<!--- Copyright 2002-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/site.xml b/src/site/site.xml index 122f67b4bdd6c8c67952559bade28bec6e53e6bd..97ef244bf823da46054a9af9930c39b3464ec39a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2002-2018 CS Systèmes d'Information + Copyright 2002-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/xdoc/changes.xml b/src/site/xdoc/changes.xml index ad61f39d35fa732241e1adaca34b49e6d460db78..b6ab2a8f061d3bc8e7d1f6b2a63f2426a1a88cd8 100644 --- a/src/site/xdoc/changes.xml +++ b/src/site/xdoc/changes.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- Copyright 2002-2018 CS Systèmes d'Information +<!-- Copyright 2002-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,6 +21,18 @@ </properties> <body> <release version="TBD" date="TBD" description="TBD"> + <action dev="luc" type="add" issue="515"> + Added clock offset parameter at satellites level for orbit determination. + </action> + <action dev="luc" type="add" issue="513"> + Added clock offset parameter at ground stations level for orbit determination. + </action> + <action dev="luc" type="fix" issue="510"> + Fixed dropped derivatives in TimeStampedFieldPVCoordinates.shiftedBy(dt). + </action> + <action dev="luc" type="fix" issue="509"> + Fixed scaling error in ParameterFunction differentiation. + </action> <action dev="luc" type="fix" issue="508"> Fixed inconsistency leading to inaccuracies in conversions from AbsoluteDate to FieldAbsoluteDate. </action> diff --git a/src/test/java/org/orekit/KeyValueFileParser.java b/src/test/java/org/orekit/KeyValueFileParser.java index 91bcd4acd458a207469a10fcf8c51fd51836e8d6..899ad4a0dfef7754c60cb3c74a3f658f8796833e 100644 --- a/src/test/java/org/orekit/KeyValueFileParser.java +++ b/src/test/java/org/orekit/KeyValueFileParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/SolarInputs97to05.java b/src/test/java/org/orekit/SolarInputs97to05.java index 6b166cb17e5790b8ce946c95e54d02fb513d26bb..c8c08bae47cab5e6afca691aa254974d27b8755c 100644 --- a/src/test/java/org/orekit/SolarInputs97to05.java +++ b/src/test/java/org/orekit/SolarInputs97to05.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/Utils.java b/src/test/java/org/orekit/Utils.java index 566981b8112880a728fb0ba1896be555074afcaf..ba63fd9ebb946e8d70e74a1c9098180d20a3ee91 100644 --- a/src/test/java/org/orekit/Utils.java +++ b/src/test/java/org/orekit/Utils.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/AttitudeTest.java b/src/test/java/org/orekit/attitudes/AttitudeTest.java index 7deb8b84010218e5c98d8ba9f4706f068214974f..ecef931ccf2cf0e3d9d75a0fcf1b31d4a1b65e75 100644 --- a/src/test/java/org/orekit/attitudes/AttitudeTest.java +++ b/src/test/java/org/orekit/attitudes/AttitudeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/AttitudesSequenceTest.java b/src/test/java/org/orekit/attitudes/AttitudesSequenceTest.java index ec8506e6b8c6bbf2e466cd2a839727d178bd2f19..dd6ccb163b98f6dcaee427583d01e76197a6d931 100644 --- a/src/test/java/org/orekit/attitudes/AttitudesSequenceTest.java +++ b/src/test/java/org/orekit/attitudes/AttitudesSequenceTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/BodyCenterPointingTest.java b/src/test/java/org/orekit/attitudes/BodyCenterPointingTest.java index 01dc32fd89431df2fc9086ca0cc2b37e9748db59..bfa950fe35cb2bdcc40e81585a541512ec52762c 100644 --- a/src/test/java/org/orekit/attitudes/BodyCenterPointingTest.java +++ b/src/test/java/org/orekit/attitudes/BodyCenterPointingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/CelestialBodyPointingTest.java b/src/test/java/org/orekit/attitudes/CelestialBodyPointingTest.java index 6265cd6e39fc7359c1b62a717e3d870e5ea73e19..b4ce463bda673c623640a80620bacd558486595e 100644 --- a/src/test/java/org/orekit/attitudes/CelestialBodyPointingTest.java +++ b/src/test/java/org/orekit/attitudes/CelestialBodyPointingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/FieldAttitudeTest.java b/src/test/java/org/orekit/attitudes/FieldAttitudeTest.java index 038cb44c7c93059cc5e8e2c1af7b8c32b08a5994..2947df0521004869fa4d22fcc7f8e51d5c07d424 100644 --- a/src/test/java/org/orekit/attitudes/FieldAttitudeTest.java +++ b/src/test/java/org/orekit/attitudes/FieldAttitudeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/FixedRateTest.java b/src/test/java/org/orekit/attitudes/FixedRateTest.java index 1c5cad0628acb130ca0e93bc764740d128b4f9cc..5a1ab8155fc268a06243b1f15e8b43f74b7632fe 100644 --- a/src/test/java/org/orekit/attitudes/FixedRateTest.java +++ b/src/test/java/org/orekit/attitudes/FixedRateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/InertialAttitudeTest.java b/src/test/java/org/orekit/attitudes/InertialAttitudeTest.java index 3a326bcc85a878548cfeddf8b8fb0d83a41327c1..d40efe9f997d9e0a2ab28ff28313c22dac9ecd92 100644 --- a/src/test/java/org/orekit/attitudes/InertialAttitudeTest.java +++ b/src/test/java/org/orekit/attitudes/InertialAttitudeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/LofOffsetPointingTest.java b/src/test/java/org/orekit/attitudes/LofOffsetPointingTest.java index 87cb7f20066445b34b41ea2f7870aa3f38bceab6..ecf85ef89849d7c154e4a25d39dd8b71f495b339 100644 --- a/src/test/java/org/orekit/attitudes/LofOffsetPointingTest.java +++ b/src/test/java/org/orekit/attitudes/LofOffsetPointingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/LofOffsetTest.java b/src/test/java/org/orekit/attitudes/LofOffsetTest.java index 77c9a21de666c44f4bc01e604fc0ed372562a616..da40bcdcfaef967835739813cb350729825d178f 100644 --- a/src/test/java/org/orekit/attitudes/LofOffsetTest.java +++ b/src/test/java/org/orekit/attitudes/LofOffsetTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/NadirPointingTest.java b/src/test/java/org/orekit/attitudes/NadirPointingTest.java index 5845f5f51cf8ad3fbd39a4435527cfffd86d5054..f9d54b9b868f359c1b760d8093ee3098dc01cba1 100644 --- a/src/test/java/org/orekit/attitudes/NadirPointingTest.java +++ b/src/test/java/org/orekit/attitudes/NadirPointingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/SpinStabilizedTest.java b/src/test/java/org/orekit/attitudes/SpinStabilizedTest.java index 0e988ff9f5063f09af77a6b15f2414bf8b862979..cb52358ef2940ac7a924438f7f66d1f212ccf71d 100644 --- a/src/test/java/org/orekit/attitudes/SpinStabilizedTest.java +++ b/src/test/java/org/orekit/attitudes/SpinStabilizedTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/TabulatedLofOffsetTest.java b/src/test/java/org/orekit/attitudes/TabulatedLofOffsetTest.java index a2b04a543012dcfc1776e96acf968215a52b5a99..3b97ecf59da7bae087a571febe372e46bfef8f40 100644 --- a/src/test/java/org/orekit/attitudes/TabulatedLofOffsetTest.java +++ b/src/test/java/org/orekit/attitudes/TabulatedLofOffsetTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/TabulatedProviderTest.java b/src/test/java/org/orekit/attitudes/TabulatedProviderTest.java index df2405f398b92806f97eea332149c3a82e56c25d..7104cbee68b00f677fd142b1c61024c40b15f90e 100644 --- a/src/test/java/org/orekit/attitudes/TabulatedProviderTest.java +++ b/src/test/java/org/orekit/attitudes/TabulatedProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/TargetPointingTest.java b/src/test/java/org/orekit/attitudes/TargetPointingTest.java index 930e385df7d45a7d3449843480de96826b5cd85a..00b584462ffdc5122a3805d7793336ec6f4a2418 100644 --- a/src/test/java/org/orekit/attitudes/TargetPointingTest.java +++ b/src/test/java/org/orekit/attitudes/TargetPointingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/YawCompensationTest.java b/src/test/java/org/orekit/attitudes/YawCompensationTest.java index d49ba6b2a0183b558277d3a658cf49eb91b590e4..49bed48e0450921d6c2ba71f0883842d68339109 100644 --- a/src/test/java/org/orekit/attitudes/YawCompensationTest.java +++ b/src/test/java/org/orekit/attitudes/YawCompensationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitudes/YawSteeringTest.java b/src/test/java/org/orekit/attitudes/YawSteeringTest.java index a1734992772d86a9c1c8a0b566b951c8e6e839ff..bf433468e8bc427d23add4a3f9ca418667ec4084 100644 --- a/src/test/java/org/orekit/attitudes/YawSteeringTest.java +++ b/src/test/java/org/orekit/attitudes/YawSteeringTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/CelestialBodyFactoryTest.java b/src/test/java/org/orekit/bodies/CelestialBodyFactoryTest.java index 020fd5ee1d7bf2cc0399bd8adbee099fd3bd56da..92afc5dacae0f71357128e451bf7d59148b2de14 100644 --- a/src/test/java/org/orekit/bodies/CelestialBodyFactoryTest.java +++ b/src/test/java/org/orekit/bodies/CelestialBodyFactoryTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/EllipseTest.java b/src/test/java/org/orekit/bodies/EllipseTest.java index db0810c8ba7b46525e58fb3433f430818fc78124..84af0f6d69780b3e8268f7b5636c953ae490b9e8 100644 --- a/src/test/java/org/orekit/bodies/EllipseTest.java +++ b/src/test/java/org/orekit/bodies/EllipseTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/EllipsoidTest.java b/src/test/java/org/orekit/bodies/EllipsoidTest.java index 98ae59ed2c6dff683838906b886ce0bb57bd0593..6399f8b427c1e0582c227982c097e3ece13a7a7f 100644 --- a/src/test/java/org/orekit/bodies/EllipsoidTest.java +++ b/src/test/java/org/orekit/bodies/EllipsoidTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/IAUPoleFactory.java b/src/test/java/org/orekit/bodies/IAUPoleFactory.java index d9a0b2e166d3b88d9f281e6fbd79779a5e97cbf6..66c1c0348358c2baec980fc7127e8c45249044dc 100644 --- a/src/test/java/org/orekit/bodies/IAUPoleFactory.java +++ b/src/test/java/org/orekit/bodies/IAUPoleFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/JPLEphemeridesLoaderTest.java b/src/test/java/org/orekit/bodies/JPLEphemeridesLoaderTest.java index e8153cc82f065605454c6161e364e6500af4b7e0..ee83936f0ece6d80c0f1ee9e982dc4ef926d114c 100644 --- a/src/test/java/org/orekit/bodies/JPLEphemeridesLoaderTest.java +++ b/src/test/java/org/orekit/bodies/JPLEphemeridesLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/OneAxisEllipsoidTest.java b/src/test/java/org/orekit/bodies/OneAxisEllipsoidTest.java index c7585d306c80c50d9a45e3452b8c7b34600774b4..35383041ca080914c4e2a3f0c927a1b31f9a2f58 100644 --- a/src/test/java/org/orekit/bodies/OneAxisEllipsoidTest.java +++ b/src/test/java/org/orekit/bodies/OneAxisEllipsoidTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/PredefinedIAUPolesTest.java b/src/test/java/org/orekit/bodies/PredefinedIAUPolesTest.java index acb5f4d11949cf5f9222583c82e7755e93400e64..8aa86fac6c611b155eb4ccee2680f60aad115c06 100644 --- a/src/test/java/org/orekit/bodies/PredefinedIAUPolesTest.java +++ b/src/test/java/org/orekit/bodies/PredefinedIAUPolesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/SolarBodyTest.java b/src/test/java/org/orekit/bodies/SolarBodyTest.java index f8d02ce1a2cbb91a8755e89b58eed8ce0d3056f4..90d9ed7907d1036304510daddec92f74f3fc33b6 100644 --- a/src/test/java/org/orekit/bodies/SolarBodyTest.java +++ b/src/test/java/org/orekit/bodies/SolarBodyTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/AbstractFilesLoaderTest.java b/src/test/java/org/orekit/data/AbstractFilesLoaderTest.java index 86d5b63bf2d90e288493e672cf9fbedc7c520d27..4d6d24e447a5b3866d6db334e8515fba9054c7c4 100644 --- a/src/test/java/org/orekit/data/AbstractFilesLoaderTest.java +++ b/src/test/java/org/orekit/data/AbstractFilesLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/AuthenticatorDialog.java b/src/test/java/org/orekit/data/AuthenticatorDialog.java index b47aa8eb496aab002bf75c3c69b6f0d81a35405f..e865803c87077ca34e9298de3497ac9bdf69cd04 100644 --- a/src/test/java/org/orekit/data/AuthenticatorDialog.java +++ b/src/test/java/org/orekit/data/AuthenticatorDialog.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/ClasspathCrawlerTest.java b/src/test/java/org/orekit/data/ClasspathCrawlerTest.java index 00e6409470a9f6a65f80fded8ebeed88556575c8..a03f26a626ce35bdd3780f9a07328236cf6206af 100644 --- a/src/test/java/org/orekit/data/ClasspathCrawlerTest.java +++ b/src/test/java/org/orekit/data/ClasspathCrawlerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DataProvidersManagerTest.java b/src/test/java/org/orekit/data/DataProvidersManagerTest.java index 3895c216886f3f636f60dbe7a339e3fc139964cf..3e7857a52e41d8a08c308126c04fb9ab18af4ca8 100644 --- a/src/test/java/org/orekit/data/DataProvidersManagerTest.java +++ b/src/test/java/org/orekit/data/DataProvidersManagerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/DirectoryCrawlerTest.java b/src/test/java/org/orekit/data/DirectoryCrawlerTest.java index 2c71f7b9256e7cc469aa298a1b9339e4a427ab55..e1f2096bf64c481ef7f7e9b6284ee34189263e03 100644 --- a/src/test/java/org/orekit/data/DirectoryCrawlerTest.java +++ b/src/test/java/org/orekit/data/DirectoryCrawlerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/FundamentalNutationArgumentsTest.java b/src/test/java/org/orekit/data/FundamentalNutationArgumentsTest.java index e652358847bfbb819370070b2517a30655f4f720..12ebe5edd4007272932856035e7e94d26cc3b86f 100644 --- a/src/test/java/org/orekit/data/FundamentalNutationArgumentsTest.java +++ b/src/test/java/org/orekit/data/FundamentalNutationArgumentsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/NetworkCrawlerTest.java b/src/test/java/org/orekit/data/NetworkCrawlerTest.java index 8cf0123130aca205e2c34a549f43365cb9fa05c2..be084dbdbe919cca15710baa9b05c13b2ef42c59 100644 --- a/src/test/java/org/orekit/data/NetworkCrawlerTest.java +++ b/src/test/java/org/orekit/data/NetworkCrawlerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/NutationCodecTest.java b/src/test/java/org/orekit/data/NutationCodecTest.java index 5a29e057e682fb35afd468b8c91fe0a7e63bf05f..e556cff1aef7bde0c7a288a3d32cb978a65385e3 100644 --- a/src/test/java/org/orekit/data/NutationCodecTest.java +++ b/src/test/java/org/orekit/data/NutationCodecTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/PoissonSeriesParserTest.java b/src/test/java/org/orekit/data/PoissonSeriesParserTest.java index b57d4ccc485348a5bb593732e71dd37c5871bbe3..81b2b5d06e0d6970ee2f0e699f4cc8e28083857e 100644 --- a/src/test/java/org/orekit/data/PoissonSeriesParserTest.java +++ b/src/test/java/org/orekit/data/PoissonSeriesParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/PolynomialParserTest.java b/src/test/java/org/orekit/data/PolynomialParserTest.java index 4e3705bebac7c2b541787dcb980056186cb586a5..9257fa82fa5ab1dc7c0c49a1dbc254833abe5462 100644 --- a/src/test/java/org/orekit/data/PolynomialParserTest.java +++ b/src/test/java/org/orekit/data/PolynomialParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/UnixCompressFilterTest.java b/src/test/java/org/orekit/data/UnixCompressFilterTest.java index c3d1c230ab37a757588fd00bd40ae3b9c80aef44..1ba9a2b9c85627931b57545b7d19abf51cb241f4 100644 --- a/src/test/java/org/orekit/data/UnixCompressFilterTest.java +++ b/src/test/java/org/orekit/data/UnixCompressFilterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/data/ZipJarCrawlerTest.java b/src/test/java/org/orekit/data/ZipJarCrawlerTest.java index 7951ad1436e33a8acccee323f42cbf24a6550ca2..9677b11c737893738bbdd7da5937f1cb11caa663 100644 --- a/src/test/java/org/orekit/data/ZipJarCrawlerTest.java +++ b/src/test/java/org/orekit/data/ZipJarCrawlerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitExceptionTest.java b/src/test/java/org/orekit/errors/OrekitExceptionTest.java index 9a4759182b9a9d70f9d06aafc1cf5a48e9de90b7..afff9baca2e84708f8121d293275575a84c5ce36 100644 --- a/src/test/java/org/orekit/errors/OrekitExceptionTest.java +++ b/src/test/java/org/orekit/errors/OrekitExceptionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitExceptionWrapperTest.java b/src/test/java/org/orekit/errors/OrekitExceptionWrapperTest.java index a0ab4967057556e44b80631d655c8ad35e4ac6e5..80c8f1b0cf36a599afc7ae43b7b886a2d3d30736 100644 --- a/src/test/java/org/orekit/errors/OrekitExceptionWrapperTest.java +++ b/src/test/java/org/orekit/errors/OrekitExceptionWrapperTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitIllegalArgumentExceptionTest.java b/src/test/java/org/orekit/errors/OrekitIllegalArgumentExceptionTest.java index ad1566fdd008fd8e451af540fe4e47669607e146..fdec24b8f23cbb5bd3717de5596e64a827d6789e 100644 --- a/src/test/java/org/orekit/errors/OrekitIllegalArgumentExceptionTest.java +++ b/src/test/java/org/orekit/errors/OrekitIllegalArgumentExceptionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitIllegalStateExceptionTest.java b/src/test/java/org/orekit/errors/OrekitIllegalStateExceptionTest.java index d5a3e4bafd5b5031573e3a57ae21ceb99c56b1fb..bb01e2ee46fe19ecc38d21918264bc04ac90dccd 100644 --- a/src/test/java/org/orekit/errors/OrekitIllegalStateExceptionTest.java +++ b/src/test/java/org/orekit/errors/OrekitIllegalStateExceptionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitInternalErrorTest.java b/src/test/java/org/orekit/errors/OrekitInternalErrorTest.java index 4ed62a5cc954e9ea1cd1bf1040413a38e2473221..0435a56cbde5d5e0cc8f6f9991eeeaeaa0ca1549 100644 --- a/src/test/java/org/orekit/errors/OrekitInternalErrorTest.java +++ b/src/test/java/org/orekit/errors/OrekitInternalErrorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitMessagesTest.java b/src/test/java/org/orekit/errors/OrekitMessagesTest.java index 3680aba71f43b97f90400b8af4d83f55c1a2429d..03d0fc25daeb8b7f7190cc6fb621f2a6b3cafee6 100644 --- a/src/test/java/org/orekit/errors/OrekitMessagesTest.java +++ b/src/test/java/org/orekit/errors/OrekitMessagesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/OrekitParseExceptionTest.java b/src/test/java/org/orekit/errors/OrekitParseExceptionTest.java index 6a0b342669795bd5639f97041e1efb96a44886ab..706557434acd5abe15cefacc07027cec76f7d989 100644 --- a/src/test/java/org/orekit/errors/OrekitParseExceptionTest.java +++ b/src/test/java/org/orekit/errors/OrekitParseExceptionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/errors/TimeStampedCacheExceptionTest.java b/src/test/java/org/orekit/errors/TimeStampedCacheExceptionTest.java index dbfc406397376a8ebe4a2be776a4f5b1ca56250a..6ebe3f77dea2ba0bfd8c959f3adc2add6ce0efaf 100644 --- a/src/test/java/org/orekit/errors/TimeStampedCacheExceptionTest.java +++ b/src/test/java/org/orekit/errors/TimeStampedCacheExceptionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/Context.java b/src/test/java/org/orekit/estimation/Context.java index c8a31430a41d58e05609d6c7ea169c61e9273a9d..eeea5d7226e1cfaec7dd1a8310949bbab8127a6c 100644 --- a/src/test/java/org/orekit/estimation/Context.java +++ b/src/test/java/org/orekit/estimation/Context.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -62,8 +62,7 @@ public class Context { public NumericalPropagatorBuilder createBuilder(final OrbitType orbitType, final PositionAngle positionAngle, final boolean perfectStart, final double minStep, final double maxStep, final double dP, - final Force... forces) - { + final Force... forces) { final Orbit startOrbit; if (perfectStart) { @@ -93,8 +92,7 @@ public class Context { } GroundStation createStation(double latitudeInDegrees, double longitudeInDegrees, - double altitude, String name) - { + double altitude, String name) { final GeodeticPoint gp = new GeodeticPoint(FastMath.toRadians(latitudeInDegrees), FastMath.toRadians(longitudeInDegrees), altitude); diff --git a/src/test/java/org/orekit/estimation/EstimationTestUtils.java b/src/test/java/org/orekit/estimation/EstimationTestUtils.java index f8cdda5f9f83cfec3b0c2c1522c21e7b76e153c9..db9d9076a1cabdb602d22e88a4c7cce1c01a8fdb 100644 --- a/src/test/java/org/orekit/estimation/EstimationTestUtils.java +++ b/src/test/java/org/orekit/estimation/EstimationTestUtils.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -233,8 +233,7 @@ public class EstimationTestUtils { } public static Propagator createPropagator(final Orbit initialOrbit, - final PropagatorBuilder propagatorBuilder) - { + final PropagatorBuilder propagatorBuilder) { // override orbital parameters double[] orbitArray = new double[6]; @@ -250,10 +249,9 @@ public class EstimationTestUtils { } public static List<ObservedMeasurement<?>> createMeasurements(final Propagator propagator, - final MeasurementCreator creator, - final double startPeriod, final double endPeriod, - final double step) - { + final MeasurementCreator creator, + final double startPeriod, final double endPeriod, + final double step) { propagator.setMasterMode(step, creator); final double period = propagator.getInitialState().getKeplerianPeriod(); @@ -295,8 +293,7 @@ public class EstimationTestUtils { final double expectedRMS, final double rmsEps, final double expectedMax, final double maxEps, final double expectedDeltaPos, final double posEps, - final double expectedDeltaVel, final double velEps) - { + final double expectedDeltaVel, final double velEps) { final Orbit estimatedOrbit = estimator.estimate()[0].getInitialState().getOrbit(); final Vector3D estimatedPosition = estimatedOrbit.getPVCoordinates().getPosition(); diff --git a/src/test/java/org/orekit/estimation/Force.java b/src/test/java/org/orekit/estimation/Force.java index 2e8e7e3b2b373f1cbbf133006418fe8df51f41e1..9a8557d6bd5051940aca0da75a924217d2d68925 100644 --- a/src/test/java/org/orekit/estimation/Force.java +++ b/src/test/java/org/orekit/estimation/Force.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/iod/IodGibbsTest.java b/src/test/java/org/orekit/estimation/iod/IodGibbsTest.java index b90b256934e714541b0a006f207d65121dabf3ee..9bb46ae95e0214292a05a601db8d7b1b70eee7f1 100644 --- a/src/test/java/org/orekit/estimation/iod/IodGibbsTest.java +++ b/src/test/java/org/orekit/estimation/iod/IodGibbsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +24,7 @@ import org.junit.Assert; import org.junit.Test; import org.orekit.estimation.Context; import org.orekit.estimation.EstimationTestUtils; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.PV; import org.orekit.estimation.measurements.PVMeasurementCreator; @@ -60,6 +61,7 @@ public class IodGibbsTest { // create perfect range measurements final Propagator propagator = EstimationTestUtils.createPropagator(context.initialOrbit, propagatorBuilder); + final ObservableSatellite satellite = new ObservableSatellite(0); final List<ObservedMeasurement<?>> measurements = EstimationTestUtils.createMeasurements(propagator, @@ -69,17 +71,17 @@ public class IodGibbsTest { final Vector3D position1 = new Vector3D(measurements.get(0).getObservedValue()[0], measurements.get(0).getObservedValue()[1], measurements.get(0).getObservedValue()[2]); - final PV pv1 = new PV(measurements.get(0).getDate(), position1, Vector3D.ZERO, 0., 0., 1.); + final PV pv1 = new PV(measurements.get(0).getDate(), position1, Vector3D.ZERO, 0., 0., 1., satellite); final Vector3D position2 = new Vector3D(measurements.get(1).getObservedValue()[0], measurements.get(1).getObservedValue()[1], measurements.get(1).getObservedValue()[2]); - final PV pv2 = new PV(measurements.get(1).getDate(), position2, Vector3D.ZERO, 0., 0., 1.); + final PV pv2 = new PV(measurements.get(1).getDate(), position2, Vector3D.ZERO, 0., 0., 1., satellite); final Vector3D position3 = new Vector3D(measurements.get(2).getObservedValue()[0], measurements.get(2).getObservedValue()[1], measurements.get(2).getObservedValue()[2]); - final PV pv3 = new PV(measurements.get(2).getDate(), position3, Vector3D.ZERO, 0., 0., 1.); + final PV pv3 = new PV(measurements.get(2).getDate(), position3, Vector3D.ZERO, 0., 0., 1., satellite); // instantiate the IOD method final IodGibbs gibbs = new IodGibbs(mu); diff --git a/src/test/java/org/orekit/estimation/iod/IodGoodingTest.java b/src/test/java/org/orekit/estimation/iod/IodGoodingTest.java index 97b4c385178c38905ba4d4a18fd765d29147521c..8bc377f05b6bc21105166571ebd137ec4b63e602 100644 --- a/src/test/java/org/orekit/estimation/iod/IodGoodingTest.java +++ b/src/test/java/org/orekit/estimation/iod/IodGoodingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/iod/IodLambertTest.java b/src/test/java/org/orekit/estimation/iod/IodLambertTest.java index 64f4ff6968683aad06e231396914e55ae2adac91..ce2952e4fd9ad515565d6edf89804227e2b36d27 100644 --- a/src/test/java/org/orekit/estimation/iod/IodLambertTest.java +++ b/src/test/java/org/orekit/estimation/iod/IodLambertTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/leastsquares/BatchLSEstimatorTest.java b/src/test/java/org/orekit/estimation/leastsquares/BatchLSEstimatorTest.java index 991c783795e1b7c31224cbd3571e922a2f126810..4fe1c36078cb372a26fca7b81a582c9c88d54aee 100644 --- a/src/test/java/org/orekit/estimation/leastsquares/BatchLSEstimatorTest.java +++ b/src/test/java/org/orekit/estimation/leastsquares/BatchLSEstimatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -187,8 +187,7 @@ public class BatchLSEstimatorTest { ParameterDriversList estimatedOrbitalParameters, ParameterDriversList estimatedPropagatorParameters, ParameterDriversList estimatedMeasurementsParameters, - EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) - { + EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) { if (iterationsCount == lastIter) { Assert.assertEquals(lastEval + 1, evaluationscount); } else { @@ -262,7 +261,7 @@ public class BatchLSEstimatorTest { propagatorBuilder); final List<ObservedMeasurement<?>> measurements = EstimationTestUtils.createMeasurements(propagator, - new RangeMeasurementCreator(context, antennaPhaseCenter), + new RangeMeasurementCreator(context, antennaPhaseCenter, 0.0), 1.0, 3.0, 300.0); // create orbit estimator @@ -286,8 +285,7 @@ public class BatchLSEstimatorTest { ParameterDriversList estimatedOrbitalParameters, ParameterDriversList estimatedPropagatorParameters, ParameterDriversList estimatedMeasurementsParameters, - EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) - { + EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) { if (iterationsCount == lastIter) { Assert.assertEquals(lastEval + 1, evaluationscount); } else { @@ -404,8 +402,7 @@ public class BatchLSEstimatorTest { ParameterDriversList estimatedOrbitalParameters, ParameterDriversList estimatedPropagatorParameters, ParameterDriversList estimatedMeasurementsParameters, - EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) - { + EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) { if (iterationsCount == lastIter) { Assert.assertEquals(lastEval + 1, evaluationscount); } else { @@ -467,8 +464,8 @@ public class BatchLSEstimatorTest { EstimationTestUtils.checkFit(context, estimator, 2, 3, 0.0, 2.3e-06, 0.0, 6.6e-06, - 0.0, 6.2e-07, - 0.0, 2.8e-10); + 0.0, 6.4e-07, + 0.0, 2.9e-10); final Orbit determined = new KeplerianOrbit(parameters.get( 6).getValue(), parameters.get( 7).getValue(), @@ -613,8 +610,7 @@ public class BatchLSEstimatorTest { ParameterDriversList estimatedOrbitalParameters, ParameterDriversList estimatedPropagatorParameters, ParameterDriversList estimatedMeasurementsParameters, - EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) - { + EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) { if (iterationsCount == lastIter) { Assert.assertEquals(lastEval + 1, evaluationscount); } else { @@ -644,15 +640,15 @@ public class BatchLSEstimatorTest { a1Driver.setReferenceDate(AbsoluteDate.GALILEO_EPOCH); final Orbit before = new KeplerianOrbit(parameters.get( 6).getValue(), - parameters.get( 7).getValue(), - parameters.get( 8).getValue(), - parameters.get( 9).getValue(), - parameters.get(10).getValue(), - parameters.get(11).getValue(), - PositionAngle.TRUE, - closeOrbit.getFrame(), - closeOrbit.getDate(), - closeOrbit.getMu()); + parameters.get( 7).getValue(), + parameters.get( 8).getValue(), + parameters.get( 9).getValue(), + parameters.get(10).getValue(), + parameters.get(11).getValue(), + PositionAngle.TRUE, + closeOrbit.getFrame(), + closeOrbit.getDate(), + closeOrbit.getMu()); Assert.assertEquals(4.7246, Vector3D.distance(closeOrbit.getPVCoordinates().getPosition(), before.getPVCoordinates().getPosition()), @@ -661,7 +657,7 @@ public class BatchLSEstimatorTest { Vector3D.distance(closeOrbit.getPVCoordinates().getVelocity(), before.getPVCoordinates().getVelocity()), 1.0e-6); - EstimationTestUtils.checkFit(context, estimator, 4, 5, + EstimationTestUtils.checkFit(context, estimator, 3, 4, 0.0, 6.0e-06, 0.0, 1.7e-05, 0.0, 4.4e-07, @@ -734,7 +730,7 @@ public class BatchLSEstimatorTest { ParameterDriversList estimatedOrbitalParameters, ParameterDriversList estimatedPropagatorParameters, ParameterDriversList estimatedMeasurementsParameters, - EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) throws DummyException { + EstimationsProvider evaluationsProvider, Evaluation lspEvaluation) { throw new DummyException(); } }); diff --git a/src/test/java/org/orekit/estimation/leastsquares/ModelTest.java b/src/test/java/org/orekit/estimation/leastsquares/ModelTest.java index 0b38572b2186790447f32336ec1497db273c8e32..a2d4af386096a0ce0a2c7364466ea183ab58dfbb 100644 --- a/src/test/java/org/orekit/estimation/leastsquares/ModelTest.java +++ b/src/test/java/org/orekit/estimation/leastsquares/ModelTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/leastsquares/OrbitDeterminationTest.java b/src/test/java/org/orekit/estimation/leastsquares/OrbitDeterminationTest.java index 989697ae1a8b4fe0ee71c9286f3bf37555a933eb..e911c9f1e8736a1c6195789a6157a4f043ab4530 100644 --- a/src/test/java/org/orekit/estimation/leastsquares/OrbitDeterminationTest.java +++ b/src/test/java/org/orekit/estimation/leastsquares/OrbitDeterminationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -68,6 +68,7 @@ import org.orekit.estimation.measurements.AngularAzEl; import org.orekit.estimation.measurements.EstimatedMeasurement; import org.orekit.estimation.measurements.EstimationsProvider; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.PV; import org.orekit.estimation.measurements.Range; @@ -227,7 +228,7 @@ public class OrbitDeterminationTest { GravityFieldFactory.addPotentialCoefficientsReader(new ICGEMFormatReader("eigen-6s-truncated", true)); //orbit determination run. - ResultOD odGNSS = run(input, false); + ResultOD odGNSS = run(input, true); //test //definition of the accuracy for the test @@ -499,6 +500,7 @@ public class OrbitDeterminationTest { final Map<String, StationData> stations = createStationsData(parser, conventions, body); final PVData pvData = createPVData(parser); + final ObservableSatellite satellite = createObservableSatellite(parser); final Bias<Range> satRangeBias = createSatRangeBias(parser); final OnBoardAntennaRangeModifier satAntennaRangeModifier = createSatAntennaRangeModifier(parser); final Weights weights = createWeights(parser); @@ -515,12 +517,13 @@ public class OrbitDeterminationTest { // the measurements come from a Rinex file measurements.addAll(readRinex(new File(input.getParentFile(), fileName), parser.getString(ParameterKey.SATELLITE_ID_IN_RINEX_FILES), - stations, satRangeBias, satAntennaRangeModifier, weights, + stations, satellite, satRangeBias, satAntennaRangeModifier, weights, rangeOutliersManager, rangeRateOutliersManager)); } else { // the measurements come from an Orekit custom file measurements.addAll(readMeasurements(new File(input.getParentFile(), fileName), - stations, pvData, satRangeBias, satAntennaRangeModifier, weights, + stations, pvData, satellite, + satRangeBias, satAntennaRangeModifier, weights, rangeOutliersManager, rangeRateOutliersManager, azElOutliersManager, @@ -1074,6 +1077,10 @@ public class OrbitDeterminationTest { final double[] stationLongitudes = parser.getAngleArray(ParameterKey.GROUND_STATION_LONGITUDE); final double[] stationAltitudes = parser.getDoubleArray(ParameterKey.GROUND_STATION_ALTITUDE); final boolean[] stationPositionEstimated = parser.getBooleanArray(ParameterKey.GROUND_STATION_POSITION_ESTIMATED); + final double[] stationClockOffsets = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET); + final double[] stationClockOffsetsMin = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_MIN); + final double[] stationClockOffsetsMax = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_MAX); + final boolean[] stationClockOffsetEstimated = parser.getBooleanArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_ESTIMATED); final double[] stationRangeSigma = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_SIGMA); final double[] stationRangeBias = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_BIAS); final double[] stationRangeBiasMin = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_BIAS_MIN); @@ -1161,6 +1168,11 @@ public class OrbitDeterminationTest { stationAltitudes[i]); final TopocentricFrame topo = new TopocentricFrame(body, position, stationNames[i]); final GroundStation station = new GroundStation(topo, eopHistory, displacements); + station.getClockOffsetDriver().setReferenceValue(stationClockOffsets[i]); + station.getClockOffsetDriver().setValue(stationClockOffsets[i]); + station.getClockOffsetDriver().setMinValue(stationClockOffsetsMin[i]); + station.getClockOffsetDriver().setMaxValue(stationClockOffsetsMax[i]); + station.getClockOffsetDriver().setSelected(stationClockOffsetEstimated[i]); station.getEastOffsetDriver().setSelected(stationPositionEstimated[i]); station.getNorthOffsetDriver().setSelected(stationPositionEstimated[i]); station.getZenithOffsetDriver().setSelected(stationPositionEstimated[i]); @@ -1390,6 +1402,31 @@ public class OrbitDeterminationTest { parser.getDouble(ParameterKey.PV_MEASUREMENTS_VELOCITY_SIGMA)); } + /** Set up satellite data. + * @param parser input file parser + * @return satellite data + * @throws NoSuchElementException if input parameters are missing + */ + private ObservableSatellite createObservableSatellite(final KeyValueFileParser<ParameterKey> parser) + throws NoSuchElementException { + ObservableSatellite obsSat = new ObservableSatellite(0); + ParameterDriver clockOffsetDriver = obsSat.getClockOffsetDriver(); + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET)) { + clockOffsetDriver.setReferenceValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET)); + clockOffsetDriver.setValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_MIN)) { + clockOffsetDriver.setMinValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET_MIN)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_MAX)) { + clockOffsetDriver.setMaxValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET_MAX)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_ESTIMATED)) { + clockOffsetDriver.setSelected(parser.getBoolean(ParameterKey.ON_BOARD_CLOCK_OFFSET_ESTIMATED)); + } + return obsSat; + } + /** Set up estimator. * @param parser input file parser * @param propagatorBuilder propagator builder @@ -1455,6 +1492,7 @@ public class OrbitDeterminationTest { * @param file measurements file * @param satId satellite we are interested in * @param stations name to stations data map + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param satAntennaRangeModifier modifier for on-board antenna offset * @param weights base weights for measurements @@ -1464,6 +1502,7 @@ public class OrbitDeterminationTest { */ private List<ObservedMeasurement<?>> readRinex(final File file, final String satId, final Map<String, StationData> stations, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final OnBoardAntennaRangeModifier satAntennaRangeModifier, final Weights weights, @@ -1500,9 +1539,9 @@ public class OrbitDeterminationTest { throw new OrekitException(LocalizedCoreFormats.SIMPLE_MESSAGE, stationName + " not configured"); } - Range range = new Range(stationData.station, observationDataSet.getDate(), + Range range = new Range(stationData.station, false, observationDataSet.getDate(), od.getValue(), stationData.rangeSigma, - weights.rangeBaseWeight, false); + weights.rangeBaseWeight, satellite); range.addModifier(iono.getRangeModifier(od.getObservationType().getFrequency(system), observationDataSet.getDate())); if (satAntennaRangeModifier != null) { @@ -1530,7 +1569,7 @@ public class OrbitDeterminationTest { } RangeRate rangeRate = new RangeRate(stationData.station, observationDataSet.getDate(), od.getValue(), stationData.rangeRateSigma, - weights.rangeRateBaseWeight, false); + weights.rangeRateBaseWeight, false, satellite); rangeRate.addModifier(iono.getRangeRateModifier(od.getObservationType().getFrequency(system), observationDataSet.getDate())); if (stationData.rangeRateBias != null) { @@ -1551,6 +1590,7 @@ public class OrbitDeterminationTest { * @param file measurements file * @param stations name to stations data map * @param pvData PV measurements data + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param satAntennaRangeModifier modifier for on-board antenna offset * @param weights base weights for measurements @@ -1563,6 +1603,7 @@ public class OrbitDeterminationTest { private List<ObservedMeasurement<?>> readMeasurements(final File file, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final OnBoardAntennaRangeModifier satAntennaRangeModifier, final Weights weights, @@ -1588,7 +1629,7 @@ public class OrbitDeterminationTest { } switch (fields[1]) { case "RANGE" : - final Range range = new RangeParser().parseFields(fields, stations, pvData, + final Range range = new RangeParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (satAntennaRangeModifier != null) { @@ -1600,7 +1641,7 @@ public class OrbitDeterminationTest { addIfNonZeroWeight(range, measurements); break; case "RANGE_RATE" : - final RangeRate rangeRate = new RangeRateParser().parseFields(fields, stations, pvData, + final RangeRate rangeRate = new RangeRateParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (rangeOutliersManager != null) { @@ -1609,16 +1650,16 @@ public class OrbitDeterminationTest { addIfNonZeroWeight(rangeRate, measurements); break; case "AZ_EL" : - final AngularAzEl angular = new AzElParser().parseFields(fields, stations, pvData, - satRangeBias, weights, - line, lineNumber, file.getName()); + final AngularAzEl angular = new AzElParser().parseFields(fields, stations, pvData, satellite, + satRangeBias, weights, + line, lineNumber, file.getName()); if (azElOutliersManager != null) { angular.addModifier(azElOutliersManager); } addIfNonZeroWeight(angular, measurements); break; case "PV" : - final PV pv = new PVParser().parseFields(fields, stations, pvData, + final PV pv = new PVParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (pvOutliersManager != null) { @@ -1784,6 +1825,7 @@ public class OrbitDeterminationTest { * @param fields measurements line fields * @param stations name to stations data map * @param pvData PV measurements data + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param weight base weights for measurements * @param line complete line @@ -1793,10 +1835,9 @@ public class OrbitDeterminationTest { */ public abstract T parseFields(String[] fields, Map<String, StationData> stations, - PVData pvData, + PVData pvData, ObservableSatellite satellite, Bias<Range> satRangeBias, Weights weight, - String line, int lineNumber, String fileName) - ; + String line, int lineNumber, String fileName); /** Check the number of fields. * @param expected expected number of fields @@ -1806,8 +1847,7 @@ public class OrbitDeterminationTest { * @param fileName file name */ protected void checkFields(final int expected, final String[] fields, - final String line, final int lineNumber, final String fileName) - { + final String line, final int lineNumber, final String fileName) { if (fields.length != expected) { throw new OrekitException(OrekitMessages.UNABLE_TO_PARSE_LINE_IN_FILE, lineNumber, fileName, line); @@ -1822,8 +1862,7 @@ public class OrbitDeterminationTest { * @return parsed measurement */ protected AbsoluteDate getDate(final String date, - final String line, final int lineNumber, final String fileName) - { + final String line, final int lineNumber, final String fileName) { try { return new AbsoluteDate(date, TimeScalesFactory.getUTC()); } catch (OrekitException oe) { @@ -1845,8 +1884,7 @@ public class OrbitDeterminationTest { */ protected StationData getStationData(final String stationName, final Map<String, StationData> stations, - final String line, final int lineNumber, final String fileName) - { + final String line, final int lineNumber, final String fileName) { final StationData stationData = stations.get(stationName); if (stationData == null) { throw new OrekitException(LocalizedCoreFormats.SIMPLE_MESSAGE, @@ -1866,19 +1904,20 @@ public class OrbitDeterminationTest { public Range parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(4, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); - final Range range = new Range(stationData.station, + final Range range = new Range(stationData.station, true, getDate(fields[0], line, lineNumber, fileName), Double.parseDouble(fields[3]) * 1000.0, stationData.rangeSigma, - weights.rangeBaseWeight); + weights.rangeBaseWeight, + satellite); if (stationData.rangeBias != null) { range.addModifier(stationData.rangeBias); } @@ -1899,12 +1938,12 @@ public class OrbitDeterminationTest { public RangeRate parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(4, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); final RangeRate rangeRate = new RangeRate(stationData.station, @@ -1912,7 +1951,7 @@ public class OrbitDeterminationTest { Double.parseDouble(fields[3]) * 1000.0, stationData.rangeRateSigma, weights.rangeRateBaseWeight, - true); + true, satellite); if (stationData.rangeRateBias != null) { rangeRate.addModifier(stationData.rangeRateBias); } @@ -1927,12 +1966,12 @@ public class OrbitDeterminationTest { public AngularAzEl parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(5, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); final AngularAzEl azEl = new AngularAzEl(stationData.station, @@ -1942,7 +1981,8 @@ public class OrbitDeterminationTest { FastMath.toRadians(Double.parseDouble(fields[4])) }, stationData.azElSigma, - weights.azElBaseWeight); + weights.azElBaseWeight, + satellite); if (stationData.refractionCorrection != null) { azEl.addModifier(stationData.refractionCorrection); } @@ -1960,12 +2000,12 @@ public class OrbitDeterminationTest { public PV parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { // field 2, which corresponds to stations in other measurements, is ignored // this allows the measurements files to be columns aligned // by inserting something like "----" instead of a station name @@ -1979,7 +2019,8 @@ public class OrbitDeterminationTest { Double.parseDouble(fields[8]) * 1000.0), pvData.positionSigma, pvData.velocitySigma, - weights.pvBaseWeight); + weights.pvBaseWeight, + satellite); } }; @@ -2404,10 +2445,18 @@ public class OrbitDeterminationTest { ON_BOARD_ANTENNA_PHASE_CENTER_X, ON_BOARD_ANTENNA_PHASE_CENTER_Y, ON_BOARD_ANTENNA_PHASE_CENTER_Z, + ON_BOARD_CLOCK_OFFSET, + ON_BOARD_CLOCK_OFFSET_MIN, + ON_BOARD_CLOCK_OFFSET_MAX, + ON_BOARD_CLOCK_OFFSET_ESTIMATED, GROUND_STATION_NAME, GROUND_STATION_LATITUDE, GROUND_STATION_LONGITUDE, GROUND_STATION_ALTITUDE, + GROUND_STATION_CLOCK_OFFSET, + GROUND_STATION_CLOCK_OFFSET_MIN, + GROUND_STATION_CLOCK_OFFSET_MAX, + GROUND_STATION_CLOCK_OFFSET_ESTIMATED, GROUND_STATION_POSITION_ESTIMATED, GROUND_STATION_TROPOSPHERIC_MODEL_ESTIMATED, GROUND_STATION_TROPOSPHERIC_ZENITH_DELAY, diff --git a/src/test/java/org/orekit/estimation/measurements/AngularAzElMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/AngularAzElMeasurementCreator.java index 6c003d62305d6e5e75772122b20d8f2408cd8397..dc49da4be7b4cbe6ba9c42ae0630c79e685272a5 100644 --- a/src/test/java/org/orekit/estimation/measurements/AngularAzElMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/AngularAzElMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,14 +34,17 @@ import org.orekit.utils.ParameterDriver; public class AngularAzElMeasurementCreator extends MeasurementCreator { private final Context context; + private final ObservableSatellite satellite; public AngularAzElMeasurementCreator(final Context context) { - this.context = context; + this.context = context; + this.satellite = new ObservableSatellite(0); } public void init(SpacecraftState s0, AbsoluteDate t, double step) { for (final GroundStation station : context.stations) { - for (ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver(), station.getPrimeMeridianOffsetDriver(), @@ -58,8 +61,7 @@ public class AngularAzElMeasurementCreator extends MeasurementCreator { } } - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { + public void handleStep(final SpacecraftState currentState, final boolean isLast) { for (final GroundStation station : context.stations) { final AbsoluteDate date = currentState.getDate(); @@ -95,7 +97,7 @@ public class AngularAzElMeasurementCreator extends MeasurementCreator { currentState.getFrame(), currentState.getDate()); - addMeasurement(new AngularAzEl(station, date, angular, sigma, baseweight)); + addMeasurement(new AngularAzEl(station, date, angular, sigma, baseweight, satellite)); } } diff --git a/src/test/java/org/orekit/estimation/measurements/AngularAzElTest.java b/src/test/java/org/orekit/estimation/measurements/AngularAzElTest.java index 88ea0cc6e0e77441bd9973b481ab8b6e721dc92e..bed1a80c83c6635e22a162dad398f0dd2b540c56 100644 --- a/src/test/java/org/orekit/estimation/measurements/AngularAzElTest.java +++ b/src/test/java/org/orekit/estimation/measurements/AngularAzElTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -205,6 +205,7 @@ public class AngularAzElTest { // create perfect azimuth-elevation measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -254,7 +255,7 @@ public class AngularAzElTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[k]; } - }, drivers[i], 3, 50.0); + }, 3, 50.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); if (ref > 1.e-12) { diff --git a/src/test/java/org/orekit/estimation/measurements/AngularRaDecMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/AngularRaDecMeasurementCreator.java index ba42b60821f50efe5f5a2b57a4bd39bf9c31429d..7f3e2192dd201b1ac471f1738e009ab7d617abf7 100644 --- a/src/test/java/org/orekit/estimation/measurements/AngularRaDecMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/AngularRaDecMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,14 +35,17 @@ import org.orekit.utils.ParameterDriver; public class AngularRaDecMeasurementCreator extends MeasurementCreator { private final Context context; + private final ObservableSatellite satellite; public AngularRaDecMeasurementCreator(final Context context) { - this.context = context; + this.context = context; + this.satellite = new ObservableSatellite(0); } public void init(SpacecraftState s0, AbsoluteDate t, double step) { for (final GroundStation station : context.stations) { - for (ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver(), station.getPrimeMeridianOffsetDriver(), @@ -59,8 +62,7 @@ public class AngularRaDecMeasurementCreator extends MeasurementCreator { } } - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { + public void handleStep(final SpacecraftState currentState, final boolean isLast) { for (final GroundStation station : context.stations) { final AbsoluteDate date = currentState.getDate(); @@ -109,7 +111,7 @@ public class AngularRaDecMeasurementCreator extends MeasurementCreator { // Declination angular[1] = staSat.getDelta(); - addMeasurement(new AngularRaDec(station, inertialFrame, date, angular, sigma, baseweight)); + addMeasurement(new AngularRaDec(station, inertialFrame, date, angular, sigma, baseweight, satellite)); } } diff --git a/src/test/java/org/orekit/estimation/measurements/AngularRaDecTest.java b/src/test/java/org/orekit/estimation/measurements/AngularRaDecTest.java index ef2dbff4487d946f17d088fbb207cbd8fe81a447..412a0fba9a2c8b726ce8a3c27dd1db642a56935d 100644 --- a/src/test/java/org/orekit/estimation/measurements/AngularRaDecTest.java +++ b/src/test/java/org/orekit/estimation/measurements/AngularRaDecTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -205,6 +205,7 @@ public class AngularRaDecTest { // create perfect right-ascension/declination measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -254,7 +255,7 @@ public class AngularRaDecTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[k]; } - }, drivers[i], 3, 50.0); + }, 3, 50.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); if (ref > 1.e-12) { diff --git a/src/test/java/org/orekit/estimation/measurements/GroundStationTest.java b/src/test/java/org/orekit/estimation/measurements/GroundStationTest.java index e78d24c2e674c1514d60d577b8e4d6f8fb77efab..e0137008121532e64aeadda71d10fcbf0228e485 100644 --- a/src/test/java/org/orekit/estimation/measurements/GroundStationTest.java +++ b/src/test/java/org/orekit/estimation/measurements/GroundStationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +24,7 @@ import java.io.ObjectOutputStream; import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import org.hipparchus.analysis.UnivariateVectorFunction; @@ -38,6 +39,7 @@ import org.hipparchus.optim.nonlinear.vector.leastsquares.LevenbergMarquardtOpti import org.hipparchus.random.RandomGenerator; import org.hipparchus.random.Well19937a; import org.hipparchus.util.FastMath; +import org.hipparchus.util.Precision; import org.junit.Assert; import org.junit.Test; import org.orekit.OrekitMatchers; @@ -60,7 +62,6 @@ import org.orekit.orbits.PositionAngle; import org.orekit.propagation.Propagator; import org.orekit.propagation.conversion.NumericalPropagatorBuilder; import org.orekit.time.AbsoluteDate; -import org.orekit.time.FieldAbsoluteDate; import org.orekit.utils.Constants; import org.orekit.utils.FieldPVCoordinates; import org.orekit.utils.IERSConventions; @@ -79,6 +80,77 @@ public class GroundStationTest { } } + @Test + public void testEstimateClockOffset() throws IOException, ClassNotFoundException { + + Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); + + final NumericalPropagatorBuilder propagatorBuilder = + context.createBuilder(OrbitType.KEPLERIAN, PositionAngle.TRUE, true, + 1.0e-6, 60.0, 0.001); + + // create perfect range measurements + final Propagator propagator = EstimationTestUtils.createPropagator(context.initialOrbit, + propagatorBuilder); + final List<ObservedMeasurement<?>> measurements = + EstimationTestUtils.createMeasurements(propagator, + new RangeMeasurementCreator(context), + 1.0, 3.0, 300.0); + + // change one station clock + final TopocentricFrame base = context.stations.get(0).getBaseFrame(); + final BodyShape parent = base.getParentShape(); + final double deltaClock = 0.00084532; + final String changedSuffix = "-changed"; + final GroundStation changed = new GroundStation(new TopocentricFrame(parent, base.getPoint(), + base.getName() + changedSuffix), + context.ut1.getEOPHistory(), + context.stations.get(0).getDisplacements()); + + // create orbit estimator + final BatchLSEstimator estimator = new BatchLSEstimator(new LevenbergMarquardtOptimizer(), + propagatorBuilder); + for (final ObservedMeasurement<?> measurement : measurements) { + final Range range = (Range) measurement; + final String name = range.getStation().getBaseFrame().getName() + changedSuffix; + if (changed.getBaseFrame().getName().equals(name)) { + estimator.addMeasurement(new Range(changed, range.isTwoWay(), + range.getDate().shiftedBy(deltaClock), + range.getObservedValue()[0], + range.getTheoreticalStandardDeviation()[0], + range.getBaseWeight()[0], + range.getSatellites().get(0))); + } else { + estimator.addMeasurement(range); + } + } + estimator.setParametersConvergenceThreshold(1.0e-3); + estimator.setMaxIterations(100); + estimator.setMaxEvaluations(200); + + // we want to estimate station clock offset + changed.getClockOffsetDriver().setSelected(true); + changed.getEastOffsetDriver().setSelected(false); + changed.getNorthOffsetDriver().setSelected(false); + changed.getZenithOffsetDriver().setSelected(false); + + EstimationTestUtils.checkFit(context, estimator, 2, 3, + 0.0, 6.6e-7, + 0.0, 1.8e-6, + 0.0, 1.3e-7, + 0.0, 5.7e-11); + Assert.assertEquals(deltaClock, changed.getClockOffsetDriver().getValue(), 8.2e-11); + + RealMatrix normalizedCovariances = estimator.getOptimum().getCovariances(1.0e-10); + RealMatrix physicalCovariances = estimator.getPhysicalCovariances(1.0e-10); + Assert.assertEquals(7, normalizedCovariances.getRowDimension()); + Assert.assertEquals(7, normalizedCovariances.getColumnDimension()); + Assert.assertEquals(7, physicalCovariances.getRowDimension()); + Assert.assertEquals(7, physicalCovariances.getColumnDimension()); + Assert.assertEquals(4.185e-9, physicalCovariances.getEntry(6, 6), 3.0e-13); + + } + @Test public void testEstimateStationPosition() throws IOException, ClassNotFoundException { @@ -122,10 +194,11 @@ public class GroundStationTest { final Range range = (Range) measurement; final String name = range.getStation().getBaseFrame().getName() + movedSuffix; if (moved.getBaseFrame().getName().equals(name)) { - estimator.addMeasurement(new Range(moved, range.getDate(), + estimator.addMeasurement(new Range(moved, range.isTwoWay(), range.getDate(), range.getObservedValue()[0], range.getTheoreticalStandardDeviation()[0], - range.getBaseWeight()[0])); + range.getBaseWeight()[0], + range.getSatellites().get(0))); } else { estimator.addMeasurement(range); } @@ -135,6 +208,7 @@ public class GroundStationTest { estimator.setMaxEvaluations(200); // we want to estimate station offsets + moved.getClockOffsetDriver().setSelected(false); moved.getEastOffsetDriver().setSelected(true); moved.getNorthOffsetDriver().setSelected(true); moved.getZenithOffsetDriver().setSelected(true); @@ -263,11 +337,12 @@ public class GroundStationTest { Range linearRange = (Range) linearMeasurement; for (final GroundStation station : zeroEOPContext.stations) { if (station.getBaseFrame().getName().equals(linearRange.getStation().getBaseFrame().getName())) { - Range zeroRange = new Range(station, + Range zeroRange = new Range(station, linearRange.isTwoWay(), linearRange.getDate(), linearRange.getObservedValue()[0], linearRange.getTheoreticalStandardDeviation()[0], - linearRange.getBaseWeight()[0]); + linearRange.getBaseWeight()[0], + linearRange.getSatellites().get(0)); estimator.addMeasurement(zeroRange); } } @@ -319,12 +394,228 @@ public class GroundStationTest { } + @Test + public void testClockOffsetCartesianDerivativesOctantPxPyPz() { + double relativeTolerancePositionValue = 2.3e-15; + double relativeTolerancePositionDerivative = 2.5e-10; + double relativeToleranceVelocityValue = 3.0e-15; + double relativeToleranceVelocityDerivative = 1.7e-10; + doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantPxPyPz() { + double toleranceRotationValue = 1.9e-15; + double toleranceRotationDerivative = 4.9e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesOctantPxPyMz() { + double relativeTolerancePositionValue = 1.4e-15; + double relativeTolerancePositionDerivative = 1.7e-10; + double relativeToleranceVelocityValue = 2.5e-15; + double relativeToleranceVelocityDerivative = 1.8e-10; + doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantPxPyMz() { + double toleranceRotationValue = 1.7e-15; + double toleranceRotationDerivative = 5.0e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesOctantPxMyPz() { + double relativeTolerancePositionValue = 1.7e-15; + double relativeTolerancePositionDerivative = 2.6e-10; + double relativeToleranceVelocityValue = 2.8e-15; + double relativeToleranceVelocityDerivative = 1.8e-10; + doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantPxMyPz() { + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 4.9e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesOctantPxMyMz() { + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 1.6e-10; + double relativeToleranceVelocityValue = 2.3e-15; + double relativeToleranceVelocityDerivative = 1.7e-10; + doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantPxMyMz() { + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 5.0e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesOctantMxPyPz() { + double relativeTolerancePositionValue = 1.9e-15; + double relativeTolerancePositionDerivative = 2.6e-10; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 2.0e-10; + doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantMxPyPz() { + double toleranceRotationValue = 1.4e-15; + double toleranceRotationDerivative = 5.2e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesOctantMxPyMz() { + double relativeTolerancePositionValue = 1.9e-15; + double relativeTolerancePositionDerivative = 2.6e-10; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 2.0e-10; + doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantMxPyMz() { + double toleranceRotationValue = 1.4e-15; + double toleranceRotationDerivative = 5.2e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesOctantMxMyPz() { + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 1.7e-10; + double relativeToleranceVelocityValue = 2.9e-15; + double relativeToleranceVelocityDerivative = 1.9e-10; + doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantMxMyPz() { + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 4.9e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesOctantMxMyMz() { + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 1.7e-10; + double relativeToleranceVelocityValue = 2.9e-15; + double relativeToleranceVelocityDerivative = 1.9e-10; + doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesOctantMxMyMz() { + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 4.9e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetCartesianDerivativesNearPole() { + double relativeTolerancePositionValue = 1.2e-15; + double relativeTolerancePositionDerivative = 1.6e-04; + double relativeToleranceVelocityValue = 1.0e-13; + double relativeToleranceVelocityDerivative = 4.3e-09; + doTestCartesianDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 100.0, + relativeTolerancePositionValue, relativeTolerancePositionDerivative, + relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, + ".*-clock"); + } + + @Test + public void testClockOffsetAngularDerivativesNearPole() { + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 5.7e-15; + double toleranceRotationRateValue = 1.1e-19; + double toleranceRotationRateDerivative = 6.3e-19; + doTestAngularDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 100.0, + toleranceRotationValue, toleranceRotationDerivative, + toleranceRotationRateValue, toleranceRotationRateDerivative, + ".*-clock"); + } + @Test public void testStationOffsetCartesianDerivativesOctantPxPyPz() { - double relativeTolerancePositionValue = 2.9e-15; - double relativeTolerancePositionDerivative = 1.9e-10; - double relativeToleranceVelocityValue = 5.5e-15; - double relativeToleranceVelocityDerivative = 3.1e-10; + double relativeTolerancePositionValue = 2.3e-15; + double relativeTolerancePositionDerivative = 1.1e-10; + double relativeToleranceVelocityValue = 3.3e-15; + double relativeToleranceVelocityDerivative = 1.2e-10; doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -333,10 +624,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantPxPyPz() { - double toleranceRotationValue = 2.1e-15; - double toleranceRotationDerivative = 4.2e-18; - double toleranceRotationRateValue = 2.7e-19; - double toleranceRotationRateDerivative = 1.6e-21; + double toleranceRotationValue = 1.9e-15; + double toleranceRotationDerivative = 3.1e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -345,10 +636,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesOctantPxPyMz() { - double relativeTolerancePositionValue = 2.2e-15; - double relativeTolerancePositionDerivative = 8.1e-11; - double relativeToleranceVelocityValue = 4.7e-15; - double relativeToleranceVelocityDerivative = 2.4e-10; + double relativeTolerancePositionValue = 1.4e-15; + double relativeTolerancePositionDerivative = 7.3e-11; + double relativeToleranceVelocityValue = 2.8e-15; + double relativeToleranceVelocityDerivative = 1.3e-10; doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -357,10 +648,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantPxPyMz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 3.7e-18; - double toleranceRotationRateValue = 1.6e-19; - double toleranceRotationRateDerivative = 5.0e-22; + double toleranceRotationValue = 1.7e-15; + double toleranceRotationDerivative = 3.6e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -369,10 +660,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesOctantPxMyPz() { - double relativeTolerancePositionValue = 3.7e-15; - double relativeTolerancePositionDerivative = 1.7e-10; - double relativeToleranceVelocityValue = 4.9e-15; - double relativeToleranceVelocityDerivative = 3.0e-10; + double relativeTolerancePositionValue = 1.7e-15; + double relativeTolerancePositionDerivative = 9.0e-11; + double relativeToleranceVelocityValue = 2.9e-15; + double relativeToleranceVelocityDerivative = 8.8e-11; doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -381,10 +672,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantPxMyPz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 3.6e-18; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 1.2e-21; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 3.6e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -393,10 +684,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesOctantPxMyMz() { - double relativeTolerancePositionValue = 2.2e-15; - double relativeTolerancePositionDerivative = 7.5e-11; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 1.8e-10; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 4.2e-11; + double relativeToleranceVelocityValue = 2.7e-15; + double relativeToleranceVelocityDerivative = 6.8e-11; doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -405,10 +696,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantPxMyMz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 4.1e-18; - double toleranceRotationRateValue = 1.4e-19; - double toleranceRotationRateDerivative = 4.9e-22; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 2.6e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -417,10 +708,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesOctantMxPyPz() { - double relativeTolerancePositionValue = 3.2e-15; - double relativeTolerancePositionDerivative = 1.4e-10; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 2.3e-10; + double relativeTolerancePositionValue = 1.6e-15; + double relativeTolerancePositionDerivative = 9.9e-11; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 9.5e-11; doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -429,10 +720,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantMxPyPz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 4.0e-18; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 1.3e-21; + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 3.1e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -441,10 +732,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesOctantMxPyMz() { - double relativeTolerancePositionValue = 3.2e-15; - double relativeTolerancePositionDerivative = 1.4e-10; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 2.3e-10; + double relativeTolerancePositionValue = 1.6e-15; + double relativeTolerancePositionDerivative = 9.9e-11; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 9.5e-11; doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -453,10 +744,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantMxPyMz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 4.0e-18; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 1.3e-21; + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 3.1e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -465,10 +756,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesOctantMxMyPz() { - double relativeTolerancePositionValue = 2.7e-15; - double relativeTolerancePositionDerivative = 1.5e-10; - double relativeToleranceVelocityValue = 3.8e-15; - double relativeToleranceVelocityDerivative = 1.8e-10; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 6.2e-11; + double relativeToleranceVelocityValue = 3.2e-15; + double relativeToleranceVelocityDerivative = 1.1e-10; doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -477,10 +768,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantMxMyPz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 4.7e-18; - double toleranceRotationRateValue = 1.7e-19; - double toleranceRotationRateDerivative = 1.1e-21; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 3.4e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -489,10 +780,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesOctantMxMyMz() { - double relativeTolerancePositionValue = 2.7e-15; - double relativeTolerancePositionDerivative = 1.5e-10; - double relativeToleranceVelocityValue = 3.8e-15; - double relativeToleranceVelocityDerivative = 1.8e-10; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 6.2e-11; + double relativeToleranceVelocityValue = 3.2e-15; + double relativeToleranceVelocityDerivative = 1.1e-10; doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -501,10 +792,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesOctantMxMyMz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 4.7e-18; - double toleranceRotationRateValue = 1.7e-19; - double toleranceRotationRateDerivative = 1.1e-21; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 3.4e-18; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -513,10 +804,10 @@ public class GroundStationTest { @Test public void testStationOffsetCartesianDerivativesNearPole() { - double relativeTolerancePositionValue = 5.2e-15; - double relativeTolerancePositionDerivative = 8.0e-10; - double relativeToleranceVelocityValue = 2.7e-13; - double relativeToleranceVelocityDerivative = 1.1e-08; + double relativeTolerancePositionValue = 2.1e-15; + double relativeTolerancePositionDerivative = 9.4e-10; + double relativeToleranceVelocityValue = 7.5e-14; + double relativeToleranceVelocityDerivative = 3.9e-10; doTestCartesianDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 100.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -525,10 +816,10 @@ public class GroundStationTest { @Test public void testStationOffsetAngularDerivativesNearPole() { - double toleranceRotationValue = 4.5e-15; - double toleranceRotationDerivative = 8.1e-02; // near pole, the East and North directions are singular - double toleranceRotationRateValue = 3.2e-19; - double toleranceRotationRateDerivative = 2.2e-21; + double toleranceRotationValue = 3.9e-15; + double toleranceRotationDerivative = 8.0e-02; // near pole, the East and North directions are singular + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = Precision.SAFE_MIN; doTestAngularDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 100.0, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -537,10 +828,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantPxPyPz() { - double relativeTolerancePositionValue = 2.9e-15; - double relativeTolerancePositionDerivative = 1.9e-08; - double relativeToleranceVelocityValue = 5.5e-15; - double relativeToleranceVelocityDerivative = 2.4e-08; + double relativeTolerancePositionValue = 2.3e-15; + double relativeTolerancePositionDerivative = 7.3e-09; + double relativeToleranceVelocityValue = 3.3e-15; + double relativeToleranceVelocityDerivative = 4.8e-09; doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -550,10 +841,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantPxPyPz() { - double toleranceRotationValue = 2.1e-15; - double toleranceRotationDerivative = 7.7e-09; - double toleranceRotationRateValue = 2.7e-19; - double toleranceRotationRateDerivative = 2.9e-12; + double toleranceRotationValue = 1.9e-15; + double toleranceRotationDerivative = 6.6e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -563,10 +854,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantPxPyMz() { - double relativeTolerancePositionValue = 2.2e-15; - double relativeTolerancePositionDerivative = 1.2e-08; - double relativeToleranceVelocityValue = 4.7e-15; - double relativeToleranceVelocityDerivative = 1.7e-08; + double relativeTolerancePositionValue = 1.4e-15; + double relativeTolerancePositionDerivative = 4.1e-09; + double relativeToleranceVelocityValue = 2.8e-15; + double relativeToleranceVelocityDerivative = 4.7e-09; doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -576,10 +867,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantPxPyMz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 8.4e-09; - double toleranceRotationRateValue = 1.6e-19; - double toleranceRotationRateDerivative = 1.1e-12; + double toleranceRotationValue = 1.7e-15; + double toleranceRotationDerivative = 6.9e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -589,10 +880,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantPxMyPz() { - double relativeTolerancePositionValue = 3.7e-15; - double relativeTolerancePositionDerivative = 1.5e-08; - double relativeToleranceVelocityValue = 4.9e-15; - double relativeToleranceVelocityDerivative = 3.0e-08; + double relativeTolerancePositionValue = 1.7e-15; + double relativeTolerancePositionDerivative = 7.8e-09; + double relativeToleranceVelocityValue = 2.9e-15; + double relativeToleranceVelocityDerivative = 4.4e-09; doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -602,10 +893,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantPxMyPz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 9.2e-09; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 2.8e-12; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 7.5e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -615,10 +906,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantPxMyMz() { - double relativeTolerancePositionValue = 2.2e-15; - double relativeTolerancePositionDerivative = 1.1e-08; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 1.8e-08; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 4.1e-09; + double relativeToleranceVelocityValue = 2.7e-15; + double relativeToleranceVelocityDerivative = 4.4e-09; doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -628,10 +919,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantPxMyMz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 8.3e-09; - double toleranceRotationRateValue = 1.4e-19; - double toleranceRotationRateDerivative = 1.1e-12; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 7.3e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -641,10 +932,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantMxPyPz() { - double relativeTolerancePositionValue = 3.2e-15; - double relativeTolerancePositionDerivative = 2.1e-08; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 1.7e-08; + double relativeTolerancePositionValue = 1.6e-15; + double relativeTolerancePositionDerivative = 8.4e-09; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 5.0e-09; doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -654,10 +945,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantMxPyPz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 7.6e-09; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 2.9e-12; + double toleranceRotationValue = 1.4e-15; + double toleranceRotationDerivative = 6.3e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -667,10 +958,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantMxPyMz() { - double relativeTolerancePositionValue = 3.2e-15; - double relativeTolerancePositionDerivative = 2.1e-08; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 1.7e-08; + double relativeTolerancePositionValue = 1.6e-15; + double relativeTolerancePositionDerivative = 8.4e-09; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 5.0e-09; doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -680,10 +971,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantMxPyMz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 7.6e-09; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 2.9e-12; + double toleranceRotationValue = 1.4e-15; + double toleranceRotationDerivative = 6.3e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -693,10 +984,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantMxMyPz() { - double relativeTolerancePositionValue = 2.7e-15; - double relativeTolerancePositionDerivative = 1.5e-08; - double relativeToleranceVelocityValue = 3.8e-15; - double relativeToleranceVelocityDerivative = 1.6e-08; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 5.0e-09; + double relativeToleranceVelocityValue = 3.2e-15; + double relativeToleranceVelocityDerivative = 5.3e-09; doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -706,10 +997,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantMxMyPz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 9.4e-09; - double toleranceRotationRateValue = 1.7e-19; - double toleranceRotationRateDerivative = 2.2e-12; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 7.7e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -719,10 +1010,10 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesOctantMxMyMz() { - double relativeTolerancePositionValue = 2.7e-15; - double relativeTolerancePositionDerivative = 1.5e-08; - double relativeToleranceVelocityValue = 3.8e-15; - double relativeToleranceVelocityDerivative = 1.6e-08; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 5.0e-09; + double relativeToleranceVelocityValue = 3.2e-15; + double relativeToleranceVelocityDerivative = 5.3e-09; doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -732,10 +1023,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesOctantMxMyMz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 9.4e-09; - double toleranceRotationRateValue = 1.7e-19; - double toleranceRotationRateDerivative = 2.2e-12; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 7.7e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -745,9 +1036,9 @@ public class GroundStationTest { @Test public void testPolarMotionCartesianDerivativesNearPole() { - double relativeTolerancePositionValue = 4.2e-15; - double relativeTolerancePositionDerivative = 1.7e-08; - double relativeToleranceVelocityValue = 2.7e-13; + double relativeTolerancePositionValue = 1.2e-15; + double relativeTolerancePositionDerivative = 5.7e-09; + double relativeToleranceVelocityValue = 9.4e-13; double relativeToleranceVelocityDerivative = 1.2e-09; doTestCartesianDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, @@ -758,10 +1049,10 @@ public class GroundStationTest { @Test public void testPolarMotionAngularDerivativesNearPole() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 7.4e-09; - double toleranceRotationRateValue = 3.2e-19; - double toleranceRotationRateDerivative = 3.7e-12; + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 6.5e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.2e-13; doTestAngularDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -771,10 +1062,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantPxPyPz() { - double relativeTolerancePositionValue = 2.9e-15; - double relativeTolerancePositionDerivative = 1.3e-08; - double relativeToleranceVelocityValue = 5.5e-15; - double relativeToleranceVelocityDerivative = 1.7e-08; + double relativeTolerancePositionValue = 2.3e-15; + double relativeTolerancePositionDerivative = 5.7e-09; + double relativeToleranceVelocityValue = 3.3e-15; + double relativeToleranceVelocityDerivative = 2.7e-09; doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -783,10 +1074,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantPxPyPz() { - double toleranceRotationValue = 2.1e-15; - double toleranceRotationDerivative = 8.4e-09; - double toleranceRotationRateValue = 2.7e-19; - double toleranceRotationRateDerivative = 2.7e-12; + double toleranceRotationValue = 1.9e-15; + double toleranceRotationDerivative = 4.9e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -795,10 +1086,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantPxPyMz() { - double relativeTolerancePositionValue = 2.2e-15; - double relativeTolerancePositionDerivative = 7.6e-09; - double relativeToleranceVelocityValue = 4.7e-15; - double relativeToleranceVelocityDerivative = 1.1e-08; + double relativeTolerancePositionValue = 1.4e-15; + double relativeTolerancePositionDerivative = 3.1e-09; + double relativeToleranceVelocityValue = 2.8e-15; + double relativeToleranceVelocityDerivative = 3.3e-09; doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -807,10 +1098,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantPxPyMz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 7.8e-09; - double toleranceRotationRateValue = 1.6e-19; - double toleranceRotationRateDerivative = 1.3e-12; + double toleranceRotationValue = 1.7e-15; + double toleranceRotationDerivative = 5.7e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -819,10 +1110,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantPxMyPz() { - double relativeTolerancePositionValue = 3.7e-15; - double relativeTolerancePositionDerivative = 1.2e-08; - double relativeToleranceVelocityValue = 4.9e-15; - double relativeToleranceVelocityDerivative = 1.5e-08; + double relativeTolerancePositionValue = 1.7e-15; + double relativeTolerancePositionDerivative = 5.3e-09; + double relativeToleranceVelocityValue = 2.9e-15; + double relativeToleranceVelocityDerivative = 3.4e-09; doTestCartesianDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -831,10 +1122,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantPxMyPz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 7.5e-09; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 3.2e-12; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 6.4e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(35), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -843,10 +1134,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantPxMyMz() { - double relativeTolerancePositionValue = 2.2e-15; - double relativeTolerancePositionDerivative = 6.5e-09; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 1.2e-08; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 3.1e-09; + double relativeToleranceVelocityValue = 2.7e-15; + double relativeToleranceVelocityDerivative = 3.0e-09; doTestCartesianDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -855,10 +1146,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantPxMyMz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 8.0e-09; - double toleranceRotationRateValue = 1.4e-19; - double toleranceRotationRateDerivative = 1.1e-12; + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 6.3e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(-35), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -867,10 +1158,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantMxPyPz() { - double relativeTolerancePositionValue = 3.2e-15; - double relativeTolerancePositionDerivative = 1.4e-08; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 9.1e-09; + double relativeTolerancePositionValue = 1.6e-15; + double relativeTolerancePositionDerivative = 5.5e-09; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 2.8e-09; doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -879,10 +1170,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantMxPyPz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 7.3e-09; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 2.6e-12; + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 6.8e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -891,10 +1182,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantMxPyMz() { - double relativeTolerancePositionValue = 3.2e-15; - double relativeTolerancePositionDerivative = 1.4e-08; - double relativeToleranceVelocityValue = 3.9e-15; - double relativeToleranceVelocityDerivative = 9.1e-09; + double relativeTolerancePositionValue = 1.6e-15; + double relativeTolerancePositionDerivative = 5.5e-09; + double relativeToleranceVelocityValue = 2.6e-15; + double relativeToleranceVelocityDerivative = 2.8e-09; doTestCartesianDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -903,10 +1194,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantMxPyMz() { - double toleranceRotationValue = 2.0e-15; - double toleranceRotationDerivative = 7.3e-09; - double toleranceRotationRateValue = 2.6e-19; - double toleranceRotationRateDerivative = 2.6e-12; + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 6.8e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(150), FastMath.toRadians(20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -915,10 +1206,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantMxMyPz() { - double relativeTolerancePositionValue = 2.7e-15; - double relativeTolerancePositionDerivative = 9.1e-09; - double relativeToleranceVelocityValue = 3.8e-15; - double relativeToleranceVelocityDerivative = 1.1e-08; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 3.1e-09; + double relativeToleranceVelocityValue = 3.2e-15; + double relativeToleranceVelocityDerivative = 3.2e-09; doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -927,10 +1218,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantMxMyPz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 7.7e-09; - double toleranceRotationRateValue = 1.7e-19; - double toleranceRotationRateDerivative = 2.0e-12; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 6.2e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -939,10 +1230,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesOctantMxMyMz() { - double relativeTolerancePositionValue = 2.7e-15; - double relativeTolerancePositionDerivative = 9.1e-09; - double relativeToleranceVelocityValue = 3.8e-15; - double relativeToleranceVelocityDerivative = 1.1e-08; + double relativeTolerancePositionValue = 1.5e-15; + double relativeTolerancePositionDerivative = 3.1e-09; + double relativeToleranceVelocityValue = 3.2e-15; + double relativeToleranceVelocityDerivative = 3.2e-09; doTestCartesianDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -951,10 +1242,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesOctantMxMyMz() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 7.7e-09; - double toleranceRotationRateValue = 1.7e-19; - double toleranceRotationRateDerivative = 2.0e-12; + double toleranceRotationValue = 1.6e-15; + double toleranceRotationDerivative = 6.2e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(-150), FastMath.toRadians(-20), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -963,10 +1254,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianCartesianDerivativesNearPole() { - double relativeTolerancePositionValue = 4.2e-15; - double relativeTolerancePositionDerivative = 1.8e-03; // near pole, the East and North directions are singular - double relativeToleranceVelocityValue = 2.7e-13; - double relativeToleranceVelocityDerivative = 7.0e-08; + double relativeTolerancePositionValue = 1.2e-15; + double relativeTolerancePositionDerivative = 1.6e-03; + double relativeToleranceVelocityValue = 5.8e-14; + double relativeToleranceVelocityDerivative = 2.6e-08; doTestCartesianDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 1.0, relativeTolerancePositionValue, relativeTolerancePositionDerivative, relativeToleranceVelocityValue, relativeToleranceVelocityDerivative, @@ -975,10 +1266,10 @@ public class GroundStationTest { @Test public void testPrimeMeridianAngularDerivativesNearPole() { - double toleranceRotationValue = 1.9e-15; - double toleranceRotationDerivative = 8.1e-09; - double toleranceRotationRateValue = 3.2e-19; - double toleranceRotationRateDerivative = 3.6e-12; + double toleranceRotationValue = 1.5e-15; + double toleranceRotationDerivative = 7.3e-09; + double toleranceRotationRateValue = 1.5e-19; + double toleranceRotationRateDerivative = 2.0e-13; doTestAngularDerivatives(FastMath.toRadians(89.99995), FastMath.toRadians(90), 1200.0, 0.2, toleranceRotationValue, toleranceRotationDerivative, toleranceRotationRateValue, toleranceRotationRateDerivative, @@ -1014,13 +1305,13 @@ public class GroundStationTest { station.getPolarDriftXDriver(), station.getPolarOffsetYDriver(), station.getPolarDriftYDriver(), + station.getClockOffsetDriver(), station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver())) { indices.put(driver.getName(), indices.size()); } - station.getOffsetToInertial(eme2000, new FieldAbsoluteDate<>(factory.getDerivativeField(), date), factory, - indices); + station.getOffsetToInertial(eme2000, date, factory, indices); Assert.fail("an exception should have been thrown"); } catch (OrekitException oe) { Assert.assertEquals(OrekitMessages.NO_REFERENCE_DATE_FOR_PARAMETER, oe.getSpecifier()); @@ -1032,8 +1323,7 @@ public class GroundStationTest { private void doTestCartesianDerivatives(double latitude, double longitude, double altitude, double stepFactor, double relativeTolerancePositionValue, double relativeTolerancePositionDerivative, double relativeToleranceVelocityValue, double relativeToleranceVelocityDerivative, - String... parameterPattern) - { + String... parameterPattern) { Utils.setDataRoot("regular-data"); final Frame eme2000 = FramesFactory.getEME2000(); final AbsoluteDate date = AbsoluteDate.J2000_EPOCH; @@ -1046,8 +1336,6 @@ public class GroundStationTest { new GeodeticPoint(latitude, longitude, altitude), "dummy")); final DSFactory factory = new DSFactory(parameterPattern.length, 1); - final FieldAbsoluteDate<DerivativeStructure> dateDS = - new FieldAbsoluteDate<>(factory.getDerivativeField(), date); ParameterDriver[] selectedDrivers = new ParameterDriver[parameterPattern.length]; UnivariateDifferentiableVectorFunction[] dFCartesian = new UnivariateDifferentiableVectorFunction[parameterPattern.length]; final ParameterDriver[] allDrivers = selectAllDrivers(station); @@ -1079,7 +1367,7 @@ public class GroundStationTest { changed.setNormalizedValue(2 * generator.nextDouble() - 1); // transform to check - FieldTransform<DerivativeStructure> t = station.getOffsetToInertial(eme2000, dateDS, factory, indices); + FieldTransform<DerivativeStructure> t = station.getOffsetToInertial(eme2000, date, factory, indices); FieldPVCoordinates<DerivativeStructure> pv = t.transformPVCoordinates(FieldPVCoordinates.getZero(factory.getDerivativeField())); for (int k = 0; k < dFCartesian.length; ++k) { @@ -1126,6 +1414,15 @@ public class GroundStationTest { } + if (maxPositionValueRelativeError > relativeTolerancePositionValue || + maxPositionDerivativeRelativeError > relativeTolerancePositionDerivative || + maxVelocityValueRelativeError > relativeToleranceVelocityValue || + maxVelocityDerivativeRelativeError > relativeToleranceVelocityDerivative) { + print("relativeTolerancePositionValue", maxPositionValueRelativeError); + print("relativeTolerancePositionDerivative", maxPositionDerivativeRelativeError); + print("relativeToleranceVelocityValue", maxVelocityValueRelativeError); + print("relativeToleranceVelocityDerivative", maxVelocityDerivativeRelativeError); + } Assert.assertEquals(0.0, maxPositionValueRelativeError, relativeTolerancePositionValue); Assert.assertEquals(0.0, maxPositionDerivativeRelativeError, relativeTolerancePositionDerivative); Assert.assertEquals(0.0, maxVelocityValueRelativeError, relativeToleranceVelocityValue); @@ -1136,8 +1433,7 @@ public class GroundStationTest { private void doTestAngularDerivatives(double latitude, double longitude, double altitude, double stepFactor, double toleranceRotationValue, double toleranceRotationDerivative, double toleranceRotationRateValue, double toleranceRotationRateDerivative, - String... parameterPattern) - { + String... parameterPattern) { Utils.setDataRoot("regular-data"); final Frame eme2000 = FramesFactory.getEME2000(); final AbsoluteDate date = AbsoluteDate.J2000_EPOCH; @@ -1150,8 +1446,6 @@ public class GroundStationTest { new GeodeticPoint(latitude, longitude, altitude), "dummy")); final DSFactory factory = new DSFactory(parameterPattern.length, 1); - final FieldAbsoluteDate<DerivativeStructure> dateDS = - new FieldAbsoluteDate<>(factory.getDerivativeField(), date); ParameterDriver[] selectedDrivers = new ParameterDriver[parameterPattern.length]; UnivariateDifferentiableVectorFunction[] dFAngular = new UnivariateDifferentiableVectorFunction[parameterPattern.length]; final ParameterDriver[] allDrivers = selectAllDrivers(station); @@ -1182,7 +1476,7 @@ public class GroundStationTest { changed.setNormalizedValue(2 * generator.nextDouble() - 1); // transform to check - FieldTransform<DerivativeStructure> t = station.getOffsetToInertial(eme2000, dateDS, factory, indices); + FieldTransform<DerivativeStructure> t = station.getOffsetToInertial(eme2000, date, factory, indices); for (int k = 0; k < dFAngular.length; ++k) { // reference values and derivatives computed using finite differences @@ -1230,12 +1524,30 @@ public class GroundStationTest { } + if (maxRotationValueError > toleranceRotationValue || + maxRotationDerivativeError > toleranceRotationDerivative || + maxRotationRateValueError > toleranceRotationRateValue || + maxRotationRateDerivativeError > toleranceRotationRateDerivative) { + print("toleranceRotationValue", maxRotationValueError); + print("toleranceRotationDerivative", maxRotationDerivativeError); + print("toleranceRotationRateValue", maxRotationRateValueError); + print("toleranceRotationRateDerivative", maxRotationRateDerivativeError); + } Assert.assertEquals(0.0, maxRotationValueError, toleranceRotationValue); Assert.assertEquals(0.0, maxRotationDerivativeError, toleranceRotationDerivative); Assert.assertEquals(0.0, maxRotationRateValueError, toleranceRotationRateValue); Assert.assertEquals(0.0, maxRotationRateDerivativeError, toleranceRotationRateDerivative); } + private void print(String name, double v) { + if (v < Precision.SAFE_MIN) { + System.out.format(Locale.US, " double %-35s = Precision.SAFE_MIN;%n", name); + } else { + double s = FastMath.pow(10.0, 1 - FastMath.floor(FastMath.log(v) / FastMath.log(10.0))); + System.out.format(Locale.US, " double %-35s = %8.1e;%n", + name, FastMath.ceil(s * v) / s); + } + } private UnivariateDifferentiableVectorFunction differentiatedStationPV(final GroundStation station, final Frame eme2000, @@ -1329,6 +1641,7 @@ public class GroundStationTest { station.getPolarDriftXDriver(), station.getPolarOffsetYDriver(), station.getPolarDriftYDriver(), + station.getClockOffsetDriver(), station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver() diff --git a/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeMeasurementCreator.java index 1bd066ccc35d42a10ac1b0c679a96b013751643b..9075e0b4682c81b8fc3432c6da2712517f0fb9a7 100644 --- a/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,9 +28,11 @@ import org.orekit.utils.Constants; public class InterSatellitesRangeMeasurementCreator extends MeasurementCreator { - private final BoundedPropagator ephemeris; - private final Vector3D antennaPhaseCenter1; - private final Vector3D antennaPhaseCenter2; + private final BoundedPropagator ephemeris; + private final Vector3D antennaPhaseCenter1; + private final Vector3D antennaPhaseCenter2; + private final ObservableSatellite local; + private final ObservableSatellite remote; private int count; public InterSatellitesRangeMeasurementCreator(final BoundedPropagator ephemeris) { @@ -43,14 +45,15 @@ public class InterSatellitesRangeMeasurementCreator extends MeasurementCreator { this.ephemeris = ephemeris; this.antennaPhaseCenter1 = antennaPhaseCenter1; this.antennaPhaseCenter2 = antennaPhaseCenter2; + this.local = new ObservableSatellite(0); + this.remote = new ObservableSatellite(1); } public void init(final SpacecraftState s0, final AbsoluteDate t, final double step) { count = 0; } - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { + public void handleStep(final SpacecraftState currentState, final boolean isLast) { try { final AbsoluteDate date = currentState.getDate(); final Vector3D position = currentState.toTransform().getInverse().transformPosition(antennaPhaseCenter1); @@ -88,11 +91,11 @@ public class InterSatellitesRangeMeasurementCreator extends MeasurementCreator { final Vector3D selfAtEmission = currentState.shiftedBy(-downLinkDelay - upLinkDelay).toTransform().getInverse().transformPosition(antennaPhaseCenter1); final double upLinkDistance = Vector3D.distance(otherAtTransit, selfAtEmission); - addMeasurement(new InterSatellitesRange(0, 1, true, date, + addMeasurement(new InterSatellitesRange(local, remote, true, date, 0.5 * (downLinkDistance + upLinkDistance), 1.0, 10)); } else { // generate a one-way measurement - addMeasurement(new InterSatellitesRange(0, 1, false, date, downLinkDistance, 1.0, 10)); + addMeasurement(new InterSatellitesRange(local, remote, false, date, downLinkDistance, 1.0, 10)); } } catch (OrekitException oe) { diff --git a/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeTest.java b/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeTest.java index b70d4635648d3872ddd55fa75b655f530a31cc06..b9b4713b121fdc6f65ef58a1e1cab23cf3184c7d 100644 --- a/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeTest.java +++ b/src/test/java/org/orekit/estimation/measurements/InterSatellitesRangeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/MeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/MeasurementCreator.java index a5d4b3c29408fc3494c739772891ba75d317ec6b..d506251686c25029cd21403640407f198292a526 100644 --- a/src/test/java/org/orekit/estimation/measurements/MeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/MeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/PVMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/PVMeasurementCreator.java index 02bb447c7a96c61b1beb498f2a3b269d009f8465..5260464fe13e54201dec6db990a4d729053d1434 100644 --- a/src/test/java/org/orekit/estimation/measurements/PVMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/PVMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,10 +22,16 @@ import org.orekit.propagation.SpacecraftState; public class PVMeasurementCreator extends MeasurementCreator { + private final ObservableSatellite satellite; + + public PVMeasurementCreator() { + this.satellite = new ObservableSatellite(0); + } + public void handleStep(final SpacecraftState currentState, final boolean isLast) { final Vector3D p = currentState.getPVCoordinates().getPosition(); final Vector3D v = currentState.getPVCoordinates().getVelocity(); - final PV measurement = new PV(currentState.getDate(), p, v, 1.0, 0.001, 1.0); + final PV measurement = new PV(currentState.getDate(), p, v, 1.0, 0.001, 1.0, satellite); Assert.assertEquals(0.0, Vector3D.distance(p, measurement.getPosition()), 1.0e-10); Assert.assertEquals(0.0, Vector3D.distance(v, measurement.getVelocity()), 1.0e-10); addMeasurement(measurement); diff --git a/src/test/java/org/orekit/estimation/measurements/PVTest.java b/src/test/java/org/orekit/estimation/measurements/PVTest.java index aa4f165f6cdad66b5272baf96b9c51b8944b2449..bcc536c3a578c7c051c71528158aeb3c55ea552d 100644 --- a/src/test/java/org/orekit/estimation/measurements/PVTest.java +++ b/src/test/java/org/orekit/estimation/measurements/PVTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -186,12 +186,15 @@ public class PVTest { final double[][] corrCoefRef = MatrixUtils.createRealIdentityMatrix(6).getData(); // Reference propagator numbers - final int[] propNumRef = {0, 2}; + final ObservableSatellite[] sats = { + new ObservableSatellite(0), + new ObservableSatellite(2) + }; // Create PV measurements final PV[] pvs = new PV[2]; - pvs[0] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight); - pvs[1] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight, propNumRef[1]); + pvs[0] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight, sats[0]); + pvs[1] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight, sats[1]); // Tolerance final double eps = 1e-20; // tolerance @@ -201,7 +204,7 @@ public class PVTest { final PV pv = pvs[k]; // Propagator numbers - assertEquals(propNumRef[k], pv.getPropagatorsIndices().get(0), eps); + assertEquals(sats[k].getPropagatorIndex(), pv.getSatellites().get(0).getPropagatorIndex()); // Weights for (int i = 0; i < 6; i++) { @@ -254,14 +257,19 @@ public class PVTest { final double[][] corrCoefRef = MatrixUtils.createRealIdentityMatrix(6).getData(); // Reference propagator numbers - final int[] propNumRef = {0, 2, 0, 10}; + final ObservableSatellite[] sats = { + new ObservableSatellite(0), + new ObservableSatellite(2), + new ObservableSatellite(0), + new ObservableSatellite(10) + }; // Create PV measurements final PV[] pvs = new PV[4]; - pvs[0] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight); - pvs[1] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight, propNumRef[1]); - pvs[2] = new PV(date, position, velocity, sigmaPV, baseWeight); - pvs[3] = new PV(date, position, velocity, sigmaPV, baseWeight, propNumRef[3]); + pvs[0] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight, sats[0]); + pvs[1] = new PV(date, position, velocity, sigmaP, sigmaV, baseWeight, sats[1]); + pvs[2] = new PV(date, position, velocity, sigmaPV, baseWeight, sats[2]); + pvs[3] = new PV(date, position, velocity, sigmaPV, baseWeight, sats[3]); // Tolerance final double eps = 1e-20; // tolerance @@ -271,8 +279,8 @@ public class PVTest { final PV pv = pvs[k]; // Propagator numbers - assertEquals(propNumRef[k], pv.getPropagatorsIndices().get(0), eps); - + assertEquals(sats[k].getPropagatorIndex(), pv.getSatellites().get(0).getPropagatorIndex()); + // Weights for (int i = 0; i < 6; i++) { assertEquals(baseWeight, pv.getBaseWeight()[i], eps); @@ -335,7 +343,10 @@ public class PVTest { } // Reference propagator numbers - final int[] propNumRef = {0, 2}; + final ObservableSatellite[] sats = { + new ObservableSatellite(0), + new ObservableSatellite(2) + }; // Reference standard deviations final double[] sigmaP = {10., 20., 30.}; @@ -343,8 +354,8 @@ public class PVTest { // Create PV measurements final PV[] pvs = new PV[2]; - pvs[0] = new PV(date, position, velocity, positionP, velocityP, baseWeight); - pvs[1] = new PV(date, position, velocity, positionP, velocityP, baseWeight, propNumRef[1]); + pvs[0] = new PV(date, position, velocity, positionP, velocityP, baseWeight, sats[0]); + pvs[1] = new PV(date, position, velocity, positionP, velocityP, baseWeight, sats[1]); // Tolerance final double eps = 6.7e-16; // tolerance @@ -354,7 +365,7 @@ public class PVTest { final PV pv = pvs[k]; // Propagator numbers - assertEquals(propNumRef[k], pv.getPropagatorsIndices().get(0), eps); + assertEquals(sats[k].getPropagatorIndex(), pv.getSatellites().get(0).getPropagatorIndex()); // Weights for (int i = 0; i < 6; i++) { @@ -415,12 +426,15 @@ public class PVTest { } // Reference propagator numbers - final int[] propNumRef = {0, 2}; + final ObservableSatellite[] sats = { + new ObservableSatellite(0), + new ObservableSatellite(2) + }; // Create PV measurements final PV[] pvs = new PV[2]; - pvs[0] = new PV(date, position, velocity, Pref, baseWeight); - pvs[1] = new PV(date, position, velocity, Pref, baseWeight, propNumRef[1]); + pvs[0] = new PV(date, position, velocity, Pref, baseWeight, sats[0]); + pvs[1] = new PV(date, position, velocity, Pref, baseWeight, sats[1]); // Tolerance final double eps = 1.8e-15; // tolerance @@ -430,7 +444,7 @@ public class PVTest { final PV pv = pvs[k]; // Propagator numbers - assertEquals(propNumRef[k], pv.getPropagatorsIndices().get(0), eps); + assertEquals(sats[k].getPropagatorIndex(), pv.getSatellites().get(0).getPropagatorIndex()); // Weights for (int i = 0; i < 6; i++) { @@ -469,7 +483,7 @@ public class PVTest { // Build with two 3-sized vectors try { - new PV(date, position, velocity, new double[] {0., 0., 0.}, new double[] {1.}, weight); + new PV(date, position, velocity, new double[] {0., 0., 0.}, new double[] {1.}, weight, new ObservableSatellite(0)); Assert.fail("An OrekitException should have been thrown"); } catch (OrekitException e) { // An exception should indeed be raised here @@ -477,7 +491,7 @@ public class PVTest { // Build with one 6-sized vector try { - new PV(date, position, velocity, new double[] {0., 0., 0.}, weight); + new PV(date, position, velocity, new double[] {0., 0., 0.}, weight, new ObservableSatellite(0)); Assert.fail("An OrekitException should have been thrown"); } catch (OrekitException e) { // An exception should indeed be raised here @@ -486,7 +500,7 @@ public class PVTest { // Build with two 3x3 matrices try { new PV(date, position, velocity, new double[][] {{0., 0.}, {0., 0.}}, - new double[][] {{0., 0.}, {0., 0.}}, weight); + new double[][] {{0., 0.}, {0., 0.}}, weight, new ObservableSatellite(0)); Assert.fail("An OrekitException should have been thrown"); } catch (OrekitException e) { // An exception should indeed be raised here @@ -494,7 +508,7 @@ public class PVTest { // Build with one 6x6 matrix try { - new PV(date, position, velocity, new double[][] {{0., 0.}, {0., 0.}}, weight); + new PV(date, position, velocity, new double[][] {{0., 0.}, {0., 0.}}, weight, new ObservableSatellite(0)); Assert.fail("An OrekitException should have been thrown"); } catch (OrekitException e) { // An exception should indeed be raised here diff --git a/src/test/java/org/orekit/estimation/measurements/PhaseMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/PhaseMeasurementCreator.java index 39ad52e8f1f489a1e1f725f23fb2b961b6e7d83d..f8a02f5bdac28717ae77861042efebf1058a1a41 100644 --- a/src/test/java/org/orekit/estimation/measurements/PhaseMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/PhaseMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -40,24 +40,25 @@ public class PhaseMeasurementCreator extends MeasurementCreator { private final double wavelength; private final PhaseAmbiguityModifier ambiguity; private final Vector3D antennaPhaseCenter; + private final ObservableSatellite satellite; - public PhaseMeasurementCreator(final Context context, final Frequency frequency, final int ambiguity) - { + public PhaseMeasurementCreator(final Context context, final Frequency frequency, final int ambiguity) { this(context, frequency, ambiguity, Vector3D.ZERO); } public PhaseMeasurementCreator(final Context context, final Frequency frequency, - final int ambiguity, final Vector3D antennaPhaseCenter) - { + final int ambiguity, final Vector3D antennaPhaseCenter) { this.context = context; this.wavelength = Constants.SPEED_OF_LIGHT / (1.0e6 * frequency.getMHzFrequency()); this.ambiguity = new PhaseAmbiguityModifier(0, ambiguity); this.antennaPhaseCenter = antennaPhaseCenter; + this.satellite = new ObservableSatellite(0); } public void init(SpacecraftState s0, AbsoluteDate t, double step) { for (final GroundStation station : context.stations) { - for (ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver(), station.getPrimeMeridianOffsetDriver(), @@ -74,8 +75,7 @@ public class PhaseMeasurementCreator extends MeasurementCreator { } } - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { + public void handleStep(final SpacecraftState currentState, final boolean isLast) { try { double n = ambiguity.getParametersDrivers().get(0).getValue(); for (final GroundStation station : context.stations) { @@ -100,7 +100,7 @@ public class PhaseMeasurementCreator extends MeasurementCreator { final Phase phase = new Phase(station, receptionDate, downLinkDistance / wavelength - n, - wavelength, 1.0, 10); + wavelength, 1.0, 10, satellite); phase.addModifier(ambiguity); addMeasurement(phase); } diff --git a/src/test/java/org/orekit/estimation/measurements/PhaseTest.java b/src/test/java/org/orekit/estimation/measurements/PhaseTest.java index db655589f3f25f2f511604fb8f6094c6b04e1f90..47a3dbb8e0bea93f11877ea2fb2193e9e9ad8425 100644 --- a/src/test/java/org/orekit/estimation/measurements/PhaseTest.java +++ b/src/test/java/org/orekit/estimation/measurements/PhaseTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -121,8 +121,8 @@ public class PhaseTest { System.out.println("\nTest Phase Parameter Derivatives - Finite Differences Comparison\n"); } // Run test - double refErrorsMedian = 1.1e-8; - double refErrorsMean = 8.2e-8; + double refErrorsMedian = 5.9e-9; + double refErrorsMean = 6.4e-8; double refErrorsMax = 5.1e-6; this.genericTestParameterDerivatives(printResults, refErrorsMedian, refErrorsMean, refErrorsMax); @@ -133,8 +133,7 @@ public class PhaseTest { * Generic test function for values of the phase * @param printResults Print the results ? */ - void genericTestValues(final boolean printResults) - { + void genericTestValues(final boolean printResults) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -166,8 +165,7 @@ public class PhaseTest { // Play test if the measurement date is between interpolator previous and current date if ((measurement.getDate().durationFrom(interpolator.getPreviousState().getDate()) > 0.) && - (measurement.getDate().durationFrom(interpolator.getCurrentState().getDate()) <= 0.) - ) { + (measurement.getDate().durationFrom(interpolator.getCurrentState().getDate()) <= 0.)) { // We intentionally propagate to a date which is close to the // real spacecraft state but is *not* the accurate date, by // compensating only part of the downlink delay. This is done @@ -259,8 +257,7 @@ public class PhaseTest { void genericTestStateDerivatives(final boolean printResults, final double refErrorsPMedian, final double refErrorsPMean, final double refErrorsPMax, - final double refErrorsVMedian, final double refErrorsVMean, final double refErrorsVMax) - { + final double refErrorsVMedian, final double refErrorsVMean, final double refErrorsVMax) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -292,8 +289,7 @@ public class PhaseTest { // Play test if the measurement date is between interpolator previous and current date if ((measurement.getDate().durationFrom(interpolator.getPreviousState().getDate()) > 0.) && - (measurement.getDate().durationFrom(interpolator.getCurrentState().getDate()) <= 0.) - ) { + (measurement.getDate().durationFrom(interpolator.getCurrentState().getDate()) <= 0.)) { // We intentionally propagate to a date which is close to the // real spacecraft state but is *not* the accurate date, by @@ -337,15 +333,15 @@ public class PhaseTest { if (printResults) { String stationName = ((Phase) measurement).getStation().getBaseFrame().getName(); System.out.format(Locale.US, "%-15s %-23s %-23s " + - "%10.3e %10.3e %10.3e " + - "%10.3e %10.3e %10.3e " + - "%10.3e %10.3e %10.3e " + - "%10.3e %10.3e %10.3e%n", - stationName, measurement.getDate(), date, - dJacobian[0][0], dJacobian[0][1], dJacobian[0][2], - dJacobian[0][3], dJacobian[0][4], dJacobian[0][5], - dJacobianRelative[0][0], dJacobianRelative[0][1], dJacobianRelative[0][2], - dJacobianRelative[0][3], dJacobianRelative[0][4], dJacobianRelative[0][5]); + "%10.3e %10.3e %10.3e " + + "%10.3e %10.3e %10.3e " + + "%10.3e %10.3e %10.3e " + + "%10.3e %10.3e %10.3e%n", + stationName, measurement.getDate(), date, + dJacobian[0][0], dJacobian[0][1], dJacobian[0][2], + dJacobian[0][3], dJacobian[0][4], dJacobian[0][5], + dJacobianRelative[0][0], dJacobianRelative[0][1], dJacobianRelative[0][2], + dJacobianRelative[0][3], dJacobianRelative[0][4], dJacobianRelative[0][5]); } } // End if measurement date between previous and current interpolator step } // End for loop on the measurements @@ -402,8 +398,7 @@ public class PhaseTest { } void genericTestParameterDerivatives(final boolean printResults, - final double refErrorsMedian, final double refErrorsMean, final double refErrorsMax) - { + final double refErrorsMedian, final double refErrorsMean, final double refErrorsMax) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -413,6 +408,7 @@ public class PhaseTest { // Create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -438,8 +434,7 @@ public class PhaseTest { // Play test if the measurement date is between interpolator previous and current date if ((measurement.getDate().durationFrom(interpolator.getPreviousState().getDate()) > 0.) && - (measurement.getDate().durationFrom(interpolator.getCurrentState().getDate()) <= 0.) - ) { + (measurement.getDate().durationFrom(interpolator.getCurrentState().getDate()) <= 0.)) { // Parameter corresponding to station position offset final GroundStation stationParameter = ((Phase) measurement).getStation(); @@ -455,6 +450,7 @@ public class PhaseTest { final AbsoluteDate date = measurement.getDate().shiftedBy(-0.75 * meanDelay); final SpacecraftState state = interpolator.getInterpolatedState(date); final ParameterDriver[] drivers = new ParameterDriver[] { + stationParameter.getClockOffsetDriver(), stationParameter.getEastOffsetDriver(), stationParameter.getNorthOffsetDriver(), stationParameter.getZenithOffsetDriver() @@ -466,7 +462,7 @@ public class PhaseTest { stationName, measurement.getDate(), date); } - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < drivers.length; ++i) { final double[] gradient = measurement.estimate(0, 0, new SpacecraftState[] { state }).getParameterDerivatives(drivers[i]); Assert.assertEquals(1, measurement.getDimension()); Assert.assertEquals(1, gradient.length); @@ -479,7 +475,7 @@ public class PhaseTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); if (printResults) { @@ -507,12 +503,12 @@ public class PhaseTest { // Print results ? Header if (printResults) { System.out.format(Locale.US, "%-15s %-23s %-23s " + - "%10s %10s %10s " + - "%10s %10s %10s%n", - "Station", "Measurement Date", "State Date", - "ΔdQx", "rel ΔdQx", - "ΔdQy", "rel ΔdQy", - "ΔdQz", "rel ΔdQz"); + "%10s %10s %10s %10s %10s %10s %10s %10s%n", + "Station", "Measurement Date", "State Date", + "Δt", "rel Δt", + "ΔdQx", "rel ΔdQx", + "ΔdQy", "rel ΔdQy", + "ΔdQz", "rel ΔdQz"); } // Propagate to final measurement's date diff --git a/src/test/java/org/orekit/estimation/measurements/PositionMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/PositionMeasurementCreator.java index 5dd3de1f442a2837dfae4368d30ae707b2b49cf5..531da0440899e1f9571f4b9e6628481dc13791be 100644 --- a/src/test/java/org/orekit/estimation/measurements/PositionMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/PositionMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,9 +22,15 @@ import org.orekit.propagation.SpacecraftState; public class PositionMeasurementCreator extends MeasurementCreator { + private final ObservableSatellite satellite; + + public PositionMeasurementCreator() { + this.satellite = new ObservableSatellite(0); + } + public void handleStep(final SpacecraftState currentState, final boolean isLast) { final Vector3D p = currentState.getPVCoordinates().getPosition(); - final Position measurement = new Position(currentState.getDate(), p, 1.0, 1.0); + final Position measurement = new Position(currentState.getDate(), p, 1.0, 1.0, satellite); Assert.assertEquals(0.0, Vector3D.distance(p, measurement.getPosition()), 1.0e-10); addMeasurement(measurement); } diff --git a/src/test/java/org/orekit/estimation/measurements/PositionTest.java b/src/test/java/org/orekit/estimation/measurements/PositionTest.java index 0e58384a92a1d9f5bb235cbe83b8c098746a0e67..4ea69861670871d661a56bdb1083194328e9f532 100644 --- a/src/test/java/org/orekit/estimation/measurements/PositionTest.java +++ b/src/test/java/org/orekit/estimation/measurements/PositionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -172,12 +172,15 @@ public class PositionTest { final double[][] corrCoefRef = MatrixUtils.createRealIdentityMatrix(3).getData(); // Reference propagator numbers - final int[] propNumRef = {0, 2}; + final ObservableSatellite[] sats = { + new ObservableSatellite(0), + new ObservableSatellite(2) + }; // Create PV measurements final Position[] ps = new Position[2]; - ps[0] = new Position(date, position, sigmaP, baseWeight); - ps[1] = new Position(date, position, sigmaP, baseWeight, propNumRef[1]); + ps[0] = new Position(date, position, sigmaP, baseWeight, sats[0]); + ps[1] = new Position(date, position, sigmaP, baseWeight, sats[1]); // Tolerance final double eps = 1e-20; // tolerance @@ -187,7 +190,7 @@ public class PositionTest { final Position p = ps[k]; // Propagator numbers - assertEquals(propNumRef[k], p.getPropagatorsIndices().get(0), eps); + assertEquals(sats[k].getPropagatorIndex(), p.getSatellites().get(0).getPropagatorIndex()); // Weights for (int i = 0; i < 3; i++) { @@ -235,12 +238,15 @@ public class PositionTest { final double[][] corrCoefRef = MatrixUtils.createRealIdentityMatrix(3).getData(); // Reference propagator numbers - final int[] propNumRef = {0, 2, 0, 10}; + final ObservableSatellite[] sats = { + new ObservableSatellite(0), + new ObservableSatellite(2) + }; // Create PV measurements final Position[] ps = new Position[2]; - ps[0] = new Position(date, position, sigmaP, baseWeight); - ps[1] = new Position(date, position, sigmaP, baseWeight, propNumRef[1]); + ps[0] = new Position(date, position, sigmaP, baseWeight, sats[0]); + ps[1] = new Position(date, position, sigmaP, baseWeight, sats[1]); // Tolerance final double eps = 1e-20; // tolerance @@ -250,7 +256,7 @@ public class PositionTest { final Position p = ps[k]; // Propagator numbers - assertEquals(propNumRef[k], p.getPropagatorsIndices().get(0), eps); + assertEquals(sats[k].getPropagatorIndex(), p.getSatellites().get(0).getPropagatorIndex()); // Weights for (int i = 0; i < 3; i++) { @@ -307,15 +313,18 @@ public class PositionTest { } // Reference propagator numbers - final int[] propNumRef = {0, 2}; + final ObservableSatellite[] sats = { + new ObservableSatellite(0), + new ObservableSatellite(2) + }; // Reference standard deviations final double[] sigmaP = {10., 20., 30.}; // Create Position measurements final Position[] ps = new Position[2]; - ps[0] = new Position(date, position, positionP,baseWeight); - ps[1] = new Position(date, position, positionP, baseWeight, propNumRef[1]); + ps[0] = new Position(date, position, positionP, baseWeight, sats[0]); + ps[1] = new Position(date, position, positionP, baseWeight, sats[1]); // Tolerance final double eps = 6.7e-16; // tolerance @@ -325,7 +334,7 @@ public class PositionTest { final Position p = ps[k]; // Propagator numbers - assertEquals(propNumRef[k], p.getPropagatorsIndices().get(0), eps); + assertEquals(sats[k].getPropagatorIndex(), p.getSatellites().get(0).getPropagatorIndex()); // Weights for (int i = 0; i < 3; i++) { @@ -363,7 +372,7 @@ public class PositionTest { // Build with one 3-sized vectors try { - new Position(date, position, new double[] {1.}, weight); + new Position(date, position, new double[] {1.}, weight, new ObservableSatellite(0)); Assert.fail("An OrekitException should have been thrown"); } catch (OrekitException e) { // An exception should indeed be raised here @@ -371,7 +380,7 @@ public class PositionTest { // Build with one 3x3 matrix try { - new Position(date, position, new double[][] {{0., 0.}, {0., 0.}}, weight); + new Position(date, position, new double[][] {{0., 0.}, {0., 0.}}, weight, new ObservableSatellite(0)); Assert.fail("An OrekitException should have been thrown"); } catch (OrekitException e) { // An exception should indeed be raised here diff --git a/src/test/java/org/orekit/estimation/measurements/Range2Test.java b/src/test/java/org/orekit/estimation/measurements/Range2Test.java index fb19014627538ff771b17960ee00aa311d6f86ba..922169c33c9b303d4cee9aeaf52a001c91c89984 100644 --- a/src/test/java/org/orekit/estimation/measurements/Range2Test.java +++ b/src/test/java/org/orekit/estimation/measurements/Range2Test.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -133,8 +133,8 @@ public class Range2Test { } // Run test boolean isModifier = false; - double refErrorsMedian = 1.1e-8; - double refErrorsMean = 8.2e-8; + double refErrorsMedian = 5.8e-9; + double refErrorsMean = 6.4e-8; double refErrorsMax = 5.1e-6; this.genericTestParameterDerivatives(isModifier, printResults, refErrorsMedian, refErrorsMean, refErrorsMax); @@ -156,9 +156,9 @@ public class Range2Test { } // Run test boolean isModifier = true; - double refErrorsMedian = 1.1e-8; - double refErrorsMean = 8.2e-8; - double refErrorsMax = 5.1e-6; + double refErrorsMedian = 2.9e-8; + double refErrorsMean = 4.9e-7; + double refErrorsMax = 1.5e-5; this.genericTestParameterDerivatives(isModifier, printResults, refErrorsMedian, refErrorsMean, refErrorsMax); @@ -442,8 +442,7 @@ public class Range2Test { } void genericTestParameterDerivatives(final boolean isModifier, final boolean printResults, - final double refErrorsMedian, final double refErrorsMean, final double refErrorsMax) - { + final double refErrorsMedian, final double refErrorsMean, final double refErrorsMax) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -453,6 +452,7 @@ public class Range2Test { // Create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -498,6 +498,7 @@ public class Range2Test { final AbsoluteDate date = measurement.getDate().shiftedBy(-0.75 * meanDelay); final SpacecraftState state = interpolator.getInterpolatedState(date); final ParameterDriver[] drivers = new ParameterDriver[] { + stationParameter.getClockOffsetDriver(), stationParameter.getEastOffsetDriver(), stationParameter.getNorthOffsetDriver(), stationParameter.getZenithOffsetDriver() @@ -509,7 +510,7 @@ public class Range2Test { stationName, measurement.getDate(), date); } - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < drivers.length; ++i) { final double[] gradient = measurement.estimate(0, 0, new SpacecraftState[] { state }).getParameterDerivatives(drivers[i]); Assert.assertEquals(1, measurement.getDimension()); Assert.assertEquals(1, gradient.length); @@ -522,7 +523,7 @@ public class Range2Test { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); if (printResults) { @@ -550,12 +551,12 @@ public class Range2Test { // Print results ? Header if (printResults) { System.out.format(Locale.US, "%-15s %-23s %-23s " + - "%10s %10s %10s " + - "%10s %10s %10s%n", - "Station", "Measurement Date", "State Date", - "ΔdQx", "rel ΔdQx", - "ΔdQy", "rel ΔdQy", - "ΔdQz", "rel ΔdQz"); + "%10s %10s %10s %10s %10s %10s %10s %10s%n", + "Station", "Measurement Date", "State Date", + "Δt", "rel Δt", + "ΔdQx", "rel ΔdQx", + "ΔdQy", "rel ΔdQy", + "ΔdQz", "rel ΔdQz"); } // Propagate to final measurement's date diff --git a/src/test/java/org/orekit/estimation/measurements/RangeAnalytic.java b/src/test/java/org/orekit/estimation/measurements/RangeAnalytic.java index b8ecce7ef22cfb9e7688d2d07e3bdd144a309263..90d863e73ca19398b59789aace877dfdfab3baf7 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeAnalytic.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeAnalytic.java @@ -46,27 +46,14 @@ import org.orekit.utils.TimeStampedPVCoordinates; */ public class RangeAnalytic extends Range { - /** Simple constructor. - * @param station ground station from which measurement is performed - * @param date date of the measurement - * @param range observed value - * @param sigma theoretical standard deviation - * @param baseWeight base weight - */ - public RangeAnalytic(final GroundStation station, final AbsoluteDate date, - final double range, final double sigma, final double baseWeight) - { - super(station, date, range, sigma, baseWeight); - } - /** Constructor from parent Range class * @param Range parent class */ - public RangeAnalytic(final Range range) - { - super(range.getStation(), range.getDate(), range.getObservedValue()[0], + public RangeAnalytic(final Range range) { + super(range.getStation(), true, range.getDate(), range.getObservedValue()[0], range.getTheoreticalStandardDeviation()[0], - range.getBaseWeight()[0]); + range.getBaseWeight()[0], + new ObservableSatellite(0)); } /** @@ -188,9 +175,10 @@ public class RangeAnalytic extends Range { dRdPx * dt, dRdPy * dt, dRdPz * dt }); - if (groundStation.getEastOffsetDriver().isSelected() || - groundStation.getNorthOffsetDriver().isSelected() || - groundStation.getZenithOffsetDriver().isSelected()) { + if (groundStation.getClockOffsetDriver().isSelected() || + groundStation.getEastOffsetDriver().isSelected() || + groundStation.getNorthOffsetDriver().isSelected() || + groundStation.getZenithOffsetDriver().isSelected()) { // Downlink tme of flight derivatives / station position in topocentric frame final AngularCoordinates ac = topoToInertDownlink.getAngular().revert(); @@ -286,10 +274,10 @@ public class RangeAnalytic extends Range { // transform between station and inertial frame, expressed as a derivative structure // The components of station's position in offset frame are the 3 last derivative parameters final AbsoluteDate downlinkDate = getDate(); - final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = - new FieldAbsoluteDate<>(field, downlinkDate); final FieldTransform<DerivativeStructure> offsetToInertialDownlink = - groundStation.getOffsetToInertial(state.getFrame(), downlinkDateDS, dsFactory, indices); + groundStation.getOffsetToInertial(state.getFrame(), downlinkDate, dsFactory, indices); + final FieldAbsoluteDate<DerivativeStructure> downlinkDateDS = + offsetToInertialDownlink.getFieldDate(); // Station position in inertial frame at end of the downlink leg final TimeStampedFieldPVCoordinates<DerivativeStructure> stationDownlink = diff --git a/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java b/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java index add30fc05d3162ba3e48020afcaf3b00ee5c962a..684f8d2f3aff1bdfa8eebbae4feaf9fe641cf463 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeAnalyticTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -494,8 +494,7 @@ public class RangeAnalyticTest { * @param isFiniteDifferences Finite differences reference calculation if true, Range class otherwise * @param printResults Print the results ? */ - void genericTestParameterDerivatives(final boolean isModifier, final boolean isFiniteDifferences, final boolean printResults) - { + void genericTestParameterDerivatives(final boolean isModifier, final boolean isFiniteDifferences, final boolean printResults) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -505,6 +504,7 @@ public class RangeAnalyticTest { // Create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(false); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -561,7 +561,7 @@ public class RangeAnalyticTest { stationName, measurement.getDate(), date); } - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < drivers.length; ++i) { final double[] gradient = measurement.estimate(0, 0, new SpacecraftState[] { state }).getParameterDerivatives(drivers[i]); Assert.assertEquals(1, measurement.getDimension()); Assert.assertEquals(1, gradient.length); diff --git a/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator.java index fb03492fb3f9c227f654036f317bfbb2f879cdf5..3f8e68854bea4a1d03efacd5b4a491ed84026cb5 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.analysis.solvers.BracketingNthOrderBrentSolver; import org.hipparchus.analysis.solvers.UnivariateSolver; import org.hipparchus.geometry.euclidean.threed.Vector3D; import org.hipparchus.util.FastMath; -import org.orekit.errors.OrekitException; import org.orekit.estimation.Context; import org.orekit.frames.Frame; import org.orekit.frames.Transform; @@ -34,21 +33,27 @@ import org.orekit.utils.ParameterDriver; public class RangeMeasurementCreator extends MeasurementCreator { - private final Context context; - private final Vector3D antennaPhaseCenter; + private final Context context; + private final Vector3D antennaPhaseCenter; + private final double clockOffset; + private final ObservableSatellite satellite; public RangeMeasurementCreator(final Context context) { - this(context, Vector3D.ZERO); + this(context, Vector3D.ZERO, 0.0); } - public RangeMeasurementCreator(final Context context, final Vector3D antennaPhaseCenter) { + public RangeMeasurementCreator(final Context context, final Vector3D antennaPhaseCenter, + final double clockOffset) { this.context = context; this.antennaPhaseCenter = antennaPhaseCenter; + this.clockOffset = clockOffset; + this.satellite = new ObservableSatellite(0); } public void init(SpacecraftState s0, AbsoluteDate t, double step) { for (final GroundStation station : context.stations) { - for (ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver(), station.getPrimeMeridianOffsetDriver(), @@ -65,47 +70,42 @@ public class RangeMeasurementCreator extends MeasurementCreator { } } - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { - try { - for (final GroundStation station : context.stations) { - final AbsoluteDate date = currentState.getDate(); - final Frame inertial = currentState.getFrame(); - final Vector3D position = currentState.toTransform().getInverse().transformPosition(antennaPhaseCenter); - - if (station.getBaseFrame().getElevation(position, inertial, date) > FastMath.toRadians(30.0)) { - final UnivariateSolver solver = new BracketingNthOrderBrentSolver(1.0e-12, 5); + public void handleStep(final SpacecraftState currentState, final boolean isLast) { + for (final GroundStation station : context.stations) { + final AbsoluteDate date = currentState.getDate(); + final Frame inertial = currentState.getFrame(); + final Vector3D position = currentState.toTransform().getInverse().transformPosition(antennaPhaseCenter); - final double downLinkDelay = solver.solve(1000, new UnivariateFunction() { - public double value(final double x) { - final Transform t = station.getOffsetToInertial(inertial, date.shiftedBy(x)); - final double d = Vector3D.distance(position, t.transformPosition(Vector3D.ZERO)); - return d - x * Constants.SPEED_OF_LIGHT; - } - }, -1.0, 1.0); - final AbsoluteDate receptionDate = currentState.getDate().shiftedBy(downLinkDelay); - final Vector3D stationAtReception = - station.getOffsetToInertial(inertial, receptionDate).transformPosition(Vector3D.ZERO); - final double downLinkDistance = Vector3D.distance(position, stationAtReception); + if (station.getBaseFrame().getElevation(position, inertial, date) > FastMath.toRadians(30.0)) { + final UnivariateSolver solver = new BracketingNthOrderBrentSolver(1.0e-12, 5); - final double upLinkDelay = solver.solve(1000, new UnivariateFunction() { - public double value(final double x) { - final Transform t = station.getOffsetToInertial(inertial, date.shiftedBy(-x)); - final double d = Vector3D.distance(position, t.transformPosition(Vector3D.ZERO)); - return d - x * Constants.SPEED_OF_LIGHT; - } - }, -1.0, 1.0); - final AbsoluteDate emissionDate = currentState.getDate().shiftedBy(-upLinkDelay); - final Vector3D stationAtEmission = - station.getOffsetToInertial(inertial, emissionDate).transformPosition(Vector3D.ZERO); - final double upLinkDistance = Vector3D.distance(position, stationAtEmission); - addMeasurement(new Range(station, receptionDate, - 0.5 * (downLinkDistance + upLinkDistance), 1.0, 10)); - } + final double downLinkDelay = solver.solve(1000, new UnivariateFunction() { + public double value(final double x) { + final Transform t = station.getOffsetToInertial(inertial, date.shiftedBy(x)); + final double d = Vector3D.distance(position, t.transformPosition(Vector3D.ZERO)); + return d - x * Constants.SPEED_OF_LIGHT; + } + }, -1.0, 1.0); + final AbsoluteDate receptionDate = currentState.getDate().shiftedBy(downLinkDelay); + final Vector3D stationAtReception = + station.getOffsetToInertial(inertial, receptionDate).transformPosition(Vector3D.ZERO); + final double downLinkDistance = Vector3D.distance(position, stationAtReception); + final double upLinkDelay = solver.solve(1000, new UnivariateFunction() { + public double value(final double x) { + final Transform t = station.getOffsetToInertial(inertial, date.shiftedBy(-x)); + final double d = Vector3D.distance(position, t.transformPosition(Vector3D.ZERO)); + return d - x * Constants.SPEED_OF_LIGHT; + } + }, -1.0, 1.0); + final AbsoluteDate emissionDate = currentState.getDate().shiftedBy(-upLinkDelay); + final Vector3D stationAtEmission = + station.getOffsetToInertial(inertial, emissionDate).transformPosition(Vector3D.ZERO); + final double upLinkDistance = Vector3D.distance(position, stationAtEmission); + addMeasurement(new Range(station, true, receptionDate.shiftedBy(-clockOffset), + 0.5 * (downLinkDistance + upLinkDistance), 1.0, 10, satellite)); } - } catch (OrekitException oe) { - throw new OrekitException(oe); + } } diff --git a/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator2.java b/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator2.java index 9bef65b151ece0c187d9785027965227e49565e5..186025f7194b704e97959b9a0b9cacf1501b12e5 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator2.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeMeasurementCreator2.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -36,6 +36,7 @@ public class RangeMeasurementCreator2 extends MeasurementCreator { private final Context context; private final Vector3D antennaPhaseCenter; + private final ObservableSatellite satellite; public RangeMeasurementCreator2(final Context context) { this(context, Vector3D.ZERO); @@ -44,11 +45,13 @@ public class RangeMeasurementCreator2 extends MeasurementCreator { public RangeMeasurementCreator2(final Context context, final Vector3D antennaPhaseCenter) { this.context = context; this.antennaPhaseCenter = antennaPhaseCenter; + this.satellite = new ObservableSatellite(0); } public void init(SpacecraftState s0, AbsoluteDate t, double step) { for (final GroundStation station : context.stations) { - for (ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver(), station.getPrimeMeridianOffsetDriver(), @@ -65,8 +68,7 @@ public class RangeMeasurementCreator2 extends MeasurementCreator { } } - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { + public void handleStep(final SpacecraftState currentState, final boolean isLast) { try { for (final GroundStation station : context.stations) { final AbsoluteDate date = currentState.getDate(); @@ -88,8 +90,8 @@ public class RangeMeasurementCreator2 extends MeasurementCreator { station.getOffsetToInertial(inertial, receptionDate).transformPosition(Vector3D.ZERO); final double downLinkDistance = Vector3D.distance(position, stationAtReception); - addMeasurement(new Range(station, receptionDate, downLinkDistance, - 1.0, 10, false)); + addMeasurement(new Range(station, false, receptionDate, downLinkDistance, + 1.0, 10, satellite)); } } diff --git a/src/test/java/org/orekit/estimation/measurements/RangeRateMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/RangeRateMeasurementCreator.java index 1602f89c09a2cc824786742a133646af6f791544..94f688208246e7918dcc233a7b0687b1dd8c9969 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeRateMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeRateMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -36,15 +36,18 @@ public class RangeRateMeasurementCreator extends MeasurementCreator { private final Context context; private final boolean twoWay; + private final ObservableSatellite satellite; public RangeRateMeasurementCreator(final Context context, boolean twoWay) { - this.context = context; - this.twoWay = twoWay; + this.context = context; + this.twoWay = twoWay; + this.satellite = new ObservableSatellite(0); } public void init(SpacecraftState s0, AbsoluteDate t, double step) { for (final GroundStation station : context.stations) { - for (ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver(), station.getPrimeMeridianOffsetDriver(), @@ -61,8 +64,7 @@ public class RangeRateMeasurementCreator extends MeasurementCreator { } } - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { + public void handleStep(final SpacecraftState currentState, final boolean isLast) { for (final GroundStation station : context.stations) { final AbsoluteDate date = currentState.getDate(); @@ -114,7 +116,7 @@ public class RangeRateMeasurementCreator extends MeasurementCreator { addMeasurement(new RangeRate(station, receptionDate, rr, - 1.0, 10, twoWay)); + 1.0, 10, twoWay, satellite)); } } diff --git a/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java b/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java index 54824ae52b066ed40e429219de11a1b9058e7dcd..0090d177c606e0795fc6496a7757a76d0f763b6c 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeRateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -270,6 +270,7 @@ public class RangeRateTest { // create perfect range rate measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -315,7 +316,7 @@ public class RangeRateTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); maxRelativeError = FastMath.max(maxRelativeError, FastMath.abs((ref - gradient[0]) / ref)); } @@ -340,6 +341,7 @@ public class RangeRateTest { // create perfect range rate measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -385,7 +387,7 @@ public class RangeRateTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); maxRelativeError = FastMath.max(maxRelativeError, FastMath.abs((ref - gradient[0]) / ref)); } @@ -541,6 +543,7 @@ public class RangeRateTest { // create perfect range rate measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -589,7 +592,7 @@ public class RangeRateTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); maxRelativeError = FastMath.max(maxRelativeError, FastMath.abs((ref - gradient[0]) / ref)); } diff --git a/src/test/java/org/orekit/estimation/measurements/RangeTest.java b/src/test/java/org/orekit/estimation/measurements/RangeTest.java index 7f839de5655dd28327b8f99db817bd6c687df267..f11400b1a5d016e28b773a7da45a248b046788e8 100644 --- a/src/test/java/org/orekit/estimation/measurements/RangeTest.java +++ b/src/test/java/org/orekit/estimation/measurements/RangeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,7 @@ package org.orekit.estimation.measurements; import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -51,6 +52,33 @@ import org.orekit.utils.TimeStampedPVCoordinates; public class RangeTest { + @Test + public void testDeprecated() { + // temporary test for the base ObservedMeasurement interface default method getSatellites() + // this prevents the interface to appear as not tested at all in the coverage report + List<ObservableSatellite> satellites = new Dummy().getSatellites(); + Assert.assertEquals(4, satellites.size()); + Assert.assertEquals(3, satellites.get(0).getPropagatorIndex()); + Assert.assertEquals(2, satellites.get(1).getPropagatorIndex()); + Assert.assertEquals(1, satellites.get(2).getPropagatorIndex()); + Assert.assertEquals(0, satellites.get(3).getPropagatorIndex()); + } + + private static class Dummy implements ObservedMeasurement<Dummy> { + public double[] getObservedValue() { return null; } + public AbsoluteDate getDate() { return null; } + public void setEnabled(boolean enabled) {} + public boolean isEnabled() { return false; } + public int getDimension() { return 0; } + public double[] getTheoreticalStandardDeviation() { return null; } + public double[] getBaseWeight() { return null; } + public void addModifier(EstimationModifier<Dummy> modifier) {} + public List<EstimationModifier<Dummy>> getModifiers() { return null; } + public List<ParameterDriver> getParametersDrivers() { return null; } + public List<Integer> getPropagatorsIndices() { return Arrays.asList(3, 2, 1, 0); } + public EstimatedMeasurement<Dummy> estimate(int iteration, int evaluation, SpacecraftState[] states) { return null; } + } + /** * Test the values of the range comparing the observed values and the estimated values * Both are calculated with a different algorithm @@ -128,8 +156,8 @@ public class RangeTest { } // Run test boolean isModifier = false; - double refErrorsMedian = 1.1e-8; - double refErrorsMean = 8.2e-8; + double refErrorsMedian = 5.7e-9; + double refErrorsMean = 6.4e-8; double refErrorsMax = 5.1e-6; this.genericTestParameterDerivatives(isModifier, printResults, refErrorsMedian, refErrorsMean, refErrorsMax); @@ -151,9 +179,9 @@ public class RangeTest { } // Run test boolean isModifier = true; - double refErrorsMedian = 1.1e-8; - double refErrorsMean = 8.2e-8; - double refErrorsMax = 5.1e-6; + double refErrorsMedian = 2.9e-8; + double refErrorsMean = 4.9e-7; + double refErrorsMax = 1.5e-5; this.genericTestParameterDerivatives(isModifier, printResults, refErrorsMedian, refErrorsMean, refErrorsMax); @@ -313,8 +341,7 @@ public class RangeTest { void genericTestStateDerivatives(final boolean isModifier, final boolean printResults, final double refErrorsPMedian, final double refErrorsPMean, final double refErrorsPMax, - final double refErrorsVMedian, final double refErrorsVMean, final double refErrorsVMax) - { + final double refErrorsVMedian, final double refErrorsVMean, final double refErrorsVMax) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -459,8 +486,7 @@ public class RangeTest { } void genericTestParameterDerivatives(final boolean isModifier, final boolean printResults, - final double refErrorsMedian, final double refErrorsMean, final double refErrorsMax) - { + final double refErrorsMedian, final double refErrorsMean, final double refErrorsMax) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -470,6 +496,7 @@ public class RangeTest { // Create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -502,7 +529,7 @@ public class RangeTest { } // Parameter corresponding to station position offset - final GroundStation stationParameter = ((Range) measurement).getStation(); + final GroundStation station = ((Range) measurement).getStation(); // We intentionally propagate to a date which is close to the // real spacecraft state but is *not* the accurate date, by @@ -515,9 +542,10 @@ public class RangeTest { final AbsoluteDate date = measurement.getDate().shiftedBy(-0.75 * meanDelay); final SpacecraftState state = interpolator.getInterpolatedState(date); final ParameterDriver[] drivers = new ParameterDriver[] { - stationParameter.getEastOffsetDriver(), - stationParameter.getNorthOffsetDriver(), - stationParameter.getZenithOffsetDriver() + station.getClockOffsetDriver(), + station.getEastOffsetDriver(), + station.getNorthOffsetDriver(), + station.getZenithOffsetDriver() }; if (printResults) { @@ -526,7 +554,7 @@ public class RangeTest { stationName, measurement.getDate(), date); } - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < drivers.length; ++i) { final double[] gradient = measurement.estimate(0, 0, new SpacecraftState[] { state }).getParameterDerivatives(drivers[i]); Assert.assertEquals(1, measurement.getDimension()); Assert.assertEquals(1, gradient.length); @@ -539,7 +567,7 @@ public class RangeTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); if (printResults) { @@ -548,7 +576,7 @@ public class RangeTest { final double relError = FastMath.abs((ref-gradient[0])/ref); relErrorList.add(relError); -// Assert.assertEquals(ref, gradient[0], 6.1e-5 * FastMath.abs(ref)); + Assert.assertEquals(ref, gradient[0], 6.1e-5 * FastMath.abs(ref)); } if (printResults) { System.out.format(Locale.US, "%n"); @@ -567,12 +595,12 @@ public class RangeTest { // Print results ? Header if (printResults) { System.out.format(Locale.US, "%-15s %-23s %-23s " + - "%10s %10s %10s " + - "%10s %10s %10s%n", - "Station", "Measurement Date", "State Date", - "ΔdQx", "rel ΔdQx", - "ΔdQy", "rel ΔdQy", - "ΔdQz", "rel ΔdQz"); + "%10s %10s %10s %10s %10s %10s %10s %10s%n", + "Station", "Measurement Date", "State Date", + "Δt", "rel Δt", + "ΔdQx", "rel ΔdQx", + "ΔdQy", "rel ΔdQy", + "ΔdQz", "rel ΔdQz"); } // Propagate to final measurement's date diff --git a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalytic.java b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalytic.java index 9c09b4473c35330295651d169c184da83bb4a46f..06e57bb9fc28f9b2d701aadf9c32d7bce01c9740 100644 --- a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalytic.java +++ b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalytic.java @@ -49,29 +49,15 @@ import org.orekit.utils.TimeStampedPVCoordinates; */ public class TurnAroundRangeAnalytic extends TurnAroundRange { - /** Simple constructor. - * @param station ground station from which measurement is performed - * @param date date of the measurement - * @param range observed value - * @param sigma theoretical standard deviation - * @param baseWeight base weight - */ - public TurnAroundRangeAnalytic(final GroundStation masterStation, final GroundStation slaveStation, - final AbsoluteDate date, final double turnAroundRange, - final double sigma, final double baseWeight) - { - super(masterStation, slaveStation, date, turnAroundRange, sigma, baseWeight); - } - /** Constructor from parent TurnAroundRange class * @param Range parent class */ - public TurnAroundRangeAnalytic(final TurnAroundRange turnAroundRange) - { + public TurnAroundRangeAnalytic(final TurnAroundRange turnAroundRange) { super(turnAroundRange.getMasterStation(), turnAroundRange.getSlaveStation(), turnAroundRange.getDate(), turnAroundRange.getObservedValue()[0], turnAroundRange.getTheoreticalStandardDeviation()[0], - turnAroundRange.getBaseWeight()[0]); + turnAroundRange.getBaseWeight()[0], + new ObservableSatellite(0)); } @@ -352,11 +338,11 @@ public class TurnAroundRangeAnalytic extends TurnAroundRange { // ------------------------------------------------------------ if (masterGroundStation.getEastOffsetDriver().isSelected() || - masterGroundStation.getNorthOffsetDriver().isSelected() || - masterGroundStation.getZenithOffsetDriver().isSelected()|| - slaveGroundStation.getEastOffsetDriver().isSelected() || - slaveGroundStation.getNorthOffsetDriver().isSelected() || - slaveGroundStation.getZenithOffsetDriver().isSelected()) { + masterGroundStation.getNorthOffsetDriver().isSelected() || + masterGroundStation.getZenithOffsetDriver().isSelected()|| + slaveGroundStation.getEastOffsetDriver().isSelected() || + slaveGroundStation.getNorthOffsetDriver().isSelected() || + slaveGroundStation.getZenithOffsetDriver().isSelected()) { // tMd derivatives / stations // -------------------------- @@ -593,7 +579,7 @@ public class TurnAroundRangeAnalytic extends TurnAroundRange { // transform between master station topocentric frame (east-north-zenith) and inertial frame expressed as DerivativeStructures // The components of master station's position in offset frame are the 3 third derivative parameters final FieldTransform<DerivativeStructure> masterToInert = - masterGroundStation.getOffsetToInertial(state.getFrame(), measurementDateDS, dsFactory, indices); + masterGroundStation.getOffsetToInertial(state.getFrame(), measurementDate, dsFactory, indices); // Master station PV in inertial frame at measurement date final FieldVector3D<DerivativeStructure> QMaster = masterToInert.transformPosition(zero); diff --git a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java index 0614ecf6240301e65cebbf01c2fbe689705d7fc2..8476882c92fd7dbc1387cfc71a2aae75772b5289 100644 --- a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java +++ b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeAnalyticTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -489,9 +489,11 @@ public class TurnAroundRangeAnalyticTest { for (Map.Entry<GroundStation, GroundStation> entry : context.TARstations.entrySet()) { final GroundStation masterStation = entry.getKey(); final GroundStation slaveStation = entry.getValue(); + masterStation.getClockOffsetDriver().setSelected(false); masterStation.getEastOffsetDriver().setSelected(true); masterStation.getNorthOffsetDriver().setSelected(true); masterStation.getZenithOffsetDriver().setSelected(true); + slaveStation.getClockOffsetDriver().setSelected(false); slaveStation.getEastOffsetDriver().setSelected(true); slaveStation.getNorthOffsetDriver().setSelected(true); slaveStation.getZenithOffsetDriver().setSelected(true); @@ -591,7 +593,7 @@ public class TurnAroundRangeAnalyticTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); ref = dMkdP.value(drivers[i]); } else { // Compute a reference value using TurnAroundRange function diff --git a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeMeasurementCreator.java b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeMeasurementCreator.java index cf290c4cd49eed58e4e962876e87a8b80afdc59f..b40192779ab232f70632daf5af8627e9af870851 100644 --- a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeMeasurementCreator.java +++ b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeMeasurementCreator.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +43,7 @@ public class TurnAroundRangeMeasurementCreator extends MeasurementCreator { private final Context context; private final Vector3D antennaPhaseCenter; + private final ObservableSatellite satellite; public TurnAroundRangeMeasurementCreator(final Context context) { this(context, Vector3D.ZERO); @@ -51,12 +52,14 @@ public class TurnAroundRangeMeasurementCreator extends MeasurementCreator { public TurnAroundRangeMeasurementCreator(final Context context, final Vector3D antennaPhaseCenter) { this.context = context; this.antennaPhaseCenter = antennaPhaseCenter; + this.satellite = new ObservableSatellite(0); } public void init(SpacecraftState s0, AbsoluteDate t, double step) { for (Map.Entry<GroundStation, GroundStation> entry : context.TARstations.entrySet()) { for (final GroundStation station : Arrays.asList(entry.getKey(), entry.getValue())) { - for (ParameterDriver driver : Arrays.asList(station.getEastOffsetDriver(), + for (ParameterDriver driver : Arrays.asList(station.getClockOffsetDriver(), + station.getEastOffsetDriver(), station.getNorthOffsetDriver(), station.getZenithOffsetDriver(), station.getPrimeMeridianOffsetDriver(), @@ -97,8 +100,7 @@ public class TurnAroundRangeMeasurementCreator extends MeasurementCreator { * See TurnAroundRange.java for more * Thus the spacecraft date is the date when the 1st leg of the path ends and the 2nd leg begins */ - public void handleStep(final SpacecraftState currentState, final boolean isLast) - { + public void handleStep(final SpacecraftState currentState, final boolean isLast) { try { for (Map.Entry<GroundStation, GroundStation> entry : context.TARstations.entrySet()) { @@ -198,7 +200,7 @@ public class TurnAroundRangeMeasurementCreator extends MeasurementCreator { addMeasurement(new TurnAroundRange(masterStation, slaveStation, masterReceptionDate, 0.5 * (masterUpLinkDistance + slaveDownLinkDistance + - slaveUpLinkDistance + masterDownLinkDistance), 1.0, 10)); + slaveUpLinkDistance + masterDownLinkDistance), 1.0, 10, satellite)); } } diff --git a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java index c84c354699b7cdc32cbbfbc443dbb4f2ee313db3..ba777dd2bc304ec7d2b658b9775d1b01102f3cd7 100644 --- a/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java +++ b/src/test/java/org/orekit/estimation/measurements/TurnAroundRangeTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -169,8 +169,7 @@ public class TurnAroundRangeTest { * Generic test function for values of the TAR * @param printResults Print the results ? */ - void genericTestValues(final boolean printResults) - { + void genericTestValues(final boolean printResults) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); //Context context = EstimationTestUtils.geoStationnaryContext(); @@ -265,8 +264,7 @@ public class TurnAroundRangeTest { void genericTestStateDerivatives(final boolean isModifier, final boolean printResults, final double refErrorsPMedian, final double refErrorsPMean, final double refErrorsPMax, - final double refErrorsVMedian, final double refErrorsVMean, final double refErrorsVMax) - { + final double refErrorsVMedian, final double refErrorsVMean, final double refErrorsVMax) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); //Context context = EstimationTestUtils.geoStationnaryContext(); @@ -292,15 +290,15 @@ public class TurnAroundRangeTest { // Print the results ? Header if (printResults) { System.out.format(Locale.US, "%-15s %-15s %-23s %-23s " + - "%10s %10s %10s " + - "%10s %10s %10s " + - "%10s %10s %10s " + - "%10s %10s %10s%n", - "Master Station", "Slave Station", - "Measurement Date", "State Date", - "ΔdPx", "ΔdPy", "ΔdPz", "ΔdVx", "ΔdVy", "ΔdVz", - "rel ΔdPx", "rel ΔdPy", "rel ΔdPz", - "rel ΔdVx", "rel ΔdVy", "rel ΔdVz"); + "%10s %10s %10s " + + "%10s %10s %10s " + + "%10s %10s %10s " + + "%10s %10s %10s%n", + "Master Station", "Slave Station", + "Measurement Date", "State Date", + "ΔdPx", "ΔdPy", "ΔdPz", "ΔdVx", "ΔdVy", "ΔdVz", + "rel ΔdPx", "rel ΔdPy", "rel ΔdPz", + "rel ΔdVx", "rel ΔdVy", "rel ΔdVz"); } // Loop on the measurements @@ -358,15 +356,15 @@ public class TurnAroundRangeTest { String masterStationName = ((TurnAroundRange) measurement).getMasterStation().getBaseFrame().getName(); String slaveStationName = ((TurnAroundRange) measurement).getSlaveStation().getBaseFrame().getName(); System.out.format(Locale.US, "%-15s %-15s %-23s %-23s " + - "%10.3e %10.3e %10.3e " + - "%10.3e %10.3e %10.3e " + - "%10.3e %10.3e %10.3e " + - "%10.3e %10.3e %10.3e%n", - masterStationName, slaveStationName, measurement.getDate(), date, - dJacobian[0][0], dJacobian[0][1], dJacobian[0][2], - dJacobian[0][3], dJacobian[0][4], dJacobian[0][5], - dJacobianRelative[0][0], dJacobianRelative[0][1], dJacobianRelative[0][2], - dJacobianRelative[0][3], dJacobianRelative[0][4], dJacobianRelative[0][5]); + "%10.3e %10.3e %10.3e " + + "%10.3e %10.3e %10.3e " + + "%10.3e %10.3e %10.3e " + + "%10.3e %10.3e %10.3e%n", + masterStationName, slaveStationName, measurement.getDate(), date, + dJacobian[0][0], dJacobian[0][1], dJacobian[0][2], + dJacobian[0][3], dJacobian[0][4], dJacobian[0][5], + dJacobianRelative[0][0], dJacobianRelative[0][1], dJacobianRelative[0][2], + dJacobianRelative[0][3], dJacobianRelative[0][4], dJacobianRelative[0][5]); } } // End loop on the measurements @@ -399,8 +397,7 @@ public class TurnAroundRangeTest { void genericTestParameterDerivatives(final boolean isModifier, final boolean printResults, final double refErrorQMMedian, final double refErrorQMMean, final double refErrorQMMax, - final double refErrorQSMedian, final double refErrorQSMean, final double refErrorQSMax) - { + final double refErrorQSMedian, final double refErrorQSMean, final double refErrorQSMax) { Context context = EstimationTestUtils.eccentricContext("regular-data:potential:tides"); @@ -412,9 +409,11 @@ public class TurnAroundRangeTest { for (Map.Entry<GroundStation, GroundStation> entry : context.TARstations.entrySet()) { final GroundStation masterStation = entry.getKey(); final GroundStation slaveStation = entry.getValue(); + masterStation.getClockOffsetDriver().setSelected(true); masterStation.getEastOffsetDriver().setSelected(true); masterStation.getNorthOffsetDriver().setSelected(true); masterStation.getZenithOffsetDriver().setSelected(true); + slaveStation.getClockOffsetDriver().setSelected(false); slaveStation.getEastOffsetDriver().setSelected(true); slaveStation.getNorthOffsetDriver().setSelected(true); slaveStation.getZenithOffsetDriver().setSelected(true); @@ -430,18 +429,18 @@ public class TurnAroundRangeTest { // Print results on console ? Header if (printResults) { System.out.format(Locale.US, "%-15s %-15s %-23s %-23s " + - "%10s %10s %10s " + - "%10s %10s %10s " + - "%10s %10s %10s " + - "%10s %10s %10s%n", - "Master Station", "Slave Station", - "Measurement Date", "State Date", - "ΔdQMx", "rel ΔdQMx", - "ΔdQMy", "rel ΔdQMy", - "ΔdQMz", "rel ΔdQMz", - "ΔdQSx", "rel ΔdQSx", - "ΔdQSy", "rel ΔdQSy", - "ΔdQSz", "rel ΔdQSz"); + "%10s %10s %10s " + + "%10s %10s %10s " + + "%10s %10s %10s " + + "%10s %10s %10s%n", + "Master Station", "Slave Station", + "Measurement Date", "State Date", + "ΔdQMx", "rel ΔdQMx", + "ΔdQMy", "rel ΔdQMy", + "ΔdQMz", "rel ΔdQMz", + "ΔdQSx", "rel ΔdQSx", + "ΔdQSy", "rel ΔdQSy", + "ΔdQSz", "rel ΔdQSz"); } // List to store the results for master and slave station @@ -502,7 +501,7 @@ public class TurnAroundRangeTest { public double value(final ParameterDriver parameterDriver) { return measurement.estimate(0, 0, new SpacecraftState[] { state }).getEstimatedValue()[0]; } - }, drivers[i], 3, 20.0); + }, 3, 20.0 * drivers[i].getScale()); final double ref = dMkdP.value(drivers[i]); // Deltas diff --git a/src/test/java/org/orekit/estimation/measurements/generation/AbstractGroundMeasurementBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/AbstractGroundMeasurementBuilderTest.java index 0bafed23b0e80dabcdb65bb5a802385e37ec4d22..54f36d93bc4fc3c485a8171262238d120bab2467 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/AbstractGroundMeasurementBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/AbstractGroundMeasurementBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +27,7 @@ import org.orekit.estimation.Context; import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.Force; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.orbits.OrbitType; import org.orekit.orbits.PositionAngle; @@ -43,7 +44,7 @@ public abstract class AbstractGroundMeasurementBuilderTest<T extends ObservedMea protected abstract MeasurementBuilder<T> getBuilder(RandomGenerator random, GroundStation groundStation, - int propagatorIndex); + ObservableSatellite satellite); private Propagator buildPropagator() { return EstimationTestUtils.createPropagator(context.initialOrbit, propagatorBuilder); @@ -52,10 +53,10 @@ public abstract class AbstractGroundMeasurementBuilderTest<T extends ObservedMea protected void doTest(long seed, double startPeriod, double endPeriod, int expectedMeasurements, double tolerance) { Generator generator = new Generator(); final double step = 60.0; - final int propagatorIndex = generator.addPropagator(buildPropagator()); - generator.addScheduler(new EventBasedScheduler<>(getBuilder(new Well19937a(seed), context.stations.get(0), propagatorIndex), + final ObservableSatellite satellite = generator.addPropagator(buildPropagator()); + generator.addScheduler(new EventBasedScheduler<>(getBuilder(new Well19937a(seed), context.stations.get(0), satellite), new FixedStepSelector(step, TimeScalesFactory.getUTC()), - generator.getPropagator(propagatorIndex), + generator.getPropagator(satellite), new ElevationDetector(context.stations.get(0).getBaseFrame()). withConstantElevation(FastMath.toRadians(5.0)). withHandler(new ContinueOnEvent<>()), diff --git a/src/test/java/org/orekit/estimation/measurements/generation/AngularAzElBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/AngularAzElBuilderTest.java index 9f460291dd5df44028176a9c8a9b53e4f1e6fc38..828dadc864fe6a9108db2227c54b52a56f053b3b 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/AngularAzElBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/AngularAzElBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +25,7 @@ import org.hipparchus.util.FastMath; import org.junit.Test; import org.orekit.estimation.measurements.AngularAzEl; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.modifiers.Bias; public class AngularAzElBuilderTest extends AbstractGroundMeasurementBuilderTest<AngularAzEl> { @@ -34,14 +35,14 @@ public class AngularAzElBuilderTest extends AbstractGroundMeasurementBuilderTest protected MeasurementBuilder<AngularAzEl> getBuilder(final RandomGenerator random, final GroundStation groundStation, - final int propagatorIndex) { + final ObservableSatellite satellite) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA * SIGMA, SIGMA * SIGMA }); MeasurementBuilder<AngularAzEl> ab = new AngularAzElBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, 1.0e-10, new GaussianRandomGenerator(random)), groundStation, new double[] { SIGMA, SIGMA}, new double[] { 1.0, 1.0 }, - propagatorIndex); + satellite); ab.addModifier(new Bias<>(new String[] { "aBias", "eBias" }, new double[] { BIAS, BIAS }, new double[] { 1.0, 1.0 }, diff --git a/src/test/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilderTest.java index 474c15d9822bc1d1fe270b434fb378763df9a60b..c9532d40319210b2e27822e4dfc9504af6022312 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/AngularRaDecBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +25,7 @@ import org.hipparchus.util.FastMath; import org.junit.Test; import org.orekit.estimation.measurements.AngularRaDec; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.modifiers.Bias; import org.orekit.frames.FramesFactory; @@ -35,7 +36,7 @@ public class AngularRaDecBuilderTest extends AbstractGroundMeasurementBuilderTes protected MeasurementBuilder<AngularRaDec> getBuilder(final RandomGenerator random, final GroundStation groundStation, - final int propagatorIndex) { + final ObservableSatellite satellite) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA * SIGMA, SIGMA * SIGMA }); MeasurementBuilder<AngularRaDec> ab = new AngularRaDecBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, @@ -43,7 +44,7 @@ public class AngularRaDecBuilderTest extends AbstractGroundMeasurementBuilderTes new GaussianRandomGenerator(random)), groundStation, FramesFactory.getEME2000(), new double[] { SIGMA, SIGMA}, new double[] { 1.0, 1.0 }, - propagatorIndex); + satellite); ab.addModifier(new Bias<>(new String[] { "aBias", "eBias" }, new double[] { BIAS, BIAS }, new double[] { 1.0, 1.0 }, diff --git a/src/test/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilderTest.java index 5d8bfa96c226472fafdd08c9d06cfbf0c07c01ea..15b6f14702d5cd1b0f14f1bbdb9ffbf9e2600076 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/InterSatellitesRangeBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -32,6 +32,7 @@ import org.orekit.estimation.Context; import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.Force; import org.orekit.estimation.measurements.InterSatellitesRange; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.modifiers.Bias; import org.orekit.orbits.KeplerianOrbit; @@ -54,14 +55,14 @@ public class InterSatellitesRangeBuilderTest { private static final double BIAS = -0.01; private MeasurementBuilder<InterSatellitesRange> getBuilder(final RandomGenerator random, - final int satellite1Index, final int satellite2Index) { + final ObservableSatellite receiver, + final ObservableSatellite remote) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA * SIGMA }); MeasurementBuilder<InterSatellitesRange> isrb = new InterSatellitesRangeBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, 1.0e-10, new GaussianRandomGenerator(random)), - satellite1Index, satellite2Index, - true, SIGMA, 1.0); + receiver, remote, true, SIGMA, 1.0); isrb.addModifier(new Bias<>(new String[] { "bias" }, new double[] { BIAS }, new double[] { 1.0 }, @@ -86,13 +87,13 @@ public class InterSatellitesRangeBuilderTest { private void doTest(long seed, double startPeriod, double endPeriod, double tolerance) { Generator generator = new Generator(); - int satellite1Index = generator.addPropagator(buildPropagator()); + ObservableSatellite receiver = generator.addPropagator(buildPropagator()); final Orbit o1 = context.initialOrbit; // for the second satellite, we simply reverse velocity final Orbit o2 = new KeplerianOrbit(new PVCoordinates(o1.getPVCoordinates().getPosition(), o1.getPVCoordinates().getVelocity().negate()), o1.getFrame(), o1.getDate(), o1.getMu()); - int satellite2Index = generator.addPropagator(new KeplerianPropagator(o2)); + ObservableSatellite remote = generator.addPropagator(new KeplerianPropagator(o2)); final double step = 60.0; // beware that in order to avoid deadlocks, the slave PV coordinates provider @@ -100,9 +101,9 @@ public class InterSatellitesRangeBuilderTest { // added to generator above! The reason is the event detector will be bound // to the first propagator, so it cannot also refer to the second one at the same time // this is the reason why we create a *new* KeplerianPropagator below - generator.addScheduler(new EventBasedScheduler<>(getBuilder(new Well19937a(seed), satellite1Index, satellite2Index), + generator.addScheduler(new EventBasedScheduler<>(getBuilder(new Well19937a(seed), receiver, remote), new FixedStepSelector(step, TimeScalesFactory.getUTC()), - generator.getPropagator(satellite1Index), + generator.getPropagator(receiver), new InterSatDirectViewDetector(context.earth, new KeplerianPropagator(o2)), SignSemantic.FEASIBLE_MEASUREMENT_WHEN_POSITIVE)); diff --git a/src/test/java/org/orekit/estimation/measurements/generation/PVBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/PVBuilderTest.java index a62c9f6f53c0130e505df0abb13a18680463d175..10c3a9155cc654773962d14db0b82636b39cc788 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/PVBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/PVBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +31,7 @@ import org.junit.Test; import org.orekit.estimation.Context; import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.Force; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.PV; import org.orekit.estimation.measurements.modifiers.Bias; @@ -50,7 +51,7 @@ public class PVBuilderTest { private static final double BIAS_P = 5.0; private static final double BIAS_V = -0.003; - private MeasurementBuilder<PV> getBuilder(final RandomGenerator random, final int propagatorIndex) { + private MeasurementBuilder<PV> getBuilder(final RandomGenerator random, final ObservableSatellite satellite) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA_P * SIGMA_P, SIGMA_P * SIGMA_P, SIGMA_P * SIGMA_P, SIGMA_V * SIGMA_V, SIGMA_V * SIGMA_V, SIGMA_V * SIGMA_V, @@ -59,7 +60,7 @@ public class PVBuilderTest { new PVBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, 1.0e-10, new GaussianRandomGenerator(random)), - SIGMA_P, SIGMA_V, 1.0, propagatorIndex); + SIGMA_P, SIGMA_V, 1.0, satellite); pvb.addModifier(new Bias<>(new String[] { "pxBias", "pyBias", "pzBias", "vxBias", "vyBias", "vzBias" }, new double[] { BIAS_P, BIAS_P, BIAS_P, BIAS_V, BIAS_V, BIAS_V }, new double[] { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 }, @@ -90,8 +91,8 @@ public class PVBuilderTest { final double highRateStep = 5.0; final double burstPeriod = 300.0; - final int propagatorIndex = generator.addPropagator(buildPropagator()); - generator.addScheduler(new ContinuousScheduler<>(getBuilder(new Well19937a(seed), propagatorIndex), + final ObservableSatellite satellite = generator.addPropagator(buildPropagator()); + generator.addScheduler(new ContinuousScheduler<>(getBuilder(new Well19937a(seed), satellite), new BurstSelector(maxBurstSize, highRateStep, burstPeriod, TimeScalesFactory.getUTC()))); final double period = context.initialOrbit.getKeplerianPeriod(); diff --git a/src/test/java/org/orekit/estimation/measurements/generation/PositionBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/PositionBuilderTest.java index d22aaea618cf7e3602711abac8550bf1a15a1815..ff808c13102db6f73f75a64e0fb2ec0176aaad72 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/PositionBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/PositionBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +31,7 @@ import org.junit.Test; import org.orekit.estimation.Context; import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.Force; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.Position; import org.orekit.estimation.measurements.modifiers.Bias; @@ -48,7 +49,7 @@ public class PositionBuilderTest { private static final double SIGMA = 10.0; private static final double BIAS = 5.0; - private MeasurementBuilder<Position> getBuilder(final RandomGenerator random, final int propagatorIndex) { + private MeasurementBuilder<Position> getBuilder(final RandomGenerator random, final ObservableSatellite satellite) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA * SIGMA, SIGMA * SIGMA, SIGMA * SIGMA }); @@ -56,7 +57,7 @@ public class PositionBuilderTest { new PositionBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, 1.0e-10, new GaussianRandomGenerator(random)), - SIGMA, 1.0, propagatorIndex); + SIGMA, 1.0, satellite); pb.addModifier(new Bias<>(new String[] { "pxBias", "pyBias", "pzBias" }, new double[] { BIAS, BIAS, BIAS }, new double[] { 1.0, 1.0, 1.0 }, @@ -85,8 +86,8 @@ public class PositionBuilderTest { final double highRateStep = 5.0; final double burstPeriod = 300.0; - final int propagatorIndex = generator.addPropagator(buildPropagator()); - generator.addScheduler(new ContinuousScheduler<>(getBuilder(new Well19937a(seed), propagatorIndex), + final ObservableSatellite satellite = generator.addPropagator(buildPropagator()); + generator.addScheduler(new ContinuousScheduler<>(getBuilder(new Well19937a(seed), satellite), new BurstSelector(maxBurstSize, highRateStep, burstPeriod, TimeScalesFactory.getUTC()))); final double period = context.initialOrbit.getKeplerianPeriod(); diff --git a/src/test/java/org/orekit/estimation/measurements/generation/RangeBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/RangeBuilderTest.java index 146dbf59b87a7a3bb7341c5b4cb153e177f9db71..0ebb54ad976bc2e883b54e763d33e9b75fd84af8 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/RangeBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/RangeBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +23,7 @@ import org.hipparchus.random.GaussianRandomGenerator; import org.hipparchus.random.RandomGenerator; import org.junit.Test; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.Range; import org.orekit.estimation.measurements.modifiers.Bias; @@ -33,13 +34,13 @@ public class RangeBuilderTest extends AbstractGroundMeasurementBuilderTest<Range protected MeasurementBuilder<Range> getBuilder(final RandomGenerator random, final GroundStation groundStation, - final int propagatorIndex) { + final ObservableSatellite satellite) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA * SIGMA }); MeasurementBuilder<Range> rb = new RangeBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, 1.0e-10, new GaussianRandomGenerator(random)), - groundStation, true, SIGMA, 1.0, propagatorIndex); + groundStation, true, SIGMA, 1.0, satellite); rb.addModifier(new Bias<>(new String[] { "bias" }, new double[] { BIAS }, new double[] { 1.0 }, diff --git a/src/test/java/org/orekit/estimation/measurements/generation/RangeRateBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/RangeRateBuilderTest.java index 2bef947027fe14bad0c490d56596e7d8d135bbee..192ced7bf7c4e860d1eeb34176395c3bfe2cc078 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/RangeRateBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/RangeRateBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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,6 +23,7 @@ import org.hipparchus.random.GaussianRandomGenerator; import org.hipparchus.random.RandomGenerator; import org.junit.Test; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.RangeRate; import org.orekit.estimation.measurements.modifiers.Bias; @@ -33,13 +34,13 @@ public class RangeRateBuilderTest extends AbstractGroundMeasurementBuilderTest<R protected MeasurementBuilder<RangeRate> getBuilder(final RandomGenerator random, final GroundStation groundStation, - final int propagatorIndex) { + final ObservableSatellite satellite) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA * SIGMA }); MeasurementBuilder<RangeRate> rrb = new RangeRateBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, 1.0e-10, new GaussianRandomGenerator(random)), - groundStation, true, SIGMA, 1.0, propagatorIndex); + groundStation, true, SIGMA, 1.0, satellite); rrb.addModifier(new Bias<>(new String[] { "bias" }, new double[] { BIAS }, new double[] { 1.0 }, diff --git a/src/test/java/org/orekit/estimation/measurements/generation/TurnAroundRangeBuilderTest.java b/src/test/java/org/orekit/estimation/measurements/generation/TurnAroundRangeBuilderTest.java index ceab7d16c50cb4d85c53a8b56889abea1a30f98e..cd321aea6c1c340bf3cb8a242236ab7ad3de1793 100644 --- a/src/test/java/org/orekit/estimation/measurements/generation/TurnAroundRangeBuilderTest.java +++ b/src/test/java/org/orekit/estimation/measurements/generation/TurnAroundRangeBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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.estimation.Context; import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.Force; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.TurnAroundRange; import org.orekit.estimation.measurements.modifiers.Bias; @@ -55,13 +56,13 @@ public class TurnAroundRangeBuilderTest { private MeasurementBuilder<TurnAroundRange> getBuilder(final RandomGenerator random, final GroundStation master, final GroundStation slave, - final int propagatorIndex) { + final ObservableSatellite satellite) { final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { SIGMA * SIGMA }); MeasurementBuilder<TurnAroundRange> rb = new TurnAroundRangeBuilder(random == null ? null : new CorrelatedRandomVectorGenerator(covariance, 1.0e-10, new GaussianRandomGenerator(random)), - master, slave, SIGMA, 1.0, propagatorIndex); + master, slave, SIGMA, 1.0, satellite); rb.addModifier(new Bias<>(new String[] { "bias" }, new double[] { BIAS }, new double[] { 1.0 }, @@ -90,10 +91,10 @@ public class TurnAroundRangeBuilderTest { final Map.Entry<GroundStation, GroundStation> entry = context.TARstations.entrySet().iterator().next(); final GroundStation master = entry.getKey(); final GroundStation slave = entry.getValue(); - final int propagatorIndex = generator.addPropagator(buildPropagator()); - generator.addScheduler(new EventBasedScheduler<>(getBuilder(new Well19937a(seed), master, slave, propagatorIndex), + final ObservableSatellite satellite = generator.addPropagator(buildPropagator()); + generator.addScheduler(new EventBasedScheduler<>(getBuilder(new Well19937a(seed), master, slave, satellite), new FixedStepSelector(step, TimeScalesFactory.getUTC()), - generator.getPropagator(propagatorIndex), + generator.getPropagator(satellite), BooleanDetector.andCombine(new ElevationDetector(master.getBaseFrame()). withConstantElevation(FastMath.toRadians(5.0)), new ElevationDetector(slave.getBaseFrame()). diff --git a/src/test/java/org/orekit/estimation/measurements/modifiers/BiasTest.java b/src/test/java/org/orekit/estimation/measurements/modifiers/BiasTest.java index 2fc9e6edb6e2e009093c322baaa2ff261c9105a4..b4b4c7b95addbb3f2eb3b0eb610869570e09c68f 100644 --- a/src/test/java/org/orekit/estimation/measurements/modifiers/BiasTest.java +++ b/src/test/java/org/orekit/estimation/measurements/modifiers/BiasTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -94,10 +94,12 @@ public class BiasTest { if (range.getStation() == context.stations.get(i)) { double biasedRange = range.getObservedValue()[0] + realStationsBiases[i]; final Range m = new Range(range.getStation(), + range.isTwoWay(), range.getDate(), biasedRange, range.getTheoreticalStandardDeviation()[0], - range.getBaseWeight()[0]); + range.getBaseWeight()[0], + range.getSatellites().get(0)); m.addModifier((Bias<Range>) stationsRangeBiases[i]); estimator.addMeasurement(m); } diff --git a/src/test/java/org/orekit/estimation/measurements/modifiers/IonoModifierTest.java b/src/test/java/org/orekit/estimation/measurements/modifiers/IonoModifierTest.java index e52dafef1eeaaaf5aaa50c033ff435952cf844ce..68227038543edc26f6d5b3b687747f6826d3e59c 100644 --- a/src/test/java/org/orekit/estimation/measurements/modifiers/IonoModifierTest.java +++ b/src/test/java/org/orekit/estimation/measurements/modifiers/IonoModifierTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -86,6 +86,7 @@ public class IonoModifierTest { // create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -152,9 +153,11 @@ public class IonoModifierTest { for (Map.Entry<GroundStation, GroundStation> entry : context.TARstations.entrySet()) { final GroundStation masterStation = entry.getKey(); final GroundStation slaveStation = entry.getValue(); + masterStation.getClockOffsetDriver().setSelected(true); masterStation.getEastOffsetDriver().setSelected(true); masterStation.getNorthOffsetDriver().setSelected(true); masterStation.getZenithOffsetDriver().setSelected(true); + slaveStation.getClockOffsetDriver().setSelected(false); slaveStation.getEastOffsetDriver().setSelected(true); slaveStation.getNorthOffsetDriver().setSelected(true); slaveStation.getZenithOffsetDriver().setSelected(true); @@ -219,6 +222,7 @@ public class IonoModifierTest { // create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -265,6 +269,7 @@ public class IonoModifierTest { // create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -311,6 +316,7 @@ public class IonoModifierTest { // create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); diff --git a/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifierTest.java b/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifierTest.java index d00a9b2283c523adf6120064bbb9a623356d6ae6..9305b3ae422d7f60f9a66108dda91579051774a6 100644 --- a/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifierTest.java +++ b/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaInterSatellitesRangeModifierTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/OnBoardAntennaRangeModifierTest.java b/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaRangeModifierTest.java index a30630a37d228266ef22b7c04d0f75bee787ec60..269d0f14c40756bebb6803a335621cf6eae7005c 100644 --- a/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaRangeModifierTest.java +++ b/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaRangeModifierTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -57,7 +57,7 @@ public class OnBoardAntennaRangeModifierTest { propagatorBuilder); final List<ObservedMeasurement<?>> spacecraftCenteredMeasurements = EstimationTestUtils.createMeasurements(p1, - new RangeMeasurementCreator(context, Vector3D.ZERO), + new RangeMeasurementCreator(context, Vector3D.ZERO, 0.0), 1.0, 3.0, 300.0); // create perfect range measurements with antenna offset @@ -66,7 +66,7 @@ public class OnBoardAntennaRangeModifierTest { propagatorBuilder); final List<ObservedMeasurement<?>> antennaCenteredMeasurements = EstimationTestUtils.createMeasurements(p2, - new RangeMeasurementCreator(context, new Vector3D(xOffset, 0, 0)), + new RangeMeasurementCreator(context, new Vector3D(xOffset, 0, 0), 0.0), 1.0, 3.0, 300.0); for (int i = 0; i < spacecraftCenteredMeasurements.size(); ++i) { @@ -94,7 +94,7 @@ public class OnBoardAntennaRangeModifierTest { propagatorBuilder); final List<ObservedMeasurement<?>> spacecraftCenteredMeasurements = EstimationTestUtils.createMeasurements(p1, - new RangeMeasurementCreator(context, Vector3D.ZERO), + new RangeMeasurementCreator(context, Vector3D.ZERO, 0.0), 1.0, 3.0, 300.0); // create perfect range measurements with antenna offset @@ -103,7 +103,7 @@ public class OnBoardAntennaRangeModifierTest { propagatorBuilder); final List<ObservedMeasurement<?>> antennaCenteredMeasurements = EstimationTestUtils.createMeasurements(p2, - new RangeMeasurementCreator(context, apc), + new RangeMeasurementCreator(context, apc, 0.0), 1.0, 3.0, 300.0); final Propagator p3 = EstimationTestUtils.createPropagator(context.initialOrbit, diff --git a/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifierTest.java b/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifierTest.java index 07bab5654635a333971606fd13783e573fe3a5f0..2ae28ceda0b193b2122cf071730a9f06ccc3eec9 100644 --- a/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifierTest.java +++ b/src/test/java/org/orekit/estimation/measurements/modifiers/OnBoardAntennaTurnAroundRangeModifierTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/measurements/modifiers/TropoModifierTest.java b/src/test/java/org/orekit/estimation/measurements/modifiers/TropoModifierTest.java index 440d93ac329de51dc1ccf8b99880ecedcd4fc55d..086289dacdf57c51a41dd620c4c9ec7c3f326bdd 100644 --- a/src/test/java/org/orekit/estimation/measurements/modifiers/TropoModifierTest.java +++ b/src/test/java/org/orekit/estimation/measurements/modifiers/TropoModifierTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -80,6 +80,7 @@ public class TropoModifierTest { // create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -176,9 +177,11 @@ public class TropoModifierTest { for (Map.Entry<GroundStation, GroundStation> entry : context.TARstations.entrySet()) { final GroundStation masterStation = entry.getKey(); final GroundStation slaveStation = entry.getValue(); + masterStation.getClockOffsetDriver().setSelected(true); masterStation.getEastOffsetDriver().setSelected(true); masterStation.getNorthOffsetDriver().setSelected(true); masterStation.getZenithOffsetDriver().setSelected(true); + slaveStation.getClockOffsetDriver().setSelected(false); slaveStation.getEastOffsetDriver().setSelected(true); slaveStation.getNorthOffsetDriver().setSelected(true); slaveStation.getZenithOffsetDriver().setSelected(true); @@ -225,6 +228,7 @@ public class TropoModifierTest { // create perfect range measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -321,6 +325,7 @@ public class TropoModifierTest { // create perfect angular measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); @@ -421,6 +426,7 @@ public class TropoModifierTest { // create perfect angular measurements for (final GroundStation station : context.stations) { + station.getClockOffsetDriver().setSelected(true); station.getEastOffsetDriver().setSelected(true); station.getNorthOffsetDriver().setSelected(true); station.getZenithOffsetDriver().setSelected(true); diff --git a/src/test/java/org/orekit/estimation/sequential/KalmanEstimatorTest.java b/src/test/java/org/orekit/estimation/sequential/KalmanEstimatorTest.java index a1979809fae3d40eed038bbf1e96b584c5e5df78..386ded1d8e5f7d613b3c7786efb307a18e9a81c2 100644 --- a/src/test/java/org/orekit/estimation/sequential/KalmanEstimatorTest.java +++ b/src/test/java/org/orekit/estimation/sequential/KalmanEstimatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -251,7 +251,7 @@ public class KalmanEstimatorTest { propagatorBuilder); final List<ObservedMeasurement<?>> measurements = EstimationTestUtils.createMeasurements(propagator, - new RangeMeasurementCreator(context, antennaPhaseCenter), + new RangeMeasurementCreator(context, antennaPhaseCenter, 0.0), 1.0, 3.0, 300.0); // Add antenna offset to the measurements diff --git a/src/test/java/org/orekit/estimation/sequential/KalmanOrbitDeterminationTest.java b/src/test/java/org/orekit/estimation/sequential/KalmanOrbitDeterminationTest.java index 21bff222b619d4545828f1612718916b1294d75c..0a6154dc2de54581f9f986335753b86f6a6e6d43 100644 --- a/src/test/java/org/orekit/estimation/sequential/KalmanOrbitDeterminationTest.java +++ b/src/test/java/org/orekit/estimation/sequential/KalmanOrbitDeterminationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -64,6 +64,7 @@ import org.orekit.errors.OrekitMessages; import org.orekit.estimation.measurements.AngularAzEl; import org.orekit.estimation.measurements.EstimatedMeasurement; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.PV; import org.orekit.estimation.measurements.Range; @@ -647,6 +648,7 @@ public class KalmanOrbitDeterminationTest { final Map<String, StationData> stations = createStationsData(parser, conventions, body); final PVData pvData = createPVData(parser); + final ObservableSatellite satellite = createObservableSatellite(parser); final Bias<Range> satRangeBias = createSatRangeBias(parser); final OnBoardAntennaRangeModifier satAntennaRangeModifier = createSatAntennaRangeModifier(parser); final Weights weights = createWeights(parser); @@ -663,12 +665,13 @@ public class KalmanOrbitDeterminationTest { // the measurements come from a Rinex file measurements.addAll(readRinex(new File(input.getParentFile(), fileName), parser.getString(ParameterKey.SATELLITE_ID_IN_RINEX_FILES), - stations, satRangeBias, satAntennaRangeModifier, weights, + stations, satellite, satRangeBias, satAntennaRangeModifier, weights, rangeOutliersManager, rangeRateOutliersManager)); } else { // the measurements come from an Orekit custom file measurements.addAll(readMeasurements(new File(input.getParentFile(), fileName), - stations, pvData, satRangeBias, satAntennaRangeModifier, weights, + stations, pvData, satellite, + satRangeBias, satAntennaRangeModifier, weights, rangeOutliersManager, rangeRateOutliersManager, azElOutliersManager, @@ -1584,6 +1587,10 @@ public class KalmanOrbitDeterminationTest { final double[] stationLongitudes = parser.getAngleArray(ParameterKey.GROUND_STATION_LONGITUDE); final double[] stationAltitudes = parser.getDoubleArray(ParameterKey.GROUND_STATION_ALTITUDE); final boolean[] stationPositionEstimated = parser.getBooleanArray(ParameterKey.GROUND_STATION_POSITION_ESTIMATED); + final double[] stationClockOffsets = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET); + final double[] stationClockOffsetsMin = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_MIN); + final double[] stationClockOffsetsMax = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_MAX); + final boolean[] stationClockOffsetEstimated = parser.getBooleanArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_ESTIMATED); final double[] stationRangeSigma = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_SIGMA); final double[] stationRangeBias = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_BIAS); final double[] stationRangeBiasMin = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_BIAS_MIN); @@ -1671,6 +1678,11 @@ public class KalmanOrbitDeterminationTest { stationAltitudes[i]); final TopocentricFrame topo = new TopocentricFrame(body, position, stationNames[i]); final GroundStation station = new GroundStation(topo, eopHistory, displacements); + station.getClockOffsetDriver().setReferenceValue(stationClockOffsets[i]); + station.getClockOffsetDriver().setValue(stationClockOffsets[i]); + station.getClockOffsetDriver().setMinValue(stationClockOffsetsMin[i]); + station.getClockOffsetDriver().setMaxValue(stationClockOffsetsMax[i]); + station.getClockOffsetDriver().setSelected(stationClockOffsetEstimated[i]); station.getEastOffsetDriver().setSelected(stationPositionEstimated[i]); station.getNorthOffsetDriver().setSelected(stationPositionEstimated[i]); station.getZenithOffsetDriver().setSelected(stationPositionEstimated[i]); @@ -1905,10 +1917,36 @@ public class KalmanOrbitDeterminationTest { parser.getDouble(ParameterKey.PV_MEASUREMENTS_VELOCITY_SIGMA)); } + /** Set up satellite data. + * @param parser input file parser + * @return satellite data + * @throws NoSuchElementException if input parameters are missing + */ + private ObservableSatellite createObservableSatellite(final KeyValueFileParser<ParameterKey> parser) + throws NoSuchElementException { + ObservableSatellite obsSat = new ObservableSatellite(0); + ParameterDriver clockOffsetDriver = obsSat.getClockOffsetDriver(); + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET)) { + clockOffsetDriver.setReferenceValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET)); + clockOffsetDriver.setValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_MIN)) { + clockOffsetDriver.setMinValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET_MIN)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_MAX)) { + clockOffsetDriver.setMaxValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET_MAX)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_ESTIMATED)) { + clockOffsetDriver.setSelected(parser.getBoolean(ParameterKey.ON_BOARD_CLOCK_OFFSET_ESTIMATED)); + } + return obsSat; + } + /** Read a RINEX measurements file. * @param file measurements file * @param satId satellite we are interested in * @param stations name to stations data map + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param satAntennaRangeModifier modifier for on-board antenna offset * @param weights base weights for measurements @@ -1918,6 +1956,7 @@ public class KalmanOrbitDeterminationTest { */ private List<ObservedMeasurement<?>> readRinex(final File file, final String satId, final Map<String, StationData> stations, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final OnBoardAntennaRangeModifier satAntennaRangeModifier, final Weights weights, @@ -1954,9 +1993,9 @@ public class KalmanOrbitDeterminationTest { throw new OrekitException(LocalizedCoreFormats.SIMPLE_MESSAGE, stationName + " not configured"); } - Range range = new Range(stationData.station, observationDataSet.getDate(), + Range range = new Range(stationData.station, false, observationDataSet.getDate(), od.getValue(), stationData.rangeSigma, - weights.rangeBaseWeight, false); + weights.rangeBaseWeight, satellite); range.addModifier(iono.getRangeModifier(od.getObservationType().getFrequency(system), observationDataSet.getDate())); if (satAntennaRangeModifier != null) { @@ -1983,7 +2022,7 @@ public class KalmanOrbitDeterminationTest { } RangeRate rangeRate = new RangeRate(stationData.station, observationDataSet.getDate(), od.getValue(), stationData.rangeRateSigma, - weights.rangeRateBaseWeight, false); + weights.rangeRateBaseWeight, false, satellite); rangeRate.addModifier(iono.getRangeRateModifier(od.getObservationType().getFrequency(system), observationDataSet.getDate())); if (stationData.rangeRateBias != null) { @@ -2004,6 +2043,7 @@ public class KalmanOrbitDeterminationTest { * @param file measurements file * @param stations name to stations data map * @param pvData PV measurements data + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param satAntennaRangeModifier modifier for on-board antenna offset * @param weights base weights for measurements @@ -2016,6 +2056,7 @@ public class KalmanOrbitDeterminationTest { private List<ObservedMeasurement<?>> readMeasurements(final File file, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final OnBoardAntennaRangeModifier satAntennaRangeModifier, final Weights weights, @@ -2041,7 +2082,7 @@ public class KalmanOrbitDeterminationTest { } switch (fields[1]) { case "RANGE" : - final Range range = new RangeParser().parseFields(fields, stations, pvData, + final Range range = new RangeParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (satAntennaRangeModifier != null) { @@ -2053,7 +2094,7 @@ public class KalmanOrbitDeterminationTest { addIfNonZeroWeight(range, measurements); break; case "RANGE_RATE" : - final RangeRate rangeRate = new RangeRateParser().parseFields(fields, stations, pvData, + final RangeRate rangeRate = new RangeRateParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (rangeOutliersManager != null) { @@ -2062,16 +2103,16 @@ public class KalmanOrbitDeterminationTest { addIfNonZeroWeight(rangeRate, measurements); break; case "AZ_EL" : - final AngularAzEl angular = new AzElParser().parseFields(fields, stations, pvData, - satRangeBias, weights, - line, lineNumber, file.getName()); + final AngularAzEl angular = new AzElParser().parseFields(fields, stations, pvData, satellite, + satRangeBias, weights, + line, lineNumber, file.getName()); if (azElOutliersManager != null) { angular.addModifier(azElOutliersManager); } addIfNonZeroWeight(angular, measurements); break; case "PV" : - final PV pv = new PVParser().parseFields(fields, stations, pvData, + final PV pv = new PVParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (pvOutliersManager != null) { @@ -2237,6 +2278,7 @@ public class KalmanOrbitDeterminationTest { * @param fields measurements line fields * @param stations name to stations data map * @param pvData PV measurements data + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param weight base weights for measurements * @param line complete line @@ -2246,10 +2288,9 @@ public class KalmanOrbitDeterminationTest { */ public abstract T parseFields(String[] fields, Map<String, StationData> stations, - PVData pvData, + PVData pvData, ObservableSatellite satellite, Bias<Range> satRangeBias, Weights weight, - String line, int lineNumber, String fileName) - ; + String line, int lineNumber, String fileName); /** Check the number of fields. * @param expected expected number of fields @@ -2319,19 +2360,20 @@ public class KalmanOrbitDeterminationTest { public Range parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(4, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); - final Range range = new Range(stationData.station, + final Range range = new Range(stationData.station, true, getDate(fields[0], line, lineNumber, fileName), Double.parseDouble(fields[3]) * 1000.0, stationData.rangeSigma, - weights.rangeBaseWeight); + weights.rangeBaseWeight, + satellite); if (stationData.rangeBias != null) { range.addModifier(stationData.rangeBias); } @@ -2352,12 +2394,12 @@ public class KalmanOrbitDeterminationTest { public RangeRate parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(4, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); final RangeRate rangeRate = new RangeRate(stationData.station, @@ -2365,7 +2407,7 @@ public class KalmanOrbitDeterminationTest { Double.parseDouble(fields[3]) * 1000.0, stationData.rangeRateSigma, weights.rangeRateBaseWeight, - true); + true, satellite); if (stationData.rangeRateBias != null) { rangeRate.addModifier(stationData.rangeRateBias); } @@ -2380,12 +2422,12 @@ public class KalmanOrbitDeterminationTest { public AngularAzEl parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(5, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); final AngularAzEl azEl = new AngularAzEl(stationData.station, @@ -2395,7 +2437,8 @@ public class KalmanOrbitDeterminationTest { FastMath.toRadians(Double.parseDouble(fields[4])) }, stationData.azElSigma, - weights.azElBaseWeight); + weights.azElBaseWeight, + satellite); if (stationData.refractionCorrection != null) { azEl.addModifier(stationData.refractionCorrection); } @@ -2413,12 +2456,12 @@ public class KalmanOrbitDeterminationTest { public PV parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { // field 2, which corresponds to stations in other measurements, is ignored // this allows the measurements files to be columns aligned // by inserting something like "----" instead of a station name @@ -2432,7 +2475,8 @@ public class KalmanOrbitDeterminationTest { Double.parseDouble(fields[8]) * 1000.0), pvData.positionSigma, pvData.velocitySigma, - weights.pvBaseWeight); + weights.pvBaseWeight, + satellite); } }; @@ -2843,10 +2887,18 @@ public class KalmanOrbitDeterminationTest { ON_BOARD_ANTENNA_PHASE_CENTER_X, ON_BOARD_ANTENNA_PHASE_CENTER_Y, ON_BOARD_ANTENNA_PHASE_CENTER_Z, + ON_BOARD_CLOCK_OFFSET, + ON_BOARD_CLOCK_OFFSET_MIN, + ON_BOARD_CLOCK_OFFSET_MAX, + ON_BOARD_CLOCK_OFFSET_ESTIMATED, GROUND_STATION_NAME, GROUND_STATION_LATITUDE, GROUND_STATION_LONGITUDE, GROUND_STATION_ALTITUDE, + GROUND_STATION_CLOCK_OFFSET, + GROUND_STATION_CLOCK_OFFSET_MIN, + GROUND_STATION_CLOCK_OFFSET_MAX, + GROUND_STATION_CLOCK_OFFSET_ESTIMATED, GROUND_STATION_POSITION_ESTIMATED, GROUND_STATION_TROPOSPHERIC_MODEL_ESTIMATED, GROUND_STATION_GLOBAL_MAPPING_FUNCTION, diff --git a/src/test/java/org/orekit/estimation/sequential/ModelTest.java b/src/test/java/org/orekit/estimation/sequential/ModelTest.java index 85e1e1deaee637ffc68c85f174329d93c7836574..f213ff14c04647575a96388725dc2a1e6292a150 100644 --- a/src/test/java/org/orekit/estimation/sequential/ModelTest.java +++ b/src/test/java/org/orekit/estimation/sequential/ModelTest.java @@ -17,6 +17,7 @@ import org.orekit.estimation.EstimationTestUtils; import org.orekit.estimation.Force; import org.orekit.estimation.measurements.EstimatedMeasurement; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.PV; import org.orekit.estimation.measurements.Range; @@ -105,18 +106,20 @@ public class ModelTest { // Create propagator builder this.propagatorBuilder = context.createBuilder(orbitType, positionAngle, true, 1.0e-6, 60.0, 10., Force.SOLAR_RADIATION_PRESSURE); + final ObservableSatellite satellite = new ObservableSatellite(0); // Create PV at t0 final AbsoluteDate date0 = context.initialOrbit.getDate(); this.pv = new PV(date0, - context.initialOrbit.getPVCoordinates().getPosition(), - context.initialOrbit.getPVCoordinates().getVelocity(), - new double[] {1., 2., 3., 1e-3, 2e-3, 3e-3}, 1.); + context.initialOrbit.getPVCoordinates().getPosition(), + context.initialOrbit.getPVCoordinates().getVelocity(), + new double[] {1., 2., 3., 1e-3, 2e-3, 3e-3}, 1., + satellite); // Create one 0m range measurement at t0 + 10s final AbsoluteDate date = date0.shiftedBy(10.); final GroundStation station = context.stations.get(0); - this.range = new Range(station, date, 18616150., 10., 1.); + this.range = new Range(station, true, date, 18616150., 10., 1., satellite); // Exact range value is 1.8616150246470984E7 m // Add sat range bias to PV and select it diff --git a/src/test/java/org/orekit/files/ccsds/CCSDSFrameTest.java b/src/test/java/org/orekit/files/ccsds/CCSDSFrameTest.java index 09d59a0ca1ec95cc69ef6c0d631604e2b40bed81..c72168a41ea67cf326066f114d9fa6060887fa5f 100644 --- a/src/test/java/org/orekit/files/ccsds/CCSDSFrameTest.java +++ b/src/test/java/org/orekit/files/ccsds/CCSDSFrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/CenterNameTest.java b/src/test/java/org/orekit/files/ccsds/CenterNameTest.java index b79c1de6a48bbfc919ea9ce1e03361bf42724c87..30198f5624d7a8774b6540d48868f319bdbca829 100644 --- a/src/test/java/org/orekit/files/ccsds/CenterNameTest.java +++ b/src/test/java/org/orekit/files/ccsds/CenterNameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/KeyValueTest.java b/src/test/java/org/orekit/files/ccsds/KeyValueTest.java index 260ce34c87cd551d1e51302a18f6e67ba9632e12..2544227b02f863c0165bb0a9757ad03bc170c190 100644 --- a/src/test/java/org/orekit/files/ccsds/KeyValueTest.java +++ b/src/test/java/org/orekit/files/ccsds/KeyValueTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OEMParserTest.java b/src/test/java/org/orekit/files/ccsds/OEMParserTest.java index fdc8fdac0669a02d176ce5c800b572bc977a9ab5..a1f9b2a834f46d9f9c9b0bf5d00fb4739e190282 100644 --- a/src/test/java/org/orekit/files/ccsds/OEMParserTest.java +++ b/src/test/java/org/orekit/files/ccsds/OEMParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OMMParserTest.java b/src/test/java/org/orekit/files/ccsds/OMMParserTest.java index 5938191587b07973e5ee540fa834ea8f7ccd1493..f7e01272daf19e57891f711d28f3430c36603cac 100644 --- a/src/test/java/org/orekit/files/ccsds/OMMParserTest.java +++ b/src/test/java/org/orekit/files/ccsds/OMMParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/OPMParserTest.java b/src/test/java/org/orekit/files/ccsds/OPMParserTest.java index cb6bba12981019215535f2230c3ce26a2ef88736..95453ad71f9d89ae3eb0664256a2ca5b2f34e231 100644 --- a/src/test/java/org/orekit/files/ccsds/OPMParserTest.java +++ b/src/test/java/org/orekit/files/ccsds/OPMParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/files/ccsds/TDMParserTest.java b/src/test/java/org/orekit/files/ccsds/TDMParserTest.java index b270942235c6d4fa5f6eb7d76f080263bd1a88c1..de1f288a6a087e39d5b7303ca0b2e0889fc27a9a 100644 --- a/src/test/java/org/orekit/files/ccsds/TDMParserTest.java +++ b/src/test/java/org/orekit/files/ccsds/TDMParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/AbstractForceModelTest.java b/src/test/java/org/orekit/forces/AbstractForceModelTest.java index e19e9df6c09bc2cbf09fda2318dd7f3f2a6ea19c..e63884dbf8d2582796d3b81d4561e6d258cca57d 100644 --- a/src/test/java/org/orekit/forces/AbstractForceModelTest.java +++ b/src/test/java/org/orekit/forces/AbstractForceModelTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/AbstractLegacyForceModelTest.java b/src/test/java/org/orekit/forces/AbstractLegacyForceModelTest.java index 74955c8a8049e0ff1767976867c40ef45f45f6ad..118d54fd6c9cc6acaab9861e9bbc90adfaeb1cda 100644 --- a/src/test/java/org/orekit/forces/AbstractLegacyForceModelTest.java +++ b/src/test/java/org/orekit/forces/AbstractLegacyForceModelTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/BoxAndSolarArraySpacecraftTest.java b/src/test/java/org/orekit/forces/BoxAndSolarArraySpacecraftTest.java index b2505929adc8d148af6156a12ab078f2da790f2a..3b61915e140d0e11508a596633990752b17f6837 100644 --- a/src/test/java/org/orekit/forces/BoxAndSolarArraySpacecraftTest.java +++ b/src/test/java/org/orekit/forces/BoxAndSolarArraySpacecraftTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/HarmonicParametricAccelerationTest.java b/src/test/java/org/orekit/forces/HarmonicParametricAccelerationTest.java index 97cb34da0ddbb80863080609ef53a7e3893fdc54..184a5dd19cba32a095ebcbf303257411b720160d 100644 --- a/src/test/java/org/orekit/forces/HarmonicParametricAccelerationTest.java +++ b/src/test/java/org/orekit/forces/HarmonicParametricAccelerationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -44,6 +44,7 @@ import org.orekit.attitudes.LofOffset; import org.orekit.bodies.CelestialBodyFactory; import org.orekit.errors.OrekitException; import org.orekit.estimation.leastsquares.BatchLSEstimator; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.PV; import org.orekit.forces.maneuvers.ConstantThrustManeuver; @@ -386,12 +387,13 @@ public class HarmonicParametricAccelerationTest extends AbstractForceModelTest { propagator0.addForceModel(hpaRefX1); propagator0.addForceModel(hpaRefY1); propagator0.addForceModel(hpaRefZ2); + ObservableSatellite sat0 = new ObservableSatellite(0); final List<ObservedMeasurement<?>> measurements = new ArrayList<>(); propagator0.setMasterMode(10.0, (state, isLast) -> measurements.add(new PV(state.getDate(), state.getPVCoordinates().getPosition(), state.getPVCoordinates().getVelocity(), - 1.0e-3, 1.0e-6, 1.0))); + 1.0e-3, 1.0e-6, 1.0, sat0))); propagator0.propagate(orbit.getDate().shiftedBy(900)); // set up an estimator to retrieve the maneuver as several harmonic accelerations in inertial frame diff --git a/src/test/java/org/orekit/forces/PolynomialParametricAccelerationTest.java b/src/test/java/org/orekit/forces/PolynomialParametricAccelerationTest.java index ed49613dd70603e6407f068f5865d081a2c62ec7..4c340cb780fd4c3a31a53a3a70fcff20e6eb3e93 100644 --- a/src/test/java/org/orekit/forces/PolynomialParametricAccelerationTest.java +++ b/src/test/java/org/orekit/forces/PolynomialParametricAccelerationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/DragForceTest.java b/src/test/java/org/orekit/forces/drag/DragForceTest.java index 574aea294ae040cf3166b502a74503736ff3b514..eebbdc1ccad1fb1ae30b5a721a6b42948df22748 100644 --- a/src/test/java/org/orekit/forces/drag/DragForceTest.java +++ b/src/test/java/org/orekit/forces/drag/DragForceTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/SimpleExponentialAtmosphereTest.java b/src/test/java/org/orekit/forces/drag/SimpleExponentialAtmosphereTest.java index 4bcdd548e0cb2852cfa116dfe71a0343de47b3c5..c77c5fe50f13110c336334d8c1b21a08aed3a128 100644 --- a/src/test/java/org/orekit/forces/drag/SimpleExponentialAtmosphereTest.java +++ b/src/test/java/org/orekit/forces/drag/SimpleExponentialAtmosphereTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/DTM2000Test.java b/src/test/java/org/orekit/forces/drag/atmosphere/DTM2000Test.java index c6ed17be70c42442a1041965772bc4bab2874908..b727d15433e684fc331488484687b9c244d76fae 100644 --- a/src/test/java/org/orekit/forces/drag/atmosphere/DTM2000Test.java +++ b/src/test/java/org/orekit/forces/drag/atmosphere/DTM2000Test.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/HarrisPriesterTest.java b/src/test/java/org/orekit/forces/drag/atmosphere/HarrisPriesterTest.java index 64951c7304d3681e78b3cde00c3518e3e4ebc482..0b663c65909cf6d3c5a21bdf02bd8022bba32ea5 100644 --- a/src/test/java/org/orekit/forces/drag/atmosphere/HarrisPriesterTest.java +++ b/src/test/java/org/orekit/forces/drag/atmosphere/HarrisPriesterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/JB2008Test.java b/src/test/java/org/orekit/forces/drag/atmosphere/JB2008Test.java index e745ab25b523067c7dca2f842086f5bb390cac80..30f80e314d64b0db3ac4a20da9f3da81c13dac01 100644 --- a/src/test/java/org/orekit/forces/drag/atmosphere/JB2008Test.java +++ b/src/test/java/org/orekit/forces/drag/atmosphere/JB2008Test.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/NRLMSISE00Test.java b/src/test/java/org/orekit/forces/drag/atmosphere/NRLMSISE00Test.java index 61fdfc468d00c878909c142f3a4862411ef7fc67..c406c03021c75658c5473971d326106c16555cdd 100644 --- a/src/test/java/org/orekit/forces/drag/atmosphere/NRLMSISE00Test.java +++ b/src/test/java/org/orekit/forces/drag/atmosphere/NRLMSISE00Test.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimationTest.java b/src/test/java/org/orekit/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimationTest.java index a47a6c97a3a74eda9653e222f9ef4333e9904791..de5bcbe2b4aa058a9ef9b33a377e06047767bd36 100644 --- a/src/test/java/org/orekit/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimationTest.java +++ b/src/test/java/org/orekit/forces/drag/atmosphere/data/MarshallSolarActivityFutureEstimationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/AssociatedLegendreFunction.java b/src/test/java/org/orekit/forces/gravity/AssociatedLegendreFunction.java index f21f54a00dc84b8d214750cb237ec4f9ac4c3346..d1d9e118343b15fb32e0a524e408504a96596f33 100644 --- a/src/test/java/org/orekit/forces/gravity/AssociatedLegendreFunction.java +++ b/src/test/java/org/orekit/forces/gravity/AssociatedLegendreFunction.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/HolmesFeatherstoneAttractionModelTest.java b/src/test/java/org/orekit/forces/gravity/HolmesFeatherstoneAttractionModelTest.java index 1081c272ad5c7a5177a8ea6ce8e62f44c6d73d2c..89f0c5e73447495db6d00740c9976c9eadc529b9 100644 --- a/src/test/java/org/orekit/forces/gravity/HolmesFeatherstoneAttractionModelTest.java +++ b/src/test/java/org/orekit/forces/gravity/HolmesFeatherstoneAttractionModelTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/OceanTidesFieldTest.java b/src/test/java/org/orekit/forces/gravity/OceanTidesFieldTest.java index b35b5ed3cdbc67ea6fbefb270ef949407f12cb69..13f023baa767c85e4f163967520284b943eb3793 100644 --- a/src/test/java/org/orekit/forces/gravity/OceanTidesFieldTest.java +++ b/src/test/java/org/orekit/forces/gravity/OceanTidesFieldTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/OceanTidesTest.java b/src/test/java/org/orekit/forces/gravity/OceanTidesTest.java index e03922c9532dc92711b540ec828ffed7f17b9b9f..b68e8e4677fc68f12f8471adc8ebf905458f89d8 100644 --- a/src/test/java/org/orekit/forces/gravity/OceanTidesTest.java +++ b/src/test/java/org/orekit/forces/gravity/OceanTidesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/OceanTidesWaveTest.java b/src/test/java/org/orekit/forces/gravity/OceanTidesWaveTest.java index 03d5c5778ba8598efdae0e442845b6f338681b54..ecc063c78a0a476733058f7361953e30cbc0569c 100644 --- a/src/test/java/org/orekit/forces/gravity/OceanTidesWaveTest.java +++ b/src/test/java/org/orekit/forces/gravity/OceanTidesWaveTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/ReferenceFieldModel.java b/src/test/java/org/orekit/forces/gravity/ReferenceFieldModel.java index 312151e5c2b223295b57ad860772dad5d8dca1e9..18c38a227c1fa379aac81fae54586b3afa2beacc 100644 --- a/src/test/java/org/orekit/forces/gravity/ReferenceFieldModel.java +++ b/src/test/java/org/orekit/forces/gravity/ReferenceFieldModel.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/SolidTidesFieldTest.java b/src/test/java/org/orekit/forces/gravity/SolidTidesFieldTest.java index 834c90819b87f9282012128e3f6c4d438a09ed4f..90e62c61dec83e8a6658b2d83ef0c5981c34b4a2 100644 --- a/src/test/java/org/orekit/forces/gravity/SolidTidesFieldTest.java +++ b/src/test/java/org/orekit/forces/gravity/SolidTidesFieldTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/SolidTidesTest.java b/src/test/java/org/orekit/forces/gravity/SolidTidesTest.java index 1f070c0764a0b8504bf8a7edc9688dde935d6eed..403f75e3b5b6f56fc1b4537fb114bee85440227b 100644 --- a/src/test/java/org/orekit/forces/gravity/SolidTidesTest.java +++ b/src/test/java/org/orekit/forces/gravity/SolidTidesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/ThirdBodyAttractionTest.java b/src/test/java/org/orekit/forces/gravity/ThirdBodyAttractionTest.java index 86afb2ea01e5f8c8b78c93dd8c409ef3e7dffdc9..b2ab7ddba055009a6ba64e95082bfb4eebe3a652 100644 --- a/src/test/java/org/orekit/forces/gravity/ThirdBodyAttractionTest.java +++ b/src/test/java/org/orekit/forces/gravity/ThirdBodyAttractionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/AstronomicalAmplitudeReaderTest.java b/src/test/java/org/orekit/forces/gravity/potential/AstronomicalAmplitudeReaderTest.java index a8094914ea81227971120b270131da4e53a1f34b..5efbd5d5755cff42cd42a8d2435e55478cd2641e 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/AstronomicalAmplitudeReaderTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/AstronomicalAmplitudeReaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/EGMFormatReaderTest.java b/src/test/java/org/orekit/forces/gravity/potential/EGMFormatReaderTest.java index 3e2279d4d973a58a6e0bf6f7a3077f78340642a6..57c115f15f9658b50e93d85622aba4bc55cc8f12 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/EGMFormatReaderTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/EGMFormatReaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/FESCHatEpsilonReaderTest.java b/src/test/java/org/orekit/forces/gravity/potential/FESCHatEpsilonReaderTest.java index 9f19bb129b6cd0540124287dddb90487dd7b894e..c56f9a6a203a0c8d55aac540d57a7fbe1e92f451 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/FESCHatEpsilonReaderTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/FESCHatEpsilonReaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/FESCnmSnmReaderTest.java b/src/test/java/org/orekit/forces/gravity/potential/FESCnmSnmReaderTest.java index 0f9fd4ebd747ba1c828d67dbcd337d1a3338e139..9095098fe18116123b10a475a46c477cee662800 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/FESCnmSnmReaderTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/FESCnmSnmReaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/GRGSFormatReaderTest.java b/src/test/java/org/orekit/forces/gravity/potential/GRGSFormatReaderTest.java index a905d5a4163386e1b99a0fd24d35e1b3597a27a1..2d4ec09e1cf2840dcf19d94b7ed7ac7b0eadad35 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/GRGSFormatReaderTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/GRGSFormatReaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/GravityFieldFactoryTest.java b/src/test/java/org/orekit/forces/gravity/potential/GravityFieldFactoryTest.java index 2886a6af61cf4df5048c79cb1d69eaf3e1a850a3..562f4dcdfffe379365798237897cac506804df87 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/GravityFieldFactoryTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/GravityFieldFactoryTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/ICGEMFormatReaderTest.java b/src/test/java/org/orekit/forces/gravity/potential/ICGEMFormatReaderTest.java index 455ac977e451718ac8b36582bbc2b3ab8b50c813..7de8e09c91d97d457bb129b47b467ac80d3f98c1 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/ICGEMFormatReaderTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/ICGEMFormatReaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/OceanLoadDeformationCoefficientsTest.java b/src/test/java/org/orekit/forces/gravity/potential/OceanLoadDeformationCoefficientsTest.java index b62f58bcfa111b0e3546038c4e443500a9974514..8eb597b5ca6d27094a9be246e04557a36e414d26 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/OceanLoadDeformationCoefficientsTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/OceanLoadDeformationCoefficientsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/gravity/potential/SHMFormatReaderTest.java b/src/test/java/org/orekit/forces/gravity/potential/SHMFormatReaderTest.java index 99360ba3e8cdaa341fce5a86f1017da701776a80..e66bb036db2f12e14b179ecf9b6e703761437f83 100644 --- a/src/test/java/org/orekit/forces/gravity/potential/SHMFormatReaderTest.java +++ b/src/test/java/org/orekit/forces/gravity/potential/SHMFormatReaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/ConstantThrustManeuverInitializationTest.java b/src/test/java/org/orekit/forces/maneuvers/ConstantThrustManeuverInitializationTest.java index 44b1563312369ce92e9aea911e0402bdc5160094..a67e1bb95eb3e599844115f7917dcbd3d2890618 100644 --- a/src/test/java/org/orekit/forces/maneuvers/ConstantThrustManeuverInitializationTest.java +++ b/src/test/java/org/orekit/forces/maneuvers/ConstantThrustManeuverInitializationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/ConstantThrustManeuverTest.java b/src/test/java/org/orekit/forces/maneuvers/ConstantThrustManeuverTest.java index 88724c2765abeb3209bb09cce5d60a1bd0fb0dd4..3cb9be0e296125f3d4bbcb67d0543aa96e423983 100644 --- a/src/test/java/org/orekit/forces/maneuvers/ConstantThrustManeuverTest.java +++ b/src/test/java/org/orekit/forces/maneuvers/ConstantThrustManeuverTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/ImpulseManeuverTest.java b/src/test/java/org/orekit/forces/maneuvers/ImpulseManeuverTest.java index 68a07f294d2d4c46fe5725322c3cbc7d4168f643..3bdb192262b0bea0ecc3b1ca0cca19915d65c34b 100644 --- a/src/test/java/org/orekit/forces/maneuvers/ImpulseManeuverTest.java +++ b/src/test/java/org/orekit/forces/maneuvers/ImpulseManeuverTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/maneuvers/SmallManeuverAnalyticalModelTest.java b/src/test/java/org/orekit/forces/maneuvers/SmallManeuverAnalyticalModelTest.java index dbd50ce31bc6c547e0c4377bf9670ccafdb7ba55..899812e0645f585528e4e83ebacb77f5df43ad3b 100644 --- a/src/test/java/org/orekit/forces/maneuvers/SmallManeuverAnalyticalModelTest.java +++ b/src/test/java/org/orekit/forces/maneuvers/SmallManeuverAnalyticalModelTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/forces/radiation/SolarRadiationPressureTest.java b/src/test/java/org/orekit/forces/radiation/SolarRadiationPressureTest.java index 785d28367135cdf6d34a7aace96be03690761e1d..e3d566f7c59a8ed8db66f74b9df946858c5dfda4 100644 --- a/src/test/java/org/orekit/forces/radiation/SolarRadiationPressureTest.java +++ b/src/test/java/org/orekit/forces/radiation/SolarRadiationPressureTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/BulletinAFilesLoaderTest.java b/src/test/java/org/orekit/frames/BulletinAFilesLoaderTest.java index f7548912c7e9996584385a63be6fea876fd39ccd..0624ef66939f45506d0b5a654153564d39739305 100644 --- a/src/test/java/org/orekit/frames/BulletinAFilesLoaderTest.java +++ b/src/test/java/org/orekit/frames/BulletinAFilesLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/BulletinBFilesLoaderTest.java b/src/test/java/org/orekit/frames/BulletinBFilesLoaderTest.java index d3478fe384edda6036ded3d514574c20c8de1e4f..5851a54a2fb3766a37d380f839779b1abfce3b4e 100644 --- a/src/test/java/org/orekit/frames/BulletinBFilesLoaderTest.java +++ b/src/test/java/org/orekit/frames/BulletinBFilesLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/CIRFProviderTest.java b/src/test/java/org/orekit/frames/CIRFProviderTest.java index f6a740aa445968ec858187d41e4a5e370c4c1bb4..675976b7ec663ce6872f89c01ecf75998a9703f8 100644 --- a/src/test/java/org/orekit/frames/CIRFProviderTest.java +++ b/src/test/java/org/orekit/frames/CIRFProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EME2000ProviderTest.java b/src/test/java/org/orekit/frames/EME2000ProviderTest.java index 88da4583104fb56dd88623713c364c9acbd35229..6639adb23aeb0430792216e532d57690239a4b35 100644 --- a/src/test/java/org/orekit/frames/EME2000ProviderTest.java +++ b/src/test/java/org/orekit/frames/EME2000ProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EOPC04FilesLoaderTest.java b/src/test/java/org/orekit/frames/EOPC04FilesLoaderTest.java index aa3346e8d6f03e08ac0f2defe3a16a14455265e5..983acddf701e8f6f3668e702306517a59db9f255 100644 --- a/src/test/java/org/orekit/frames/EOPC04FilesLoaderTest.java +++ b/src/test/java/org/orekit/frames/EOPC04FilesLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/EOPHistoryTest.java b/src/test/java/org/orekit/frames/EOPHistoryTest.java index 2458d26f34704f2e6a825de7024bd0a5022db6d4..00026c5f1a3f560e12b25b77d7d6c3ef22f980f8 100644 --- a/src/test/java/org/orekit/frames/EOPHistoryTest.java +++ b/src/test/java/org/orekit/frames/EOPHistoryTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FieldTransformTest.java b/src/test/java/org/orekit/frames/FieldTransformTest.java index 9b60961ff4dabd15ca03c24ec27a099b2df7788c..0d60fb5ebe0de3ef6c741d38c52b61576b49228c 100644 --- a/src/test/java/org/orekit/frames/FieldTransformTest.java +++ b/src/test/java/org/orekit/frames/FieldTransformTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FrameTest.java b/src/test/java/org/orekit/frames/FrameTest.java index 4d386eac1b5977032bfab236f6964c74b8d71dd8..008bd2b823853e78d81131f5d2325224c8eb22d8 100644 --- a/src/test/java/org/orekit/frames/FrameTest.java +++ b/src/test/java/org/orekit/frames/FrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/FramesFactoryTest.java b/src/test/java/org/orekit/frames/FramesFactoryTest.java index 3b721941c7c327d7cf98b8d27fb077c42ef8f02c..64872125bfcd9429dedc06a1a700f164e63fc082 100644 --- a/src/test/java/org/orekit/frames/FramesFactoryTest.java +++ b/src/test/java/org/orekit/frames/FramesFactoryTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/GTODProviderTest.java b/src/test/java/org/orekit/frames/GTODProviderTest.java index a3f6305a40ca9cd4ef7941dab6a2d06d578378e8..0367d475dbeafeaa99d64a5a77f05d740d133029 100644 --- a/src/test/java/org/orekit/frames/GTODProviderTest.java +++ b/src/test/java/org/orekit/frames/GTODProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/HelmertTransformationTest.java b/src/test/java/org/orekit/frames/HelmertTransformationTest.java index 60beedb9ff75fb5b574f92645ba9a1a97fdab66a..ae07367bd3f801863f6a99e83c9767f2063b75f7 100644 --- a/src/test/java/org/orekit/frames/HelmertTransformationTest.java +++ b/src/test/java/org/orekit/frames/HelmertTransformationTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ITRFEquinoxProviderTest.java b/src/test/java/org/orekit/frames/ITRFEquinoxProviderTest.java index df28bcee6aea4ddeb20e8d7ae64c1ed4bb6c12ab..39afed44b4abca3edabca6e29591426f0261edfd 100644 --- a/src/test/java/org/orekit/frames/ITRFEquinoxProviderTest.java +++ b/src/test/java/org/orekit/frames/ITRFEquinoxProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ITRFProviderTest.java b/src/test/java/org/orekit/frames/ITRFProviderTest.java index 8349ff1f6e4832a96e7374f6faa947e1d696d18b..2615139f699a374c3e95f7f50cc069f83bed855b 100644 --- a/src/test/java/org/orekit/frames/ITRFProviderTest.java +++ b/src/test/java/org/orekit/frames/ITRFProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ITRFProviderWithoutTidalEffectsTest.java b/src/test/java/org/orekit/frames/ITRFProviderWithoutTidalEffectsTest.java index d9ee87154a7e5b1dfe0dc724a3f4aa6c6bcd7fa6..9a704f6101664edfce71708b8e32701295035eeb 100644 --- a/src/test/java/org/orekit/frames/ITRFProviderWithoutTidalEffectsTest.java +++ b/src/test/java/org/orekit/frames/ITRFProviderWithoutTidalEffectsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ITRFVersionTest.java b/src/test/java/org/orekit/frames/ITRFVersionTest.java index 094d284035dc3102bb04385605c64133a9f4d5e6..1b4250c6167f36be23f11542eeb75add60507e21 100644 --- a/src/test/java/org/orekit/frames/ITRFVersionTest.java +++ b/src/test/java/org/orekit/frames/ITRFVersionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/InterpolatingTransformProviderTest.java b/src/test/java/org/orekit/frames/InterpolatingTransformProviderTest.java index 47666313c6bacda5c13e065b90cc614234fc654d..03da269876e52c349dc43aa0ce081230490538a7 100644 --- a/src/test/java/org/orekit/frames/InterpolatingTransformProviderTest.java +++ b/src/test/java/org/orekit/frames/InterpolatingTransformProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/L1TransformProviderTest.java b/src/test/java/org/orekit/frames/L1TransformProviderTest.java index 23355311734dda08c2b0e508d4ce1d8008327938..23b02839a8bed7f39fb68280adf61aaef15abe5e 100644 --- a/src/test/java/org/orekit/frames/L1TransformProviderTest.java +++ b/src/test/java/org/orekit/frames/L1TransformProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/L2TransformProviderTest.java b/src/test/java/org/orekit/frames/L2TransformProviderTest.java index 223b92e7498de2e8da70af5ab17c404123c065b3..9cf52353869ca37c71f6fe5e0ddd1a0029232823 100644 --- a/src/test/java/org/orekit/frames/L2TransformProviderTest.java +++ b/src/test/java/org/orekit/frames/L2TransformProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/LocalOrbitalFrameTest.java b/src/test/java/org/orekit/frames/LocalOrbitalFrameTest.java index b3ed4f6a9ff8cc5617e3eab3c1e22f288a581ffc..780cc148ca56b2c00d8ac700bff31135dc83f15d 100644 --- a/src/test/java/org/orekit/frames/LocalOrbitalFrameTest.java +++ b/src/test/java/org/orekit/frames/LocalOrbitalFrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/MODProviderTest.java b/src/test/java/org/orekit/frames/MODProviderTest.java index e3ba10e6372f4e30ac90574fdd1e2ab54c5efaf8..cbe4087028814061bb8744a5703f9e0b19211542 100644 --- a/src/test/java/org/orekit/frames/MODProviderTest.java +++ b/src/test/java/org/orekit/frames/MODProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/OrphanFrameTest.java b/src/test/java/org/orekit/frames/OrphanFrameTest.java index 413f7b66c409d847ff1d0e61ad79ecd257d66fdd..d8520c4a3f96121898c58e23b02dbd000fd91e71 100644 --- a/src/test/java/org/orekit/frames/OrphanFrameTest.java +++ b/src/test/java/org/orekit/frames/OrphanFrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/RapidDataAndPredictionColumnsLoaderTest.java b/src/test/java/org/orekit/frames/RapidDataAndPredictionColumnsLoaderTest.java index 74802d02611af065caa83fbf0013de9e0bcd5886..ec472ed7c60b5371fd6c231b33d87883c6ba0da7 100644 --- a/src/test/java/org/orekit/frames/RapidDataAndPredictionColumnsLoaderTest.java +++ b/src/test/java/org/orekit/frames/RapidDataAndPredictionColumnsLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/RapidDataAndPredictionXMLLoaderTest.java b/src/test/java/org/orekit/frames/RapidDataAndPredictionXMLLoaderTest.java index 20d388c631acedc7237bbbb86d090b06c2c7d061..7d70d62f94d581681e454987430a8478a7dc6c62 100644 --- a/src/test/java/org/orekit/frames/RapidDataAndPredictionXMLLoaderTest.java +++ b/src/test/java/org/orekit/frames/RapidDataAndPredictionXMLLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/ShiftingTransformProviderTest.java b/src/test/java/org/orekit/frames/ShiftingTransformProviderTest.java index d3301cddf3fb569c4b8fbf7114d599e2d92dbb59..130386a45c8bd8d0983f260bf72a645091d7b30a 100644 --- a/src/test/java/org/orekit/frames/ShiftingTransformProviderTest.java +++ b/src/test/java/org/orekit/frames/ShiftingTransformProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TEMEProviderTest.java b/src/test/java/org/orekit/frames/TEMEProviderTest.java index 1a86a686a9e30f7e67bc5ad4ca63efc88ef85b82..d13fb21282c2a2d0e9eece1310f7910c66849afc 100644 --- a/src/test/java/org/orekit/frames/TEMEProviderTest.java +++ b/src/test/java/org/orekit/frames/TEMEProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TIRFProviderTest.java b/src/test/java/org/orekit/frames/TIRFProviderTest.java index 9c8e7b256830fb5ff7d2c6168958b0bf0c5dea56..efb6eeb3d606060aef9d1b733776fb1ddc4618d3 100644 --- a/src/test/java/org/orekit/frames/TIRFProviderTest.java +++ b/src/test/java/org/orekit/frames/TIRFProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TODProviderTest.java b/src/test/java/org/orekit/frames/TODProviderTest.java index 595cfd1abe5ed98ed00419cb6e808cebeea47826..b6fe86dba4a374d39b8151ad1b4280a6ff718081 100644 --- a/src/test/java/org/orekit/frames/TODProviderTest.java +++ b/src/test/java/org/orekit/frames/TODProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TopocentricFrameTest.java b/src/test/java/org/orekit/frames/TopocentricFrameTest.java index c071549ac43cce288d550e425eacb17b1564fc36..741d26435a2ea15c51c2aa789e97cdbb05e5f9bb 100644 --- a/src/test/java/org/orekit/frames/TopocentricFrameTest.java +++ b/src/test/java/org/orekit/frames/TopocentricFrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TransformProviderUtilTest.java b/src/test/java/org/orekit/frames/TransformProviderUtilTest.java index 1869ca7201095beb5e959c88cb574392b0b57164..5629839ed9e1c1d7b35c88d021d5ce72e07b21f6 100644 --- a/src/test/java/org/orekit/frames/TransformProviderUtilTest.java +++ b/src/test/java/org/orekit/frames/TransformProviderUtilTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/TransformTest.java b/src/test/java/org/orekit/frames/TransformTest.java index 4210337374432a944765769971dc7df262367e76..1966e923fc4fb75c83c9240ea677087d8b8e0457 100644 --- a/src/test/java/org/orekit/frames/TransformTest.java +++ b/src/test/java/org/orekit/frames/TransformTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/UpdatableFrameTest.java b/src/test/java/org/orekit/frames/UpdatableFrameTest.java index 757ef40c1cde78e1ac4742300beff61153914bd1..561b882aafd93680983ff07431d8268d25e1e3e7 100644 --- a/src/test/java/org/orekit/frames/UpdatableFrameTest.java +++ b/src/test/java/org/orekit/frames/UpdatableFrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/VEISFrameTest.java b/src/test/java/org/orekit/frames/VEISFrameTest.java index dc5f967abb76b4432a4fd5d56f38b599cdbc7fc0..a1879b89b0ad227706a3b3d4f615cf2c9d9f28f5 100644 --- a/src/test/java/org/orekit/frames/VEISFrameTest.java +++ b/src/test/java/org/orekit/frames/VEISFrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/VersionedITRFFrameTest.java b/src/test/java/org/orekit/frames/VersionedITRFFrameTest.java index 8327274d3b71a83e5cfe77777f3e3fdb9d77531f..dbdca78127e7e0bbe4344b2130ee0a3e81d48dfd 100644 --- a/src/test/java/org/orekit/frames/VersionedITRFFrameTest.java +++ b/src/test/java/org/orekit/frames/VersionedITRFFrameTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/DOPComputerTest.java b/src/test/java/org/orekit/gnss/DOPComputerTest.java index 215cca73a71e9854efeab88dfcd4d26a25881c4b..75b5851bf624e1a4f79717a1fd2063db6b106665 100644 --- a/src/test/java/org/orekit/gnss/DOPComputerTest.java +++ b/src/test/java/org/orekit/gnss/DOPComputerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/RinexFrequencyTest.java b/src/test/java/org/orekit/gnss/RinexFrequencyTest.java index 4e2159052f2d3b0dfab6b733123403bcdb15bc96..e82eddb9fadeb6f317d0aac454e5d5ca955f8d9e 100644 --- a/src/test/java/org/orekit/gnss/RinexFrequencyTest.java +++ b/src/test/java/org/orekit/gnss/RinexFrequencyTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/RinexLoaderTest.java b/src/test/java/org/orekit/gnss/RinexLoaderTest.java index 23112cf0b24f469e56682a9dcbeb14254be4928d..38b1ac733ae24e8994d82ab6e4ce5548924830a3 100644 --- a/src/test/java/org/orekit/gnss/RinexLoaderTest.java +++ b/src/test/java/org/orekit/gnss/RinexLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/SEMParserTest.java b/src/test/java/org/orekit/gnss/SEMParserTest.java index d8bc2b8ff0f4590c8e73dd920d8f6eab6edb76ef..d30c23fe4ed3b2e9beecf7e5712668fd40d4bc78 100644 --- a/src/test/java/org/orekit/gnss/SEMParserTest.java +++ b/src/test/java/org/orekit/gnss/SEMParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/YUMAParserTest.java b/src/test/java/org/orekit/gnss/YUMAParserTest.java index bd5875307fee2b60133b0dc3a61056645e6fa1b8..de9ba017ed1623c385d6d3cf679ca930478586d3 100644 --- a/src/test/java/org/orekit/gnss/YUMAParserTest.java +++ b/src/test/java/org/orekit/gnss/YUMAParserTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/antenna/AntexLoaderTest.java b/src/test/java/org/orekit/gnss/antenna/AntexLoaderTest.java index 6c98031caaf425301e966fd1745cb5ef98a80118..a425ce03e5fe779cf22e99bd0a508cc0110d5e49 100644 --- a/src/test/java/org/orekit/gnss/antenna/AntexLoaderTest.java +++ b/src/test/java/org/orekit/gnss/antenna/AntexLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/AbstractGNSSAttitudeProviderTest.java b/src/test/java/org/orekit/gnss/attitude/AbstractGNSSAttitudeProviderTest.java index fe213ec4a2f5d3b2448f8c7f533c01236f7d1421..28c014886c66269db68b814f9dcb4b28e2be5897 100644 --- a/src/test/java/org/orekit/gnss/attitude/AbstractGNSSAttitudeProviderTest.java +++ b/src/test/java/org/orekit/gnss/attitude/AbstractGNSSAttitudeProviderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/BeidouGeoTest.java b/src/test/java/org/orekit/gnss/attitude/BeidouGeoTest.java index 60f162bad73b3601fb8613b829069d6c01badf02..bc9f49dc4881c4e105be0ab2db19903d01dc76a1 100644 --- a/src/test/java/org/orekit/gnss/attitude/BeidouGeoTest.java +++ b/src/test/java/org/orekit/gnss/attitude/BeidouGeoTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/BeidouIGSOTest.java b/src/test/java/org/orekit/gnss/attitude/BeidouIGSOTest.java index 44013ff7ddd06873c6be44ebe26c9bf72c3f0e8c..7d857ee669e2f65a675eef654fdeccb65505acc5 100644 --- a/src/test/java/org/orekit/gnss/attitude/BeidouIGSOTest.java +++ b/src/test/java/org/orekit/gnss/attitude/BeidouIGSOTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/BeidouMeoTest.java b/src/test/java/org/orekit/gnss/attitude/BeidouMeoTest.java index acd8351abebf1808140387963856108e1baae7d0..f9786586f683fb0b5d57d5a5b738627aa0c57f85 100644 --- a/src/test/java/org/orekit/gnss/attitude/BeidouMeoTest.java +++ b/src/test/java/org/orekit/gnss/attitude/BeidouMeoTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GPSBlockIIATest.java b/src/test/java/org/orekit/gnss/attitude/GPSBlockIIATest.java index 3e641d7dbf1917b9b51e600394f8840f1eb5a0b7..2e0eb627d1a2242dcb8b53e0a7ac6fa1893c00ff 100644 --- a/src/test/java/org/orekit/gnss/attitude/GPSBlockIIATest.java +++ b/src/test/java/org/orekit/gnss/attitude/GPSBlockIIATest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GPSBlockIIFTest.java b/src/test/java/org/orekit/gnss/attitude/GPSBlockIIFTest.java index 48ffa1e78843e3a713888bc8fa40bcbea798453d..dda71cf7f1c7f7a97d2e6a95dc7c5db283ef48f1 100644 --- a/src/test/java/org/orekit/gnss/attitude/GPSBlockIIFTest.java +++ b/src/test/java/org/orekit/gnss/attitude/GPSBlockIIFTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GPSBlockIIRTest.java b/src/test/java/org/orekit/gnss/attitude/GPSBlockIIRTest.java index d7b33daaafe180ee21a2f06e1e8158719b2eae56..e4d23a50eb9809bf559d0c13e29b2890e7f70762 100644 --- a/src/test/java/org/orekit/gnss/attitude/GPSBlockIIRTest.java +++ b/src/test/java/org/orekit/gnss/attitude/GPSBlockIIRTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GalileoTest.java b/src/test/java/org/orekit/gnss/attitude/GalileoTest.java index 6b18af3920ed9f1dd8560ca4e1b5015e797175c7..91a7546ed882f8409f420c428701d6d946c2887c 100644 --- a/src/test/java/org/orekit/gnss/attitude/GalileoTest.java +++ b/src/test/java/org/orekit/gnss/attitude/GalileoTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GenericGNSSTest.java b/src/test/java/org/orekit/gnss/attitude/GenericGNSSTest.java index 5e6fccbb4c0941ad46fe04af3d0767acf93f370a..b0d8c3d3d0a292f854bcf0ae34979c90b1326772 100644 --- a/src/test/java/org/orekit/gnss/attitude/GenericGNSSTest.java +++ b/src/test/java/org/orekit/gnss/attitude/GenericGNSSTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/attitude/GlonassTest.java b/src/test/java/org/orekit/gnss/attitude/GlonassTest.java index fed8b99b92043a4a5b8010b75327ed3d8be0c6cb..0034787196978b877a2b5f6f85a71d6865f9d7e6 100644 --- a/src/test/java/org/orekit/gnss/attitude/GlonassTest.java +++ b/src/test/java/org/orekit/gnss/attitude/GlonassTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/EarthStandardAtmosphereTest.java b/src/test/java/org/orekit/models/earth/EarthStandardAtmosphereTest.java index e88952aade357629bb5cd59a92c0224c8dc3625c..4fa53f16fecf5ffa605e29a99c63a386e6b7f912 100644 --- a/src/test/java/org/orekit/models/earth/EarthStandardAtmosphereTest.java +++ b/src/test/java/org/orekit/models/earth/EarthStandardAtmosphereTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/KlobucharIonoCoefficientsLoaderTest.java b/src/test/java/org/orekit/models/earth/KlobucharIonoCoefficientsLoaderTest.java index 79805163c1fd80e69c05a5e082e384819379cb75..95e2b28e8dc30190eeb4c32bedf735bded5d1cd0 100644 --- a/src/test/java/org/orekit/models/earth/KlobucharIonoCoefficientsLoaderTest.java +++ b/src/test/java/org/orekit/models/earth/KlobucharIonoCoefficientsLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/KlobucharModelTest.java b/src/test/java/org/orekit/models/earth/KlobucharModelTest.java index 372a70536f1b5e408d731425043674fb434bc46e..9331c8b722ec238b6a4aacd9777f020d3ec05ba9 100644 --- a/src/test/java/org/orekit/models/earth/KlobucharModelTest.java +++ b/src/test/java/org/orekit/models/earth/KlobucharModelTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/AlongTrackAimingTest.java b/src/test/java/org/orekit/models/earth/tessellation/AlongTrackAimingTest.java index 326e9ab0d7f08bb9b5a50b616c111c22a2930e02..6587a7876771b5ca569da42d9ea389d25e28d511 100644 --- a/src/test/java/org/orekit/models/earth/tessellation/AlongTrackAimingTest.java +++ b/src/test/java/org/orekit/models/earth/tessellation/AlongTrackAimingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/EllipsoidTessellatorTest.java b/src/test/java/org/orekit/models/earth/tessellation/EllipsoidTessellatorTest.java index 11de2678627a59b1fb73a3c0127bcaf61aa74904..06dde41965a0265d5b2b73dd07a76b361dc28c52 100644 --- a/src/test/java/org/orekit/models/earth/tessellation/EllipsoidTessellatorTest.java +++ b/src/test/java/org/orekit/models/earth/tessellation/EllipsoidTessellatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/models/earth/tessellation/TileTest.java b/src/test/java/org/orekit/models/earth/tessellation/TileTest.java index f3c376e435d8c6ba09918e7b79f48f8f478a49e3..0abed665322a3f6969c7d6d706eff0c7b5ae530c 100644 --- a/src/test/java/org/orekit/models/earth/tessellation/TileTest.java +++ b/src/test/java/org/orekit/models/earth/tessellation/TileTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/CartesianOrbitTest.java b/src/test/java/org/orekit/orbits/CartesianOrbitTest.java index 2532e9bf8139db17c42e234333541291e702d92a..0f641b0cf08ae8b4e1d56b020938dc7868cdf748 100644 --- a/src/test/java/org/orekit/orbits/CartesianOrbitTest.java +++ b/src/test/java/org/orekit/orbits/CartesianOrbitTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/CircularOrbitTest.java b/src/test/java/org/orekit/orbits/CircularOrbitTest.java index 11805fbb50a35d61b8a22509877183087a8f03c8..aa1c7dc73e53cecf500293346c723e35c8ed7dbe 100644 --- a/src/test/java/org/orekit/orbits/CircularOrbitTest.java +++ b/src/test/java/org/orekit/orbits/CircularOrbitTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/EquinoctialOrbitTest.java b/src/test/java/org/orekit/orbits/EquinoctialOrbitTest.java index 43bf53d9ab6331e3294c2ec5221344f20b85cea3..26c2440dd9047ae412a0eeaa0608c5d5b5fe8ab7 100644 --- a/src/test/java/org/orekit/orbits/EquinoctialOrbitTest.java +++ b/src/test/java/org/orekit/orbits/EquinoctialOrbitTest.java @@ -1,4 +1,4 @@ - /* Copyright 2002-2018 CS Systèmes d'Information + /* Copyright 2002-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/orbits/FieldCartesianOrbitTest.java b/src/test/java/org/orekit/orbits/FieldCartesianOrbitTest.java index 51b0c79d602fc15a7a7109e834d980e4a55bde63..fe00a8275aa81d13677d85550c4bbf6cc66832e5 100644 --- a/src/test/java/org/orekit/orbits/FieldCartesianOrbitTest.java +++ b/src/test/java/org/orekit/orbits/FieldCartesianOrbitTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldCircularOrbitTest.java b/src/test/java/org/orekit/orbits/FieldCircularOrbitTest.java index 735460b4e2d4291b08ca38064430242501b95e02..89a19f38287d497dbad7372ec5d06b0008d7c7be 100644 --- a/src/test/java/org/orekit/orbits/FieldCircularOrbitTest.java +++ b/src/test/java/org/orekit/orbits/FieldCircularOrbitTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldEquinoctialOrbitTest.java b/src/test/java/org/orekit/orbits/FieldEquinoctialOrbitTest.java index 6474dd7801487b22c63f1ed2a51d8522ca8b1f66..89734699102f07fda889df43c00f3eda37b76f49 100644 --- a/src/test/java/org/orekit/orbits/FieldEquinoctialOrbitTest.java +++ b/src/test/java/org/orekit/orbits/FieldEquinoctialOrbitTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/FieldKeplerianOrbitTest.java b/src/test/java/org/orekit/orbits/FieldKeplerianOrbitTest.java index 6dcc066c6227ef9efdee4504658efadeda583a4b..a5eb41a526c744219ceb09c4d022783ffdc3e364 100644 --- a/src/test/java/org/orekit/orbits/FieldKeplerianOrbitTest.java +++ b/src/test/java/org/orekit/orbits/FieldKeplerianOrbitTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/orbits/KeplerianOrbitTest.java b/src/test/java/org/orekit/orbits/KeplerianOrbitTest.java index e1aed99b0eaadaefae558b6558074ae1780ab4e4..5292f277a1b0459bf150dfc784f4a5399292985c 100644 --- a/src/test/java/org/orekit/orbits/KeplerianOrbitTest.java +++ b/src/test/java/org/orekit/orbits/KeplerianOrbitTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/FieldSpacecraftStateTest.java b/src/test/java/org/orekit/propagation/FieldSpacecraftStateTest.java index 2c0cbcd0cf108bb489314ac242e16b3621ba52c1..4314c7567a47f04df27cd9488cf9b89a370fde92 100644 --- a/src/test/java/org/orekit/propagation/FieldSpacecraftStateTest.java +++ b/src/test/java/org/orekit/propagation/FieldSpacecraftStateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/PropagatorsParallelizerTest.java b/src/test/java/org/orekit/propagation/PropagatorsParallelizerTest.java index 37e844dd2b4d3d59f8187e8ffe5d30a4d9c1da9d..8b844a803e4595a193fdf6cd9c78699a8834a25a 100644 --- a/src/test/java/org/orekit/propagation/PropagatorsParallelizerTest.java +++ b/src/test/java/org/orekit/propagation/PropagatorsParallelizerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/SpacecraftStateTest.java b/src/test/java/org/orekit/propagation/SpacecraftStateTest.java index 79959a8a54aeb09c72d3f4aafa6d79e2d5d9a713..1aacb72a0b9f2fbf136700aed099577b57ec4085 100644 --- a/src/test/java/org/orekit/propagation/SpacecraftStateTest.java +++ b/src/test/java/org/orekit/propagation/SpacecraftStateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/AdapterPropagatorTest.java b/src/test/java/org/orekit/propagation/analytical/AdapterPropagatorTest.java index 85f3ef94f2965d2435faf611287213be662fed82..b5309a9c3aa32b9550ee32dc391d5d9a880c98d9 100644 --- a/src/test/java/org/orekit/propagation/analytical/AdapterPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/analytical/AdapterPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/EcksteinHechlerPropagatorTest.java b/src/test/java/org/orekit/propagation/analytical/EcksteinHechlerPropagatorTest.java index 2cf7d86169d250b6ff0d860da4d31cb47af91f52..de2e43a54a2548a9583f29244b2f2250627f3238 100644 --- a/src/test/java/org/orekit/propagation/analytical/EcksteinHechlerPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/analytical/EcksteinHechlerPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/EphemerisEventsTest.java b/src/test/java/org/orekit/propagation/analytical/EphemerisEventsTest.java index 2a461fba7e60b62a566058bef9649f3dc3a7b4f3..e010252c1817c2ad4185326e329f82e063a845ca 100644 --- a/src/test/java/org/orekit/propagation/analytical/EphemerisEventsTest.java +++ b/src/test/java/org/orekit/propagation/analytical/EphemerisEventsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/EphemerisTest.java b/src/test/java/org/orekit/propagation/analytical/EphemerisTest.java index c9ab3349a201fe2f43098aa7c5a552d37fe04da5..60038694cc6c8e9812542c0c81486fdbfe2e2fef 100644 --- a/src/test/java/org/orekit/propagation/analytical/EphemerisTest.java +++ b/src/test/java/org/orekit/propagation/analytical/EphemerisTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/FieldEcksteinHechlerPropagatorTest.java b/src/test/java/org/orekit/propagation/analytical/FieldEcksteinHechlerPropagatorTest.java index f94b0e78aba6bc2b8a4a5cac6d40ac3fc475712a..8d5e262b58038544e5695e0876a9fcd75423d2a9 100644 --- a/src/test/java/org/orekit/propagation/analytical/FieldEcksteinHechlerPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/analytical/FieldEcksteinHechlerPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/FieldKeplerianPropagatorTest.java b/src/test/java/org/orekit/propagation/analytical/FieldKeplerianPropagatorTest.java index ded25fbfc6372a571e1b779eafd4ae4704d0b35f..bbc8d864afee6e2a21c00cb0ef7f8e8b1965403f 100644 --- a/src/test/java/org/orekit/propagation/analytical/FieldKeplerianPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/analytical/FieldKeplerianPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/KeplerianPropagatorTest.java b/src/test/java/org/orekit/propagation/analytical/KeplerianPropagatorTest.java index d1e2c87527a54d8a7bd31cb3bfcca24c5345a5b1..c7fc273a70e1d3ec1ea44bfb745b8d895d552830 100644 --- a/src/test/java/org/orekit/propagation/analytical/KeplerianPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/analytical/KeplerianPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/TabulatedEphemerisTest.java b/src/test/java/org/orekit/propagation/analytical/TabulatedEphemerisTest.java index e5f3e445d9c17dc7963cbb3fe30d3fd9c5017e39..2c69feb02e4f12ffdee2f85f39ffe043641931b9 100644 --- a/src/test/java/org/orekit/propagation/analytical/TabulatedEphemerisTest.java +++ b/src/test/java/org/orekit/propagation/analytical/TabulatedEphemerisTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/gnss/GPSPropagatorTest.java b/src/test/java/org/orekit/propagation/analytical/gnss/GPSPropagatorTest.java index 32847c029cd738e64b6efbea6ac2e03bec09013c..626fe9af14e2683a9e8bbba8b326450d46117573 100644 --- a/src/test/java/org/orekit/propagation/analytical/gnss/GPSPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/analytical/gnss/GPSPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/TLEPropagatorTest.java b/src/test/java/org/orekit/propagation/analytical/tle/TLEPropagatorTest.java index 33866bf9df42a7b9e8b96d5856964c29421a8a7c..05720584157cdde2bfc712b5419d14a7be002c5e 100644 --- a/src/test/java/org/orekit/propagation/analytical/tle/TLEPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/analytical/tle/TLEPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/TLESeriesTest.java b/src/test/java/org/orekit/propagation/analytical/tle/TLESeriesTest.java index a4d4860a7a28f48d65da73d09f0e1dc2f5d1c009..7502c0014ee43c19a278425713ca6088dfb5628a 100644 --- a/src/test/java/org/orekit/propagation/analytical/tle/TLESeriesTest.java +++ b/src/test/java/org/orekit/propagation/analytical/tle/TLESeriesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/analytical/tle/TLETest.java b/src/test/java/org/orekit/propagation/analytical/tle/TLETest.java index f2e5ace722c172402d45cad7f019be0eab552270..4059bca5f9663cd705e7bd902d7cc4b1b7e7363f 100644 --- a/src/test/java/org/orekit/propagation/analytical/tle/TLETest.java +++ b/src/test/java/org/orekit/propagation/analytical/tle/TLETest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/AbstractPropagatorBuilderTest.java b/src/test/java/org/orekit/propagation/conversion/AbstractPropagatorBuilderTest.java index cbe462434bab4e777bacd5209b3f324f65d47e81..3db7182dcca05ced4768720c5eb135fb0e2071a8 100644 --- a/src/test/java/org/orekit/propagation/conversion/AbstractPropagatorBuilderTest.java +++ b/src/test/java/org/orekit/propagation/conversion/AbstractPropagatorBuilderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/EcksteinHechlerConverterTest.java b/src/test/java/org/orekit/propagation/conversion/EcksteinHechlerConverterTest.java index 89330e411a51b1c8f2aa18b487e55a56d98f709c..0cd72e7f97f81762343a155dd02e779684dad87e 100644 --- a/src/test/java/org/orekit/propagation/conversion/EcksteinHechlerConverterTest.java +++ b/src/test/java/org/orekit/propagation/conversion/EcksteinHechlerConverterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/JacobianPropagatorConverterTest.java b/src/test/java/org/orekit/propagation/conversion/JacobianPropagatorConverterTest.java index 97af87dfc05b35d923e7c5b3cb15f807891de5e0..529390237142e7277c08c308b93aef5aeac731f9 100644 --- a/src/test/java/org/orekit/propagation/conversion/JacobianPropagatorConverterTest.java +++ b/src/test/java/org/orekit/propagation/conversion/JacobianPropagatorConverterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/KeplerianConverterTest.java b/src/test/java/org/orekit/propagation/conversion/KeplerianConverterTest.java index b786b1205dff83a269e2eea378a32fa43414d42a..cb1a99ff6a32b6a0e30efb57b0ded12790cc0fdf 100644 --- a/src/test/java/org/orekit/propagation/conversion/KeplerianConverterTest.java +++ b/src/test/java/org/orekit/propagation/conversion/KeplerianConverterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/NumericalConverterTest.java b/src/test/java/org/orekit/propagation/conversion/NumericalConverterTest.java index 629eff5e9013655ad3aa3cb0c79bf5a9d7d6d24f..1d1e55436ec039199565904e5b2f1c23acec6510 100644 --- a/src/test/java/org/orekit/propagation/conversion/NumericalConverterTest.java +++ b/src/test/java/org/orekit/propagation/conversion/NumericalConverterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/OsculatingToMeanElementsConverterTest.java b/src/test/java/org/orekit/propagation/conversion/OsculatingToMeanElementsConverterTest.java index 538f3049133af40a4c1ad40b00834c63058056f1..978fc9915367ad144f63737a0e41c699f2ba5c1c 100644 --- a/src/test/java/org/orekit/propagation/conversion/OsculatingToMeanElementsConverterTest.java +++ b/src/test/java/org/orekit/propagation/conversion/OsculatingToMeanElementsConverterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/conversion/TLEConverterTest.java b/src/test/java/org/orekit/propagation/conversion/TLEConverterTest.java index 7b2aba603d2aab8d3e7ce48edf4210c25891a891..e25570e56a77def68943f5cd67a63987184d0494 100644 --- a/src/test/java/org/orekit/propagation/conversion/TLEConverterTest.java +++ b/src/test/java/org/orekit/propagation/conversion/TLEConverterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AdapterDetectorTest.java b/src/test/java/org/orekit/propagation/events/AdapterDetectorTest.java index 57bd880f6631459491417ba449f8d8baaf4b7df9..25649c2b4d94427032b9b99e8fa3f690218ce2e1 100644 --- a/src/test/java/org/orekit/propagation/events/AdapterDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/AdapterDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AlignmentDetectorTest.java b/src/test/java/org/orekit/propagation/events/AlignmentDetectorTest.java index 65c44c8a97463336a56e1f000fd28b3494b667e4..9d00ac7e1b1db4c70429d49518b7b135ebf4db3f 100644 --- a/src/test/java/org/orekit/propagation/events/AlignmentDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/AlignmentDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AltitudeDetectorTest.java b/src/test/java/org/orekit/propagation/events/AltitudeDetectorTest.java index ec629bab10a248b3ce00c33c353e6928b44f47c7..94b0e1e7c8d5fc8690b9dd33777a13c30677f019 100644 --- a/src/test/java/org/orekit/propagation/events/AltitudeDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/AltitudeDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/AngularSeparationDetectorTest.java b/src/test/java/org/orekit/propagation/events/AngularSeparationDetectorTest.java index d4d140e9765d34c41b1e3fbec3a9690159bef82d..06480be6cea13664ab1c3667e38998264a6bdbcd 100644 --- a/src/test/java/org/orekit/propagation/events/AngularSeparationDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/AngularSeparationDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/ApsideDetectorTest.java b/src/test/java/org/orekit/propagation/events/ApsideDetectorTest.java index 476d5fd99f180f9964488e83c8d3dcb595c4ac38..f026b19f4919f61436eb4a73f2e3170d0b4fb36a 100644 --- a/src/test/java/org/orekit/propagation/events/ApsideDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/ApsideDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/BackAndForthDetectorTest.java b/src/test/java/org/orekit/propagation/events/BackAndForthDetectorTest.java index 7ff216a8af52346f938242770cd5b2cfadc94cf4..2789b8fc3b2ad10bbe198568bd453a8bb42b2f5f 100644 --- a/src/test/java/org/orekit/propagation/events/BackAndForthDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/BackAndForthDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/CircularFieldOfViewDetectorTest.java b/src/test/java/org/orekit/propagation/events/CircularFieldOfViewDetectorTest.java index 7a7d1fdc2c79cea7ba37e52f972e264500c3af74..8e8aaf943d4041dae5979bc852e31af71704c79b 100644 --- a/src/test/java/org/orekit/propagation/events/CircularFieldOfViewDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/CircularFieldOfViewDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/DateDetectorTest.java b/src/test/java/org/orekit/propagation/events/DateDetectorTest.java index 4e9f3206a709c3020bf105988a6f919ff830738b..e7cb3fbeae54db4734dee4ae36b0c37c132ae7e1 100644 --- a/src/test/java/org/orekit/propagation/events/DateDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/DateDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EclipseDetectorTest.java b/src/test/java/org/orekit/propagation/events/EclipseDetectorTest.java index 9bf4f609670ba53b49d2a3532dbe20f39613295e..506c9180837feb29d3c9a1a30f37a83ed73e2796 100644 --- a/src/test/java/org/orekit/propagation/events/EclipseDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/EclipseDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/ElevationDetectorTest.java b/src/test/java/org/orekit/propagation/events/ElevationDetectorTest.java index 0b716d050279fc35f03665eeecb4d21ff369c520..82963d8229771b0c498bbca777f31f3599978e30 100644 --- a/src/test/java/org/orekit/propagation/events/ElevationDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/ElevationDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/ElevationExtremumDetectorTest.java b/src/test/java/org/orekit/propagation/events/ElevationExtremumDetectorTest.java index a7841f8ef59d9cee21bb7d2a1ef5810ae3b09851..16b3bb0a023c7229970f639716010bdc18e4ecbe 100644 --- a/src/test/java/org/orekit/propagation/events/ElevationExtremumDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/ElevationExtremumDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventDetectorTest.java b/src/test/java/org/orekit/propagation/events/EventDetectorTest.java index dc86165ab45ed0ec432cf5e4a3a3d6c6a8ea7e5b..dfc3200f1c2b3f16e7648839bb0d57577fc7c772 100644 --- a/src/test/java/org/orekit/propagation/events/EventDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/EventDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventEnablingPredicateFilterTest.java b/src/test/java/org/orekit/propagation/events/EventEnablingPredicateFilterTest.java index 9f8be3852725e236bb438ed063e4050997379ce9..27c710ad88d4e7de6afe785558b9c80bfacc3d06 100644 --- a/src/test/java/org/orekit/propagation/events/EventEnablingPredicateFilterTest.java +++ b/src/test/java/org/orekit/propagation/events/EventEnablingPredicateFilterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventShifterTest.java b/src/test/java/org/orekit/propagation/events/EventShifterTest.java index d3698b893f4d583494ee257a99ee16b1eda42ec1..12a9d03f0ec3b6aca1554c95e3d20a0186ba661f 100644 --- a/src/test/java/org/orekit/propagation/events/EventShifterTest.java +++ b/src/test/java/org/orekit/propagation/events/EventShifterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventSlopeFilterTest.java b/src/test/java/org/orekit/propagation/events/EventSlopeFilterTest.java index 44dfd3fc7e01001aa496458e6b55fd61d15f5b91..b295d91be943819afe854ed794b13a6001ea6987 100644 --- a/src/test/java/org/orekit/propagation/events/EventSlopeFilterTest.java +++ b/src/test/java/org/orekit/propagation/events/EventSlopeFilterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/EventsLoggerTest.java b/src/test/java/org/orekit/propagation/events/EventsLoggerTest.java index adc60f7e2b22318b2e989b0a510a38c3ab5dc271..cc22c6a478e39f39d5cb4bc8f76a23e91276f0a9 100644 --- a/src/test/java/org/orekit/propagation/events/EventsLoggerTest.java +++ b/src/test/java/org/orekit/propagation/events/EventsLoggerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldApsideDetectorTest.java b/src/test/java/org/orekit/propagation/events/FieldApsideDetectorTest.java index 3f21aa43335b25ca7e4bc4cf00dd8a27eb6f9186..e12e543f065387c7feff265735d9305a6e7d2ca4 100644 --- a/src/test/java/org/orekit/propagation/events/FieldApsideDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldApsideDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldDateDetectorTest.java b/src/test/java/org/orekit/propagation/events/FieldDateDetectorTest.java index 9c3ece2d3edcd9e66e706f97c52b27f536b520fa..f57734a2f4a6a7ef94e225451a60466029f6e52e 100644 --- a/src/test/java/org/orekit/propagation/events/FieldDateDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldDateDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldEclipseDetectorTest.java b/src/test/java/org/orekit/propagation/events/FieldEclipseDetectorTest.java index eb762b56b7b239eb4b2662959b0c8fcc047dda83..5aa76cb9813cfb47cb38a79368ebd253fcd6070f 100644 --- a/src/test/java/org/orekit/propagation/events/FieldEclipseDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldEclipseDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldEventDetectorTest.java b/src/test/java/org/orekit/propagation/events/FieldEventDetectorTest.java index df8c23c6f93901b24f7119089d70247cf6badac1..d1e4b9bfa1f4aeee8371ef4602feb23adacff535 100644 --- a/src/test/java/org/orekit/propagation/events/FieldEventDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldEventDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldEventsLoggerTest.java b/src/test/java/org/orekit/propagation/events/FieldEventsLoggerTest.java index 998e5dbe07b4fabcd3f3dbbd27f0920c21816d72..f873468d0d598291c71028ac6e9c661b215b71dc 100644 --- a/src/test/java/org/orekit/propagation/events/FieldEventsLoggerTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldEventsLoggerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldNodeDetectorTest.java b/src/test/java/org/orekit/propagation/events/FieldNodeDetectorTest.java index 0f8b72055b325a6ab93f43e0394f45e70dd2956b..73f7bc16adba295b3060be057ca19d7d6855f67f 100644 --- a/src/test/java/org/orekit/propagation/events/FieldNodeDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldNodeDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldOfViewDetectorTest.java b/src/test/java/org/orekit/propagation/events/FieldOfViewDetectorTest.java index e2f84c9868371b57c0441665aab78ce92fc91f70..ecac0315b86207f73a40a71c3a1bf025355cdc2a 100644 --- a/src/test/java/org/orekit/propagation/events/FieldOfViewDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldOfViewDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FieldOfViewTest.java b/src/test/java/org/orekit/propagation/events/FieldOfViewTest.java index 184fc9849d2f0c7a76aa52f22911f17cf594f892..46833bffce1ec2a7dba01784eabb3ea876600f7c 100644 --- a/src/test/java/org/orekit/propagation/events/FieldOfViewTest.java +++ b/src/test/java/org/orekit/propagation/events/FieldOfViewTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FootprintOverlapDetectorTest.java b/src/test/java/org/orekit/propagation/events/FootprintOverlapDetectorTest.java index fcd25e8d6dca1a4f0af23523bc2e66e0503c914e..a1931bdc6d3df28df6737b453e91c17c402fb16e 100644 --- a/src/test/java/org/orekit/propagation/events/FootprintOverlapDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FootprintOverlapDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/FunctionalDetectorTest.java b/src/test/java/org/orekit/propagation/events/FunctionalDetectorTest.java index 756437809e60c721463e8cff27f9ee3e02cd426a..d96ab37ee79a54604feb837ed7c59721c77713a2 100644 --- a/src/test/java/org/orekit/propagation/events/FunctionalDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/FunctionalDetectorTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import org.orekit.frames.FramesFactory; import org.orekit.orbits.CartesianOrbit; import org.orekit.propagation.SpacecraftState; -import org.orekit.propagation.events.FunctionalDetector.GFunction; import org.orekit.propagation.events.handlers.EventHandler; import org.orekit.propagation.events.handlers.EventHandler.Action; import org.orekit.time.AbsoluteDate; @@ -44,7 +43,7 @@ public class FunctionalDetectorTest { @Test @Deprecated public void testFunctionalDetectorDeprecated() { // setup - GFunction g = SpacecraftState::getMass; + org.orekit.propagation.events.FunctionalDetector.GFunction g = SpacecraftState::getMass; EventHandler<EventDetector> handler = (s, detector, increasing) -> Action.STOP; // action diff --git a/src/test/java/org/orekit/propagation/events/GeographicZoneDetectorTest.java b/src/test/java/org/orekit/propagation/events/GeographicZoneDetectorTest.java index 603538e373a1b5309ae7f3e2d19b62d4bbc98831..d3fed88e39ea6a8ed3bd3aa04e3b7799ee9c4207 100644 --- a/src/test/java/org/orekit/propagation/events/GeographicZoneDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/GeographicZoneDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/GroundAtNightDetectorTest.java b/src/test/java/org/orekit/propagation/events/GroundAtNightDetectorTest.java index d4c96dd87b7658c795aff7609ed16125d9c2cbd9..606a920659afa63d7cb1ca2714c8dae5217ce12d 100644 --- a/src/test/java/org/orekit/propagation/events/GroundAtNightDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/GroundAtNightDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/InterSatDirectViewDetectorTest.java b/src/test/java/org/orekit/propagation/events/InterSatDirectViewDetectorTest.java index f091ffaedb31759aed449f899dfa79cff14fe6dc..6d394cb63adceae4abd88850edfb210b8ae815e3 100644 --- a/src/test/java/org/orekit/propagation/events/InterSatDirectViewDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/InterSatDirectViewDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LatitudeCrossingDetectorTest.java b/src/test/java/org/orekit/propagation/events/LatitudeCrossingDetectorTest.java index 78d1620801d0c9f6edc36e70b64cb5bacf836997..f4ef0ab59bd71fddc7659abbc05840a9fbec8f73 100644 --- a/src/test/java/org/orekit/propagation/events/LatitudeCrossingDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/LatitudeCrossingDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LatitudeExtremumDetectorTest.java b/src/test/java/org/orekit/propagation/events/LatitudeExtremumDetectorTest.java index 4fe12b54a2942f4a7167b0beb0631900e76beeb3..466601ca8a2605e3610f6fd64fe43d52e2dee212 100644 --- a/src/test/java/org/orekit/propagation/events/LatitudeExtremumDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/LatitudeExtremumDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LongitudeCrossingDetectorTest.java b/src/test/java/org/orekit/propagation/events/LongitudeCrossingDetectorTest.java index e91430c1cf238a2ee904b3e8d6968d4056f9b4c6..3db0537c6c13a64a1f451958abb77106b7ab1121 100644 --- a/src/test/java/org/orekit/propagation/events/LongitudeCrossingDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/LongitudeCrossingDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/LongitudeExtremumDetectorTest.java b/src/test/java/org/orekit/propagation/events/LongitudeExtremumDetectorTest.java index c926c72caa9fd86c329f33f092640ac98420eda7..d69fbbfc4726e3bd11b0463eaea0727a98edb33d 100644 --- a/src/test/java/org/orekit/propagation/events/LongitudeExtremumDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/LongitudeExtremumDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/NodeDetectorTest.java b/src/test/java/org/orekit/propagation/events/NodeDetectorTest.java index 042e0b2d79e052be3c20e8def8e41c51b6bb0059..239315fc81de6f7a164cc18c980fa6309d6c5dd2 100644 --- a/src/test/java/org/orekit/propagation/events/NodeDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/NodeDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/PositionAngleDetectorTest.java b/src/test/java/org/orekit/propagation/events/PositionAngleDetectorTest.java index 5a3b1ac2b2ae62f88a0a87a8a6f6e1090372f2e6..7988afea7140bc0d8a3bc4e268ec01f4461ba448 100644 --- a/src/test/java/org/orekit/propagation/events/PositionAngleDetectorTest.java +++ b/src/test/java/org/orekit/propagation/events/PositionAngleDetectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/ContinueOnEventTest.java b/src/test/java/org/orekit/propagation/events/handlers/ContinueOnEventTest.java index 9a0bee37e9a6f7ecaf5dbcf02dd7ace281e6668b..9611cd6316ed474efceaa996bf77b426a1f86760 100644 --- a/src/test/java/org/orekit/propagation/events/handlers/ContinueOnEventTest.java +++ b/src/test/java/org/orekit/propagation/events/handlers/ContinueOnEventTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/EventHandlerTest.java b/src/test/java/org/orekit/propagation/events/handlers/EventHandlerTest.java index 5d74eeba47340f5fc5ffdf3021ac7f5f726afdf0..c13ee4549a6bd63c222ce4f8e06790e047e653d2 100644 --- a/src/test/java/org/orekit/propagation/events/handlers/EventHandlerTest.java +++ b/src/test/java/org/orekit/propagation/events/handlers/EventHandlerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/FieldStopOnDecreasingTest.java b/src/test/java/org/orekit/propagation/events/handlers/FieldStopOnDecreasingTest.java index f394fa0e1030ef9eaf2a5114d5b23c2fe27459e9..3894b5b0660fae7bbb57f269009f444044b9d67a 100644 --- a/src/test/java/org/orekit/propagation/events/handlers/FieldStopOnDecreasingTest.java +++ b/src/test/java/org/orekit/propagation/events/handlers/FieldStopOnDecreasingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/FieldStopOnIncreasingTest.java b/src/test/java/org/orekit/propagation/events/handlers/FieldStopOnIncreasingTest.java index 56de3dde42649102f36b9b8ba6691b0595e61dcd..d1a1b258f2e87fae7be08145104c21e35a6558f9 100644 --- a/src/test/java/org/orekit/propagation/events/handlers/FieldStopOnIncreasingTest.java +++ b/src/test/java/org/orekit/propagation/events/handlers/FieldStopOnIncreasingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/StopOnDecreasingTest.java b/src/test/java/org/orekit/propagation/events/handlers/StopOnDecreasingTest.java index 7ecdd21149ac9bbf43a04fc4043cb415cad7f45c..d742642ce3f51b287a18ec5abd301e9de43f612e 100644 --- a/src/test/java/org/orekit/propagation/events/handlers/StopOnDecreasingTest.java +++ b/src/test/java/org/orekit/propagation/events/handlers/StopOnDecreasingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/StopOnEventTest.java b/src/test/java/org/orekit/propagation/events/handlers/StopOnEventTest.java index 44c55f685b8e6f8ce5e3e604c1106a5b9fea1eb7..a70d4e70c84df9ce5263e73735dbb80b98ae0422 100644 --- a/src/test/java/org/orekit/propagation/events/handlers/StopOnEventTest.java +++ b/src/test/java/org/orekit/propagation/events/handlers/StopOnEventTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/events/handlers/StopOnIncreasingTest.java b/src/test/java/org/orekit/propagation/events/handlers/StopOnIncreasingTest.java index 27162fe8e522d648b834c196c1d5284da3f3cdaa..291661229865f2db3fe07d3b4553e5e055fee8fd 100644 --- a/src/test/java/org/orekit/propagation/events/handlers/StopOnIncreasingTest.java +++ b/src/test/java/org/orekit/propagation/events/handlers/StopOnIncreasingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/AdditionalEquationsTest.java b/src/test/java/org/orekit/propagation/integration/AdditionalEquationsTest.java index 5e14821789b100a7366c47aa5a24076bc16a096a..112e341bd31be121e4c2d3cf44b0df70f45e9d51 100644 --- a/src/test/java/org/orekit/propagation/integration/AdditionalEquationsTest.java +++ b/src/test/java/org/orekit/propagation/integration/AdditionalEquationsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/FieldAdditionalEquationsTest.java b/src/test/java/org/orekit/propagation/integration/FieldAdditionalEquationsTest.java index 6ca3b8bfd97805625107fbe9bfe674d838d94bc5..98a410f02639a00ebfd58090bbd44d270f2d5753 100644 --- a/src/test/java/org/orekit/propagation/integration/FieldAdditionalEquationsTest.java +++ b/src/test/java/org/orekit/propagation/integration/FieldAdditionalEquationsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/FieldIntegratedEphemerisTest.java b/src/test/java/org/orekit/propagation/integration/FieldIntegratedEphemerisTest.java index ac289bc3c630a08080f7673e65d29269adaf9f91..ad0775b1f731d083e5e110ceb382841ca543c316 100644 --- a/src/test/java/org/orekit/propagation/integration/FieldIntegratedEphemerisTest.java +++ b/src/test/java/org/orekit/propagation/integration/FieldIntegratedEphemerisTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/integration/IntegratedEphemerisTest.java b/src/test/java/org/orekit/propagation/integration/IntegratedEphemerisTest.java index 826118db5aa1f68c2bc026114113a105b373cabb..32a32e2ade7f062548b508a28c130a87c80fdd42 100644 --- a/src/test/java/org/orekit/propagation/integration/IntegratedEphemerisTest.java +++ b/src/test/java/org/orekit/propagation/integration/IntegratedEphemerisTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/FieldNumericalPropagatorTest.java b/src/test/java/org/orekit/propagation/numerical/FieldNumericalPropagatorTest.java index f40bd54e4f03808d0bb41dac1d27ea2715966be9..0d3f791e77887968b9d47547b8066d0099e2d8c2 100644 --- a/src/test/java/org/orekit/propagation/numerical/FieldNumericalPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/numerical/FieldNumericalPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/NumericalPropagatorTest.java b/src/test/java/org/orekit/propagation/numerical/NumericalPropagatorTest.java index 47bbc60302eaacb51cb5d5ff5cfdb58f38e3bf49..21184f88ce8d896d93730dc0099d68496704cbe7 100644 --- a/src/test/java/org/orekit/propagation/numerical/NumericalPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/numerical/NumericalPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/PartialDerivativesEquationsTest.java b/src/test/java/org/orekit/propagation/numerical/PartialDerivativesEquationsTest.java index 9f55d11b570a1c0c1355f2aa1ab0459339146107..8fb117c6aac2efc051faff1cc0ff07bf7eb0bbd2 100644 --- a/src/test/java/org/orekit/propagation/numerical/PartialDerivativesEquationsTest.java +++ b/src/test/java/org/orekit/propagation/numerical/PartialDerivativesEquationsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/numerical/PartialDerivativesTest.java b/src/test/java/org/orekit/propagation/numerical/PartialDerivativesTest.java index 8e0b0e5035b7c3bb2bbd54bb80f5a1a407b7f7dc..f1d9169c59b00d74d515ce6a9636a27862ca2c3a 100644 --- a/src/test/java/org/orekit/propagation/numerical/PartialDerivativesTest.java +++ b/src/test/java/org/orekit/propagation/numerical/PartialDerivativesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/sampling/OrekitStepHandlerTest.java b/src/test/java/org/orekit/propagation/sampling/OrekitStepHandlerTest.java index 36aa6db4e9c1e95a1e0217f0755dd726a44df7a0..f27372db4d92fa949b16221b51e18b8cd514fa9c 100644 --- a/src/test/java/org/orekit/propagation/sampling/OrekitStepHandlerTest.java +++ b/src/test/java/org/orekit/propagation/sampling/OrekitStepHandlerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/DSSTPropagatorTest.java b/src/test/java/org/orekit/propagation/semianalytical/dsst/DSSTPropagatorTest.java index 1e9904ecb43b6e98bb6ff954a6d342179a668643..7057d5e2df739c9829376e785bf8ecc33b570bdf 100644 --- a/src/test/java/org/orekit/propagation/semianalytical/dsst/DSSTPropagatorTest.java +++ b/src/test/java/org/orekit/propagation/semianalytical/dsst/DSSTPropagatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/CoefficientFactoryTest.java b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/CoefficientFactoryTest.java index 1bfcef7d7662cdc09fea10175a27323d1e6a04cc..bb5d6e221c8e6d7ef92d5bd66b66e09ad06a5a3f 100644 --- a/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/CoefficientFactoryTest.java +++ b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/CoefficientFactoryTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/GHmsjTest.java b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/GHmsjTest.java index c090c7bfa198f9b4a9ef2e082186b2a81449b42f..8e47c39611c6261ebe3405b06a7f54240d2503e6 100644 --- a/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/GHmsjTest.java +++ b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/GHmsjTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/GammaMnsFunctionTest.java b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/GammaMnsFunctionTest.java index a1f9cc6e869d259b2898e6bf8fff6434be9dfe0a..43921c1227a753134c75421724830a62b59585b0 100644 --- a/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/GammaMnsFunctionTest.java +++ b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/GammaMnsFunctionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/NewcombOperatorTest.java b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/NewcombOperatorTest.java index 2a788448ca1fd76494e32114a93535120ec4bb5e..6799cbb0151f5614f53afe4a0e7a811021ae4c87 100644 --- a/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/NewcombOperatorTest.java +++ b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/NewcombOperatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinearTest.java b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinearTest.java index 91ec83bf5936cad3cff5c9c3d6ad7b56098f6b17..12d76d7a18fec5d956faa42bdfa242a02f6e0a17 100644 --- a/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinearTest.java +++ b/src/test/java/org/orekit/propagation/semianalytical/dsst/utilities/hansen/HansenThirdBodyLinearTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/AbsoluteDateTest.java b/src/test/java/org/orekit/time/AbsoluteDateTest.java index 821397cc24ac6286391160c019cbeeeea99543fa..6685c735c2542e68b7c93171279ac07ebd7fe2e7 100644 --- a/src/test/java/org/orekit/time/AbsoluteDateTest.java +++ b/src/test/java/org/orekit/time/AbsoluteDateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/BDSScaleTest.java b/src/test/java/org/orekit/time/BDSScaleTest.java index 52e1d3e50e624aae26dedb38d3ce2abb84e769a8..2859d15a9f7c61d53b5ee87da64a72d8d56f13cb 100644 --- a/src/test/java/org/orekit/time/BDSScaleTest.java +++ b/src/test/java/org/orekit/time/BDSScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/BurstSelectorStepTest.java b/src/test/java/org/orekit/time/BurstSelectorStepTest.java index 3d1781d6fc30dcc7600edcaffa89eb2b49b4e5f6..d1892f1d7b46791b9cb6d422a0da3579e76d29d2 100644 --- a/src/test/java/org/orekit/time/BurstSelectorStepTest.java +++ b/src/test/java/org/orekit/time/BurstSelectorStepTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/DateComponentsTest.java b/src/test/java/org/orekit/time/DateComponentsTest.java index b9b5b0c1ab424bfc5866ad59b735e944833dc3de..7716d68255768c69e2216ba5f2bcae85e8f122a2 100644 --- a/src/test/java/org/orekit/time/DateComponentsTest.java +++ b/src/test/java/org/orekit/time/DateComponentsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/DateTimeComponentsTest.java b/src/test/java/org/orekit/time/DateTimeComponentsTest.java index 04cf357e124e4c8c6641f9aa8b5a9e57821d38b2..53563af5e7f56e65838a800fc2f8d532106be98a 100644 --- a/src/test/java/org/orekit/time/DateTimeComponentsTest.java +++ b/src/test/java/org/orekit/time/DateTimeComponentsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/FieldAbsoluteDateTest.java b/src/test/java/org/orekit/time/FieldAbsoluteDateTest.java index a660b943a9af10994fac03fc2b5c4aa53ec53f1e..3f20d18a6df1073c9ae9080ceb9bd81273c9faf0 100644 --- a/src/test/java/org/orekit/time/FieldAbsoluteDateTest.java +++ b/src/test/java/org/orekit/time/FieldAbsoluteDateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/FixedStepSelectorTest.java b/src/test/java/org/orekit/time/FixedStepSelectorTest.java index 756102ce358048d4684e0fa60634c31a723ad760..603494c04ce8f70dc59a2487338580f02adbd37b 100644 --- a/src/test/java/org/orekit/time/FixedStepSelectorTest.java +++ b/src/test/java/org/orekit/time/FixedStepSelectorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GLONASSScaleTest.java b/src/test/java/org/orekit/time/GLONASSScaleTest.java index a1912feba5425de144acb04a02f1ef233db3dcac..d0b33a49033cc8cc809ec75cf6cbf74f03226326 100644 --- a/src/test/java/org/orekit/time/GLONASSScaleTest.java +++ b/src/test/java/org/orekit/time/GLONASSScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GMSTScaleTest.java b/src/test/java/org/orekit/time/GMSTScaleTest.java index 25dc0bd0282f1e33e5021d20378b5877d05b93c7..6e588123a9bc5a797abdcb2e5512c44b580efb5f 100644 --- a/src/test/java/org/orekit/time/GMSTScaleTest.java +++ b/src/test/java/org/orekit/time/GMSTScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GPSDateTest.java b/src/test/java/org/orekit/time/GPSDateTest.java index faa86204232d2cef20ccfc092b60fb57072f4cc6..27516366db5e52d3d73f03678efa2afb851a9653 100644 --- a/src/test/java/org/orekit/time/GPSDateTest.java +++ b/src/test/java/org/orekit/time/GPSDateTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GPSScaleTest.java b/src/test/java/org/orekit/time/GPSScaleTest.java index b9f153d0a7e1db21a6110af08267d884cc0ff477..04175d6923ee391ad64fe9935d9fb3dbe28590b0 100644 --- a/src/test/java/org/orekit/time/GPSScaleTest.java +++ b/src/test/java/org/orekit/time/GPSScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/GalileoScaleTest.java b/src/test/java/org/orekit/time/GalileoScaleTest.java index c5210e6ca7f6c3914900a73dcf2405e5f34f3a98..742342d42e7f4b82ac18ca4701c3053cb44c2f7d 100644 --- a/src/test/java/org/orekit/time/GalileoScaleTest.java +++ b/src/test/java/org/orekit/time/GalileoScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/IRNSSScaleTest.java b/src/test/java/org/orekit/time/IRNSSScaleTest.java index b7399face5909263d1da2affa9319b149e357a5b..0037f10cb94784456d704a9c742f9d549463f4e8 100644 --- a/src/test/java/org/orekit/time/IRNSSScaleTest.java +++ b/src/test/java/org/orekit/time/IRNSSScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/MonthTest.java b/src/test/java/org/orekit/time/MonthTest.java index 5598ba454f9836c1f711119b8586f341ca4644b0..7c91fe039a603992ff9b421d875db3c7322a7cb2 100644 --- a/src/test/java/org/orekit/time/MonthTest.java +++ b/src/test/java/org/orekit/time/MonthTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/QZSSScaleTest.java b/src/test/java/org/orekit/time/QZSSScaleTest.java index 345e6836c3dd0de732bb50e4277a0c00354a409a..e09e80b32fe4784f219a7c7aaf0274f140c1ebd6 100644 --- a/src/test/java/org/orekit/time/QZSSScaleTest.java +++ b/src/test/java/org/orekit/time/QZSSScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TAIScaleTest.java b/src/test/java/org/orekit/time/TAIScaleTest.java index 9fd5242d651645c209f47834c79c763e440ccf2c..228296bbd80b2f0e0a4ad48c4d7305d30c7a81cc 100644 --- a/src/test/java/org/orekit/time/TAIScaleTest.java +++ b/src/test/java/org/orekit/time/TAIScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TAIUTCDatAFilesLoaderTest.java b/src/test/java/org/orekit/time/TAIUTCDatAFilesLoaderTest.java index 5e99a3d05785ca62d80b1374b8f926e18cad5ef0..1fcb5c00f088ae10cd1fb195879dca5297f2a230 100644 --- a/src/test/java/org/orekit/time/TAIUTCDatAFilesLoaderTest.java +++ b/src/test/java/org/orekit/time/TAIUTCDatAFilesLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TCBScaleTest.java b/src/test/java/org/orekit/time/TCBScaleTest.java index ec53cd39308c36c30b748f3fe378b57d07a65256..e3de66ecdf66aa2158fa167bac8cb3ec3facb765 100644 --- a/src/test/java/org/orekit/time/TCBScaleTest.java +++ b/src/test/java/org/orekit/time/TCBScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TCGScaleTest.java b/src/test/java/org/orekit/time/TCGScaleTest.java index 7efcba9ef24a28d39557b9a577ea1b95784d6370..cad98fc0b53c6ccb46ab396aaddc951b6548630a 100644 --- a/src/test/java/org/orekit/time/TCGScaleTest.java +++ b/src/test/java/org/orekit/time/TCGScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TDBScaleTest.java b/src/test/java/org/orekit/time/TDBScaleTest.java index 64251c657194ca0a752fd27503f98d68218f06ed..8eb27c18e27095386e719efbb7b27cb61002b75e 100644 --- a/src/test/java/org/orekit/time/TDBScaleTest.java +++ b/src/test/java/org/orekit/time/TDBScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TTScaleTest.java b/src/test/java/org/orekit/time/TTScaleTest.java index 1f7b5140bc9c43f3e1bbc5d216b6d867920eb40e..6f7deb635d70323c68598bf8fba945fd2b9bd8d4 100644 --- a/src/test/java/org/orekit/time/TTScaleTest.java +++ b/src/test/java/org/orekit/time/TTScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/TimeComponentsTest.java b/src/test/java/org/orekit/time/TimeComponentsTest.java index 21f6c5872770c1f362c6b5695e1bce6391472fc7..0398df891ab17a6b6fa86e3b6d5823cf74eb3fbc 100644 --- a/src/test/java/org/orekit/time/TimeComponentsTest.java +++ b/src/test/java/org/orekit/time/TimeComponentsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UT1ScaleTest.java b/src/test/java/org/orekit/time/UT1ScaleTest.java index 22d2759280e923c3977b6a3cca43f004c17065eb..e9bd01232509521bca44032f5bb82cd2ea65a7d3 100644 --- a/src/test/java/org/orekit/time/UT1ScaleTest.java +++ b/src/test/java/org/orekit/time/UT1ScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCScaleTest.java b/src/test/java/org/orekit/time/UTCScaleTest.java index 7d0b3810d18df1e74d54d6407933ce37b0ded41c..95b82558ee9e950d88d0cf240d98a11a36058901 100644 --- a/src/test/java/org/orekit/time/UTCScaleTest.java +++ b/src/test/java/org/orekit/time/UTCScaleTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIBulletinAFilesLoaderTest.java b/src/test/java/org/orekit/time/UTCTAIBulletinAFilesLoaderTest.java index 598348b9b7a9e629c6da6f28cea9e020f907a9d3..1adc506b17cce794e8c895b16fcbb3c1baf28c46 100644 --- a/src/test/java/org/orekit/time/UTCTAIBulletinAFilesLoaderTest.java +++ b/src/test/java/org/orekit/time/UTCTAIBulletinAFilesLoaderTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIHistoryFilesLoaderCompressedDataTest.java b/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderCompressedDataTest.java index c0492eb88f0161ed274c827abfe229217a25b00e..a37c44f12383d2d770d3254dac40ff1616e27e95 100644 --- a/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderCompressedDataTest.java +++ b/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderCompressedDataTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIHistoryFilesLoaderNoDataTest.java b/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderNoDataTest.java index bcd0e55d1348e2883fa58c9e8fcb05e14f2a18a0..95d2e1798db2e4a62ebe69f081998faa18f73473 100644 --- a/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderNoDataTest.java +++ b/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderNoDataTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/UTCTAIHistoryFilesLoaderRegularDataTest.java b/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderRegularDataTest.java index d886bd66412de57ece993cbd39a9a83734c4c5af..16bb9c719d9a24e7e4b52c776f8f8e0a160e29e9 100644 --- a/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderRegularDataTest.java +++ b/src/test/java/org/orekit/time/UTCTAIHistoryFilesLoaderRegularDataTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/AngularCoordinatesTest.java b/src/test/java/org/orekit/utils/AngularCoordinatesTest.java index a03f0de46954bd641385de11f3e449773d14921c..2bb7cb495660a390be6fc5b2be5f7e5e49b14f1e 100644 --- a/src/test/java/org/orekit/utils/AngularCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/AngularCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/AngularDerivativesFilterTest.java b/src/test/java/org/orekit/utils/AngularDerivativesFilterTest.java index 9ee680d8accf883994470148425391ec4b255510..491f390a48daa47eca50abd1ff7114d6ef91f8e4 100644 --- a/src/test/java/org/orekit/utils/AngularDerivativesFilterTest.java +++ b/src/test/java/org/orekit/utils/AngularDerivativesFilterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/CartesianDerivativesFilterTest.java b/src/test/java/org/orekit/utils/CartesianDerivativesFilterTest.java index 4cd1fcaf9d59cc29020dc55b4ccc055e16cbdb56..a64e96de537dc4c3c9984754058a850f3ae5e5e2 100644 --- a/src/test/java/org/orekit/utils/CartesianDerivativesFilterTest.java +++ b/src/test/java/org/orekit/utils/CartesianDerivativesFilterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/DifferentiationTest.java b/src/test/java/org/orekit/utils/DifferentiationTest.java new file mode 100644 index 0000000000000000000000000000000000000000..62b7e83c2208457d92ca0ebd32bf3cbd28a4b8b3 --- /dev/null +++ b/src/test/java/org/orekit/utils/DifferentiationTest.java @@ -0,0 +1,60 @@ +/* Copyright 2002-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.utils; + + +import org.hipparchus.util.FastMath; +import org.hipparchus.util.Precision; +import org.junit.Assert; +import org.junit.Test; + +public class DifferentiationTest { + + @Test + public void testScaleOne() { + // with this step, computation is exact in IEEE754 + doTestScale(1.0, FastMath.pow(1.0, -3), Precision.SAFE_MIN); + } + + @Test + public void testScalePowerOfTwoStepRepresentableNumber() { + // with this step, computation is exact in IEEE754 + doTestScale(FastMath.scalb(1.0, -10), FastMath.pow(1.0, -7), Precision.SAFE_MIN); + } + + @Test + public void testScalePowerOfTwoStepNonRepresentableNumber() { + // with this step, computation has numerical noise + doTestScale(FastMath.scalb(1.0, -10), 0.007, 1.7e-12); + } + + private void doTestScale(final double scale, final double step, final double tolerance) { + ParameterDriver driver = new ParameterDriver("", -100.0, scale, + Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); + ParameterFunction f0 = d -> 3 * d.getValue() * d.getValue() - 2 * d.getValue(); + ParameterFunction f1Diff = Differentiation.differentiate(f0, 4, step); + ParameterFunction f1Ref = d -> 6 * d.getValue() - 2; + + for (double x = -3.0; x < 3.0; x += 0.125) { + driver.setValue(x); + Assert.assertEquals(f1Ref.value(driver), f1Diff.value(driver), tolerance); + } + + } + +} + diff --git a/src/test/java/org/orekit/utils/ElevationMaskTest.java b/src/test/java/org/orekit/utils/ElevationMaskTest.java index 0f36cd6608202a6c4d2b8f631a9afb772e2d60fd..ed39203dfe433478da362aa16a828df1e848ddbb 100644 --- a/src/test/java/org/orekit/utils/ElevationMaskTest.java +++ b/src/test/java/org/orekit/utils/ElevationMaskTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/ExtendedPVCoordinatesTest.java b/src/test/java/org/orekit/utils/ExtendedPVCoordinatesTest.java index 38f67e87009cd100841b7c26757e7ecebd20cdf6..80dc40b02914c631b5542833b1dc17113e196ce0 100644 --- a/src/test/java/org/orekit/utils/ExtendedPVCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/ExtendedPVCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/FieldAngularCoordinatesTest.java b/src/test/java/org/orekit/utils/FieldAngularCoordinatesTest.java index d0d8caf52eb9bd78b72cde5750caea93153d9ed5..764c1381898fcacb5e98ccbbf00e454a2cc4b571 100644 --- a/src/test/java/org/orekit/utils/FieldAngularCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/FieldAngularCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/FieldPVCoordinatesTest.java b/src/test/java/org/orekit/utils/FieldPVCoordinatesTest.java index 24f43cec5b242ec71cb9796265c0b9d663e1a18d..6682abb1c101ad2081d4ee00b402646ad2645bed 100644 --- a/src/test/java/org/orekit/utils/FieldPVCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/FieldPVCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/GenericTimeStampedCacheTest.java b/src/test/java/org/orekit/utils/GenericTimeStampedCacheTest.java index 6aa15e640d1f2435775ab4038e14081911888ac9..a414ff8dea80ed3f0e3b6a969317feec51371841 100644 --- a/src/test/java/org/orekit/utils/GenericTimeStampedCacheTest.java +++ b/src/test/java/org/orekit/utils/GenericTimeStampedCacheTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/IERSConventionsTest.java b/src/test/java/org/orekit/utils/IERSConventionsTest.java index 62b7c7c395cb7d8a17a063e4b3c1a86cae5f99f6..bf8c2e71cd6d1a03a9dc7193700de65fc91669c3 100644 --- a/src/test/java/org/orekit/utils/IERSConventionsTest.java +++ b/src/test/java/org/orekit/utils/IERSConventionsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/PVCoordinatesTest.java b/src/test/java/org/orekit/utils/PVCoordinatesTest.java index 52d6b2901e3c73cd1b8f9972baebaf948fe4b72e..09dd964d929a2cf42ea125b80f1531bdc89f38f8 100644 --- a/src/test/java/org/orekit/utils/PVCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/PVCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/ParameterDriversListTest.java b/src/test/java/org/orekit/utils/ParameterDriversListTest.java index cad7ae08a6613b5fd3cd7e0c41ae81483de11687..aa38f6df136a3f44e2e0100f38ca5e88487049ae 100644 --- a/src/test/java/org/orekit/utils/ParameterDriversListTest.java +++ b/src/test/java/org/orekit/utils/ParameterDriversListTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/SecularAndHarmonicTest.java b/src/test/java/org/orekit/utils/SecularAndHarmonicTest.java index 5452dbe7a7d7bd5773cde79fbca16fa1a8bd1973..091ead25a729a072fd249a4559db9e1202ca7bae 100644 --- a/src/test/java/org/orekit/utils/SecularAndHarmonicTest.java +++ b/src/test/java/org/orekit/utils/SecularAndHarmonicTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeSpanMapTest.java b/src/test/java/org/orekit/utils/TimeSpanMapTest.java index b627479e2ecc2a92693fde830c1fc2b5575d82a3..33075f43b7b5668cf9452bf4136e84bbb9dbbb13 100644 --- a/src/test/java/org/orekit/utils/TimeSpanMapTest.java +++ b/src/test/java/org/orekit/utils/TimeSpanMapTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedAngularCoordinatesTest.java b/src/test/java/org/orekit/utils/TimeStampedAngularCoordinatesTest.java index 4baffd59593ed0a9bc4673600e81b25a848b49d1..52a83254c7338ce13b9d2f46793ced6a4a4ca2e9 100644 --- a/src/test/java/org/orekit/utils/TimeStampedAngularCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/TimeStampedAngularCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedFieldAngularCoordinatesTest.java b/src/test/java/org/orekit/utils/TimeStampedFieldAngularCoordinatesTest.java index 6689a80a8a9e89002d4cb9472604962d5fe2e71f..1d739c34fc9f12ce2b747ccdd09bfdaebbd191bd 100644 --- a/src/test/java/org/orekit/utils/TimeStampedFieldAngularCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/TimeStampedFieldAngularCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/utils/TimeStampedFieldPVCoordinatesTest.java b/src/test/java/org/orekit/utils/TimeStampedFieldPVCoordinatesTest.java index b3cf2a9426bd1fc6e8635551eca7e46ea82a69e7..9a05f89527626bee17d85a57c47b2586578a4a50 100644 --- a/src/test/java/org/orekit/utils/TimeStampedFieldPVCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/TimeStampedFieldPVCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -357,6 +357,27 @@ public class TimeStampedFieldPVCoordinatesTest { } + @Test + public void testIssue510() { + DSFactory factory = new DSFactory(1, 1); + TimeStampedFieldPVCoordinates<DerivativeStructure> pv = + new TimeStampedFieldPVCoordinates<>(FieldAbsoluteDate.getJ2000Epoch(factory.getDerivativeField()), + new FieldVector3D<>(factory.constant(10.0), + factory.constant(20.0), + factory.constant(30.0)), + new FieldVector3D<>(factory.constant(1.0), + factory.constant(2.0), + factory.constant(3.0)), + FieldVector3D.getZero(factory.getDerivativeField())); + DerivativeStructure dt = factory.variable(0, 1.0); + TimeStampedFieldPVCoordinates<DerivativeStructure> shifted = pv.shiftedBy(dt); + Assert.assertEquals(1.0, shifted.getDate().durationFrom(pv.getDate()).getPartialDerivative(1), 1.0e-15); + Assert.assertEquals(pv.getVelocity().getX().getValue(), shifted.getPosition().getX().getPartialDerivative(1), 1.0e-15); + Assert.assertEquals(pv.getVelocity().getY().getValue(), shifted.getPosition().getY().getPartialDerivative(1), 1.0e-15); + Assert.assertEquals(pv.getVelocity().getZ().getValue(), shifted.getPosition().getZ().getPartialDerivative(1), 1.0e-15); + + } + private PolynomialFunction randomPolynomial(int degree, Random random) { double[] coeff = new double[ 1 + degree]; for (int j = 0; j < degree; ++j) { diff --git a/src/test/java/org/orekit/utils/TimeStampedPVCoordinatesTest.java b/src/test/java/org/orekit/utils/TimeStampedPVCoordinatesTest.java index 2ffc7f66aba7e1b4f0438573655a1731dc122aff..bf8c04cfce200495275d0cde8e039f73ec60adb9 100644 --- a/src/test/java/org/orekit/utils/TimeStampedPVCoordinatesTest.java +++ b/src/test/java/org/orekit/utils/TimeStampedPVCoordinatesTest.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/resources/gnss/attitude/reference-attitude-generator/FindBaseSamples.java b/src/test/resources/gnss/attitude/reference-attitude-generator/FindBaseSamples.java index 1e2695104aed9b1177c5369da790481cfa2157a3..a4b334566f66ebfc48d3e0acf96d019495fb2023 100644 --- a/src/test/resources/gnss/attitude/reference-attitude-generator/FindBaseSamples.java +++ b/src/test/resources/gnss/attitude/reference-attitude-generator/FindBaseSamples.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/resources/gnss/attitude/reference-attitude-generator/GenerateBaseSamples.java b/src/test/resources/gnss/attitude/reference-attitude-generator/GenerateBaseSamples.java index 4d5ba61af0697c0bd06beec1b8c9f09f476793dc..037b1c6d753af261829fa2cbe19d03ecf42b18d4 100644 --- a/src/test/resources/gnss/attitude/reference-attitude-generator/GenerateBaseSamples.java +++ b/src/test/resources/gnss/attitude/reference-attitude-generator/GenerateBaseSamples.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/resources/orbit-determination/GNSS/od_test_GPS07.in b/src/test/resources/orbit-determination/GNSS/od_test_GPS07.in index 5c6714ada5491eb60a2311b49ccf05d6e49be517..e2462eea388bcf7c9d5ca18b0be046d30274dc87 100644 --- a/src/test/resources/orbit-determination/GNSS/od_test_GPS07.in +++ b/src/test/resources/orbit-determination/GNSS/od_test_GPS07.in @@ -94,8 +94,7 @@ general.relativity = true attitude.mode = CENTER_POINTING_WITH_YAW_STEERING ## On-board range bias (m) [0.0] -## here the bias was extracted from clock offset in com18836.sp3: 469.873238 µs -onboard.range.bias = -140860.118 +onboard.range.bias = 0.0 onboard.range.bias.min = -1000000.0 onboard.range.bias.max = +1000000.0 @@ -107,6 +106,13 @@ on.board.antenna.phase.center.x = -0.00040 on.board.antenna.phase.center.y = 0.00500 on.board.antenna.phase.center.z = 0.82240 +## On-board clock offset (s) [0.0] +## here the clock offset was extracted from com18836.sp3: 469.873238 µs +on.board.clock.offset = 469.873238e-6 +on.board.clock.offset.min = -0.01 +on.board.clock.offset.max = +0.01 +on.board.clock.offset.estimated = false + ## correction of ground stations displacements (true/false) [false, false, false] ## if remove.permanent.deformation if true, the station coordinates are ## considered *mean tide* and already include the permanent deformation, hence @@ -115,7 +121,7 @@ on.board.antenna.phase.center.z = 0.82240 ## so the permanent deformation must be included in the displacement solid.tides.displacement.correction = true solid.tides.displacement.remove.permanent.deformation = false -ocean.loading.correction = true +ocean.loading.correction = false ## Ground stations (angles in degrees, altitude and range bias in meters) ground.station.name [0] = SHLD/C1 @@ -123,8 +129,12 @@ ground.station.latitude [0] = 41.868362882 ground.station.longitude [0] = -119.015669632 ground.station.altitude [0] = 1458.088101 ground.station.position.estimated [0] = false +ground.station.clock.offset [0] = 7.0e-9 +ground.station.clock.offset.min [0] = -0.001 +ground.station.clock.offset.max [0] = +0.001 +ground.station.clock.offset.estimated [0] = true ground.station.range.sigma [0] = 1.0 -ground.station.range.bias [0] = -2.0 +ground.station.range.bias [0] = 0.0 ground.station.range.bias.min [0] = -1000.0 ground.station.range.bias.max [0] = +1000.0 ground.station.range.bias.estimated [0] = false @@ -155,6 +165,10 @@ ground.station.latitude [1] = 41.868362882 ground.station.longitude [1] = -119.015669632 ground.station.altitude [1] = 1458.088101 ground.station.position.estimated [1] = false +ground.station.clock.offset [1] = 0.0 +ground.station.clock.offset.min [1] = -0.001 +ground.station.clock.offset.max [1] = +0.001 +ground.station.clock.offset.estimated [1] = true ground.station.range.sigma [1] = 1.0 ground.station.range.bias [1] = 0.0 ground.station.range.bias.min [1] = -1000.0 @@ -164,7 +178,7 @@ ground.station.range.rate.sigma [1] = 0.001 ground.station.range.rate.bias [1] = 0.0 ground.station.range.rate.bias.min [1] = -1.0 ground.station.range.rate.bias.max [1] = +1.0 -ground.station.range.rate.bias.estimated [1] = true +ground.station.range.rate.bias.estimated [1] = false ground.station.azimuth.sigma [1] = 0.02 ground.station.azimuth.bias [1] = 0.01 ground.station.azimuth.bias.min [1] = -0.50 @@ -187,8 +201,12 @@ ground.station.latitude [2] = 41.868362882 ground.station.longitude [2] = -119.015669632 ground.station.altitude [2] = 1458.088101 ground.station.position.estimated [2] = false +ground.station.clock.offset [2] = 5.0e-8 +ground.station.clock.offset.min [2] = -0.001 +ground.station.clock.offset.max [2] = +0.001 +ground.station.clock.offset.estimated [2] = true ground.station.range.sigma [2] = 1.0 -ground.station.range.bias [2] = -15.0 +ground.station.range.bias [2] = 0.0 ground.station.range.bias.min [2] = -1000.0 ground.station.range.bias.max [2] = +1000.0 ground.station.range.bias.estimated [2] = false @@ -219,8 +237,12 @@ ground.station.latitude [3] = 47.653972656 ground.station.longitude [3] = -122.309458826 ground.station.altitude [3] = 44.666105 ground.station.position.estimated [3] = false +ground.station.clock.offset [3] = 3.0e-8 +ground.station.clock.offset.min [3] = -0.001 +ground.station.clock.offset.max [3] = +0.001 +ground.station.clock.offset.estimated [3] = true ground.station.range.sigma [3] = 1.0 -ground.station.range.bias [3] = -3.0 +ground.station.range.bias [3] = 0.0 ground.station.range.bias.min [3] = -1000.0 ground.station.range.bias.max [3] = +1000.0 ground.station.range.bias.estimated [3] = false @@ -251,6 +273,10 @@ ground.station.latitude [4] = 47.653972656 ground.station.longitude [4] = -122.309458826 ground.station.altitude [4] = 44.666105 ground.station.position.estimated [4] = false +ground.station.clock.offset [4] = 0.0 +ground.station.clock.offset.min [4] = -0.001 +ground.station.clock.offset.max [4] = +0.001 +ground.station.clock.offset.estimated [4] = true ground.station.range.sigma [4] = 1.0 ground.station.range.bias [4] = 0.0 ground.station.range.bias.min [4] = -1000.0 @@ -283,8 +309,12 @@ ground.station.latitude [5] = 47.653972656 ground.station.longitude [5] = -122.309458826 ground.station.altitude [5] = 44.666105 ground.station.position.estimated [5] = false +ground.station.clock.offset [5] = 6.0e-8 +ground.station.clock.offset.min [5] = -0.001 +ground.station.clock.offset.max [5] = +0.001 +ground.station.clock.offset.estimated [5] = true ground.station.range.sigma [5] = 1.0 -ground.station.range.bias [5] = -17.0 +ground.station.range.bias [5] = 0.0 ground.station.range.bias.min [5] = -1000.0 ground.station.range.bias.max [5] = +1000.0 ground.station.range.bias.estimated [5] = false @@ -315,8 +345,12 @@ ground.station.latitude [6] = 29.868112727 ground.station.longitude [6] = -89.673232869 ground.station.altitude [6] = -14.853146 ground.station.position.estimated [6] = false +ground.station.clock.offset [6] = 2.0e-8 +ground.station.clock.offset.min [6] = -0.001 +ground.station.clock.offset.max [6] = +0.001 +ground.station.clock.offset.estimated [6] = true ground.station.range.sigma [6] = 1.0 -ground.station.range.bias [6] = -5.0 +ground.station.range.bias [6] = 0.0 ground.station.range.bias.min [6] = -1000.0 ground.station.range.bias.max [6] = +1000.0 ground.station.range.bias.estimated [6] = false @@ -347,8 +381,12 @@ ground.station.latitude [7] = 29.868112727 ground.station.longitude [7] = -89.673232869 ground.station.altitude [7] = -14.853146 ground.station.position.estimated [7] = false +ground.station.clock.offset [7] = 1.0e-8 +ground.station.clock.offset.min [7] = -0.001 +ground.station.clock.offset.max [7] = +0.001 +ground.station.clock.offset.estimated [7] = true ground.station.range.sigma [7] = 1.0 -ground.station.range.bias [7] = -3.0 +ground.station.range.bias [7] = 0.0 ground.station.range.bias.min [7] = -1000.0 ground.station.range.bias.max [7] = +1000.0 ground.station.range.bias.estimated [7] = false @@ -379,8 +417,12 @@ ground.station.latitude [8] = 29.868112727 ground.station.longitude [8] = -89.673232869 ground.station.altitude [8] = -14.853146 ground.station.position.estimated [8] = false +ground.station.clock.offset [8] = 1.0e-8 +ground.station.clock.offset.min [8] = -0.001 +ground.station.clock.offset.max [8] = +0.001 +ground.station.clock.offset.estimated [8] = true ground.station.range.sigma [8] = 1.0 -ground.station.range.bias [8] = -3.0 +ground.station.range.bias [8] = 0.0 ground.station.range.bias.min [8] = -1000.0 ground.station.range.bias.max [8] = +1000.0 ground.station.range.bias.estimated [8] = false @@ -411,8 +453,12 @@ ground.station.latitude [9] = 42.520093759 ground.station.longitude [9] = -83.756648765 ground.station.altitude [9] = 262.449442 ground.station.position.estimated [9] = false +ground.station.clock.offset [9] = 1.0e-8 +ground.station.clock.offset.min [9] = -0.001 +ground.station.clock.offset.max [9] = +0.001 +ground.station.clock.offset.estimated [9] = true ground.station.range.sigma [9] = 1.0 -ground.station.range.bias [9] = -4.0 +ground.station.range.bias [9] = 0.0 ground.station.range.bias.min [9] = -1000.0 ground.station.range.bias.max [9] = +1000.0 ground.station.range.bias.estimated [9] = false @@ -443,6 +489,10 @@ ground.station.latitude [10] = 42.520093759 ground.station.longitude [10] = -83.756648765 ground.station.altitude [10] = 262.449442 ground.station.position.estimated [10] = false +ground.station.clock.offset [10] = 0.0 +ground.station.clock.offset.min [10] = -0.001 +ground.station.clock.offset.max [10] = +0.001 +ground.station.clock.offset.estimated [10] = true ground.station.range.sigma [10] = 1.0 ground.station.range.bias [10] = 0.0 ground.station.range.bias.min [10] = -1000.0 @@ -475,8 +525,12 @@ ground.station.latitude [11] = 42.520093759 ground.station.longitude [11] = -83.756648765 ground.station.altitude [11] = 262.449442 ground.station.position.estimated [11] = false +ground.station.clock.offset [11] = 4.0e-8 +ground.station.clock.offset.min [11] = -0.001 +ground.station.clock.offset.max [11] = +0.001 +ground.station.clock.offset.estimated [11] = true ground.station.range.sigma [11] = 1.0 -ground.station.range.bias [11] = -12.0 +ground.station.range.bias [11] = 0.0 ground.station.range.bias.min [11] = -1000.0 ground.station.range.bias.max [11] = +1000.0 ground.station.range.bias.estimated [11] = false @@ -507,8 +561,12 @@ ground.station.latitude [12] = 35.107490239 ground.station.longitude [12] = -114.604973036 ground.station.altitude [12] = 152.410214 ground.station.position.estimated [12] = false +ground.station.clock.offset [12] = 1.0e-8 +ground.station.clock.offset.min [12] = -0.001 +ground.station.clock.offset.max [12] = +0.001 +ground.station.clock.offset.estimated [12] = true ground.station.range.sigma [12] = 1.0 -ground.station.range.bias [12] = -3.0 +ground.station.range.bias [12] = 0.0 ground.station.range.bias.min [12] = -1000.0 ground.station.range.bias.max [12] = +1000.0 ground.station.range.bias.estimated [12] = false @@ -539,6 +597,10 @@ ground.station.latitude [13] = 35.107490239 ground.station.longitude [13] = -114.604973036 ground.station.altitude [13] = 152.410214 ground.station.position.estimated [13] = false +ground.station.clock.offset [13] = 0.0 +ground.station.clock.offset.min [13] = -0.001 +ground.station.clock.offset.max [13] = +0.001 +ground.station.clock.offset.estimated [13] = true ground.station.range.sigma [13] = 1.0 ground.station.range.bias [13] = 0.0 ground.station.range.bias.min [13] = -1000.0 @@ -571,8 +633,12 @@ ground.station.latitude [14] = 35.107490239 ground.station.longitude [14] = -114.604973036 ground.station.altitude [14] = 152.410214 ground.station.position.estimated [14] = false +ground.station.clock.offset [14] = 2.0e-8 +ground.station.clock.offset.min [14] = -0.001 +ground.station.clock.offset.max [14] = +0.001 +ground.station.clock.offset.estimated [14] = true ground.station.range.sigma [14] = 1.0 -ground.station.range.bias [14] = -5.0 +ground.station.range.bias [14] = 0.0 ground.station.range.bias.min [14] = -1000.0 ground.station.range.bias.max [14] = +1000.0 ground.station.range.bias.estimated [14] = false diff --git a/src/test/resources/orbit-determination/Lageos2/od_test_Lageos2.in b/src/test/resources/orbit-determination/Lageos2/od_test_Lageos2.in index cd5aca89619c77955d11c93a523332e2f298ad89..484e24d678e20c2d2738fc7b8734fa16d65a1b1d 100644 --- a/src/test/resources/orbit-determination/Lageos2/od_test_Lageos2.in +++ b/src/test/resources/orbit-determination/Lageos2/od_test_Lageos2.in @@ -120,6 +120,12 @@ on.board.antenna.phase.center.x = 0.0 on.board.antenna.phase.center.y = 0.0 on.board.antenna.phase.center.z = 0.0 +## On-board clock offset (s) [0.0] +on.board.clock.offset = 0.0 +on.board.clock.offset.min = -0.01 +on.board.clock.offset.max = +0.01 +on.board.clock.offset.estimated = false + ## correction of ground stations displacements (true/false) [false, false, false] ## if remove.permanent.deformation if true, the station coordinates are ## considered *mean tide* and already include the permanent deformation, hence @@ -135,6 +141,10 @@ ground.station.name [0] = YARL ground.station.latitude [0] = -29.046495 ground.station.longitude [0] = 115.346744 ground.station.altitude [0] = 245.088103 +ground.station.clock.offset [0] = 0.0 +ground.station.clock.offset.min [0] = -0.001 +ground.station.clock.offset.max [0] = +0.001 +ground.station.clock.offset.estimated [0] = false ground.station.position.estimated [0] = true ground.station.range.sigma [0] = 20.0 ground.station.range.bias [0] = 0.0 @@ -167,6 +177,10 @@ ground.station.name [1] = GODL ground.station.latitude [1] = 39.020605 ground.station.longitude [1] = 283.172305 ground.station.altitude [1] = 19.882672 +ground.station.clock.offset [1] = 0.0 +ground.station.clock.offset.min [1] = -0.001 +ground.station.clock.offset.max [1] = +0.001 +ground.station.clock.offset.estimated [1] = false ground.station.position.estimated [1] = false ground.station.range.sigma [1] = 20.0 ground.station.range.bias [1] = 0.0 @@ -199,6 +213,10 @@ ground.station.name [2] = HA4T ground.station.latitude [2] = 20.706489 ground.station.longitude [2] = 203.743079 ground.station.altitude [2] = 3056.971459 +ground.station.clock.offset [2] = 0.0 +ground.station.clock.offset.min [2] = -0.001 +ground.station.clock.offset.max [2] = +0.001 +ground.station.clock.offset.estimated [2] = false ground.station.position.estimated [2] = false ground.station.range.sigma [2] = 20.0 ground.station.range.bias [2] = 0.0 @@ -231,6 +249,10 @@ ground.station.name [3] = SISL ground.station.latitude [3] = 33.577694 ground.station.longitude [3] = 135.937039 ground.station.altitude [3] = 102.317142 +ground.station.clock.offset [3] = 0.0 +ground.station.clock.offset.min [3] = -0.001 +ground.station.clock.offset.max [3] = +0.001 +ground.station.clock.offset.estimated [3] = false ground.station.position.estimated [3] = false ground.station.range.sigma [3] = 20.0 ground.station.range.bias [3] = 0.0 diff --git a/src/test/resources/orbit-determination/W3B/od_test_W3.in b/src/test/resources/orbit-determination/W3B/od_test_W3.in index 3bfe53e6d65f290ead26121cad4af5dc1056da9c..5c89c9e222a8efe200569a66f36c0a78f0d2aca3 100644 --- a/src/test/resources/orbit-determination/W3B/od_test_W3.in +++ b/src/test/resources/orbit-determination/W3B/od_test_W3.in @@ -176,6 +176,12 @@ on.board.antenna.phase.center.x = 0.0 on.board.antenna.phase.center.y = 0.0 on.board.antenna.phase.center.z = 0.0 +## On-board clock offset (s) [0.0] +on.board.clock.offset = 0.0 +on.board.clock.offset.min = -0.01 +on.board.clock.offset.max = +0.01 +on.board.clock.offset.estimated = false + ## correction of ground stations displacements (true/false) [false, false, false] ## if remove.permanent.deformation if true, the station coordinates are ## considered *mean tide* and already include the permanent deformation, hence @@ -191,6 +197,10 @@ ground.station.name [0] = Fucino ground.station.latitude [0] = 41.9774962512 ground.station.longitude [0] = 13.6004229863 ground.station.altitude [0] = 671.3542005921 +ground.station.clock.offset [0] = 0.0 +ground.station.clock.offset.min [0] = -0.001 +ground.station.clock.offset.max [0] = +0.001 +ground.station.clock.offset.estimated [0] = false ground.station.position.estimated [0] = false ground.station.range.sigma [0] = 20.0 ground.station.range.bias [0] = 13468.956 @@ -223,6 +233,10 @@ ground.station.name [1] = Kumsan ground.station.latitude [1] = 36.1247623774 ground.station.longitude [1] = 127.4871671976 ground.station.altitude [1] = 180.5488660489 +ground.station.clock.offset [1] = 0.0 +ground.station.clock.offset.min [1] = -0.001 +ground.station.clock.offset.max [1] = +0.001 +ground.station.clock.offset.estimated [1] = false ground.station.position.estimated [1] = false ground.station.range.sigma [1] = 20.0 ground.station.range.bias [1] = 13527.381 @@ -255,6 +269,10 @@ ground.station.name [2] = Uralla ground.station.latitude [2] = -30.632947613 ground.station.longitude [2] = 151.5650529068 ground.station.altitude [2] = 1163.2667864364 +ground.station.clock.offset [2] = 0.0 +ground.station.clock.offset.min [2] = -0.001 +ground.station.clock.offset.max [2] = +0.001 +ground.station.clock.offset.estimated [2] = false ground.station.position.estimated [2] = false ground.station.range.sigma [2] = 20.0 ground.station.range.bias [2] = 13314.655 @@ -287,6 +305,10 @@ ground.station.name [3] = Pretoria ground.station.latitude [3] = -25.8854896226 ground.station.longitude [3] = 27.7074493158 ground.station.altitude [3] = 1566.6334663324 +ground.station.clock.offset [3] = 0.0 +ground.station.clock.offset.min [3] = -0.001 +ground.station.clock.offset.max [3] = +0.001 +ground.station.clock.offset.estimated [3] = false ground.station.position.estimated [3] = false ground.station.range.sigma [3] = 20.0 ground.station.range.bias [3] = 13370.193 @@ -319,6 +341,10 @@ ground.station.name [4] = CastleRock ground.station.latitude [4] = 39.2764477379 ground.station.longitude [4] = -104.8063531025 ground.station.altitude [4] = 2095.3769797949 +ground.station.clock.offset [4] = 0.0 +ground.station.clock.offset.min [4] = -0.001 +ground.station.clock.offset.max [4] = +0.001 +ground.station.clock.offset.estimated [4] = false ground.station.position.estimated [4] = false ground.station.range.sigma [4] = 20.0 ground.station.range.bias [4] = 11473.623 diff --git a/src/tutorials/java/fr/cs/examples/KeyValueFileParser.java b/src/tutorials/java/fr/cs/examples/KeyValueFileParser.java index ca5ab1995ce29f842ae73ef46b70c98a2cf1b104..14b343465dcc80e5910a1795239a1dfa2794ff44 100644 --- a/src/tutorials/java/fr/cs/examples/KeyValueFileParser.java +++ b/src/tutorials/java/fr/cs/examples/KeyValueFileParser.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/attitude/EarthObservation.java b/src/tutorials/java/fr/cs/examples/attitude/EarthObservation.java index 50019b84f0f281e27152ad0fddeabf24be42b51a..c41befbef478af22ea2e5771647b0d1423c53531 100644 --- a/src/tutorials/java/fr/cs/examples/attitude/EarthObservation.java +++ b/src/tutorials/java/fr/cs/examples/attitude/EarthObservation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/DEFile.java b/src/tutorials/java/fr/cs/examples/bodies/DEFile.java index 6e2dfe623127e92ffef2e57c5b103f08b7485722..b004e8b54935c77dc67fa321f125837cc91bd223 100644 --- a/src/tutorials/java/fr/cs/examples/bodies/DEFile.java +++ b/src/tutorials/java/fr/cs/examples/bodies/DEFile.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/bodies/Phasing.java b/src/tutorials/java/fr/cs/examples/bodies/Phasing.java index 3aa190d6474808775678c0bb8561df6b076e7adf..c31db345c625d0e6d5878a4ba8c3b2cb245aa6f3 100644 --- a/src/tutorials/java/fr/cs/examples/bodies/Phasing.java +++ b/src/tutorials/java/fr/cs/examples/bodies/Phasing.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/conversion/PropagatorConversion.java b/src/tutorials/java/fr/cs/examples/conversion/PropagatorConversion.java index 3f10e745f248944d02cf2e7a9e884cd6674d7a1f..0695aa0e43070f79d43ccfbca4c1635fbb74778a 100644 --- a/src/tutorials/java/fr/cs/examples/conversion/PropagatorConversion.java +++ b/src/tutorials/java/fr/cs/examples/conversion/PropagatorConversion.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/estimation/OrbitDetermination.java b/src/tutorials/java/fr/cs/examples/estimation/OrbitDetermination.java index 6c296df5d2009a44da640ec7c2c848ee31c5e395..def0561f3838dc88713e8fd48220daaa2dad4f01 100644 --- a/src/tutorials/java/fr/cs/examples/estimation/OrbitDetermination.java +++ b/src/tutorials/java/fr/cs/examples/estimation/OrbitDetermination.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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. @@ -68,6 +68,7 @@ import org.orekit.estimation.measurements.AngularAzEl; import org.orekit.estimation.measurements.EstimatedMeasurement; import org.orekit.estimation.measurements.EstimationsProvider; import org.orekit.estimation.measurements.GroundStation; +import org.orekit.estimation.measurements.ObservableSatellite; import org.orekit.estimation.measurements.ObservedMeasurement; import org.orekit.estimation.measurements.PV; import org.orekit.estimation.measurements.Range; @@ -252,6 +253,7 @@ public class OrbitDetermination { final Map<String, StationData> stations = createStationsData(parser, conventions, body); final PVData pvData = createPVData(parser); + final ObservableSatellite satellite = createObservableSatellite(parser); final Bias<Range> satRangeBias = createSatRangeBias(parser); final OnBoardAntennaRangeModifier satAntennaRangeModifier = createSatAntennaRangeModifier(parser); final Weights weights = createWeights(parser); @@ -268,12 +270,13 @@ public class OrbitDetermination { // the measurements come from a Rinex file measurements.addAll(readRinex(new File(input.getParentFile(), fileName), parser.getString(ParameterKey.SATELLITE_ID_IN_RINEX_FILES), - stations, satRangeBias, satAntennaRangeModifier, weights, + stations, satellite, satRangeBias, satAntennaRangeModifier, weights, rangeOutliersManager, rangeRateOutliersManager)); } else { // the measurements come from an Orekit custom file measurements.addAll(readMeasurements(new File(input.getParentFile(), fileName), - stations, pvData, satRangeBias, satAntennaRangeModifier, weights, + stations, pvData, satellite, + satRangeBias, satAntennaRangeModifier, weights, rangeOutliersManager, rangeRateOutliersManager, azElOutliersManager, @@ -936,6 +939,10 @@ public class OrbitDetermination { final double[] stationLongitudes = parser.getAngleArray(ParameterKey.GROUND_STATION_LONGITUDE); final double[] stationAltitudes = parser.getDoubleArray(ParameterKey.GROUND_STATION_ALTITUDE); final boolean[] stationPositionEstimated = parser.getBooleanArray(ParameterKey.GROUND_STATION_POSITION_ESTIMATED); + final double[] stationClockOffsets = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET); + final double[] stationClockOffsetsMin = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_MIN); + final double[] stationClockOffsetsMax = parser.getDoubleArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_MAX); + final boolean[] stationClockOffsetEstimated = parser.getBooleanArray(ParameterKey.GROUND_STATION_CLOCK_OFFSET_ESTIMATED); final double[] stationRangeSigma = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_SIGMA); final double[] stationRangeBias = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_BIAS); final double[] stationRangeBiasMin = parser.getDoubleArray(ParameterKey.GROUND_STATION_RANGE_BIAS_MIN); @@ -1024,6 +1031,11 @@ public class OrbitDetermination { stationAltitudes[i]); final TopocentricFrame topo = new TopocentricFrame(body, position, stationNames[i]); final GroundStation station = new GroundStation(topo, eopHistory, displacements); + station.getClockOffsetDriver().setReferenceValue(stationClockOffsets[i]); + station.getClockOffsetDriver().setValue(stationClockOffsets[i]); + station.getClockOffsetDriver().setMinValue(stationClockOffsetsMin[i]); + station.getClockOffsetDriver().setMaxValue(stationClockOffsetsMax[i]); + station.getClockOffsetDriver().setSelected(stationClockOffsetEstimated[i]); station.getEastOffsetDriver().setSelected(stationPositionEstimated[i]); station.getNorthOffsetDriver().setSelected(stationPositionEstimated[i]); station.getZenithOffsetDriver().setSelected(stationPositionEstimated[i]); @@ -1254,6 +1266,31 @@ public class OrbitDetermination { parser.getDouble(ParameterKey.PV_MEASUREMENTS_VELOCITY_SIGMA)); } + /** Set up satellite data. + * @param parser input file parser + * @return satellite data + * @throws NoSuchElementException if input parameters are missing + */ + private ObservableSatellite createObservableSatellite(final KeyValueFileParser<ParameterKey> parser) + throws NoSuchElementException { + ObservableSatellite obsSat = new ObservableSatellite(0); + ParameterDriver clockOffsetDriver = obsSat.getClockOffsetDriver(); + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET)) { + clockOffsetDriver.setReferenceValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET)); + clockOffsetDriver.setValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_MIN)) { + clockOffsetDriver.setMinValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET_MIN)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_MAX)) { + clockOffsetDriver.setMaxValue(parser.getDouble(ParameterKey.ON_BOARD_CLOCK_OFFSET_MAX)); + } + if (parser.containsKey(ParameterKey.ON_BOARD_CLOCK_OFFSET_ESTIMATED)) { + clockOffsetDriver.setSelected(parser.getBoolean(ParameterKey.ON_BOARD_CLOCK_OFFSET_ESTIMATED)); + } + return obsSat; + } + /** Set up estimator. * @param parser input file parser * @param propagatorBuilder propagator builder @@ -1320,6 +1357,7 @@ public class OrbitDetermination { * @param file measurements file * @param satId satellite we are interested in * @param stations name to stations data map + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param satAntennaRangeModifier modifier for on-board antenna offset * @param weights base weights for measurements @@ -1329,6 +1367,7 @@ public class OrbitDetermination { */ private List<ObservedMeasurement<?>> readRinex(final File file, final String satId, final Map<String, StationData> stations, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final OnBoardAntennaRangeModifier satAntennaRangeModifier, final Weights weights, @@ -1365,9 +1404,9 @@ public class OrbitDetermination { throw new OrekitException(LocalizedCoreFormats.SIMPLE_MESSAGE, stationName + " not configured"); } - Range range = new Range(stationData.station, observationDataSet.getDate(), + Range range = new Range(stationData.station, false, observationDataSet.getDate(), od.getValue(), stationData.rangeSigma, - weights.rangeBaseWeight, false); + weights.rangeBaseWeight, satellite); range.addModifier(iono.getRangeModifier(od.getObservationType().getFrequency(system), observationDataSet.getDate())); if (satAntennaRangeModifier != null) { @@ -1394,7 +1433,7 @@ public class OrbitDetermination { } RangeRate rangeRate = new RangeRate(stationData.station, observationDataSet.getDate(), od.getValue(), stationData.rangeRateSigma, - weights.rangeRateBaseWeight, false); + weights.rangeRateBaseWeight, false, satellite); rangeRate.addModifier(iono.getRangeRateModifier(od.getObservationType().getFrequency(system), observationDataSet.getDate())); if (stationData.rangeRateBias != null) { @@ -1415,6 +1454,7 @@ public class OrbitDetermination { * @param file measurements file * @param stations name to stations data map * @param pvData PV measurements data + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param satAntennaRangeModifier modifier for on-board antenna offset * @param weights base weights for measurements @@ -1427,6 +1467,7 @@ public class OrbitDetermination { private List<ObservedMeasurement<?>> readMeasurements(final File file, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final OnBoardAntennaRangeModifier satAntennaRangeModifier, final Weights weights, @@ -1452,7 +1493,7 @@ public class OrbitDetermination { } switch (fields[1]) { case "RANGE" : - final Range range = new RangeParser().parseFields(fields, stations, pvData, + final Range range = new RangeParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (satAntennaRangeModifier != null) { @@ -1464,7 +1505,7 @@ public class OrbitDetermination { addIfNonZeroWeight(range, measurements); break; case "RANGE_RATE" : - final RangeRate rangeRate = new RangeRateParser().parseFields(fields, stations, pvData, + final RangeRate rangeRate = new RangeRateParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (rangeRateOutliersManager != null) { @@ -1473,16 +1514,16 @@ public class OrbitDetermination { addIfNonZeroWeight(rangeRate, measurements); break; case "AZ_EL" : - final AngularAzEl angular = new AzElParser().parseFields(fields, stations, pvData, - satRangeBias, weights, - line, lineNumber, file.getName()); + final AngularAzEl angular = new AzElParser().parseFields(fields, stations, pvData, satellite, + satRangeBias, weights, + line, lineNumber, file.getName()); if (azElOutliersManager != null) { angular.addModifier(azElOutliersManager); } addIfNonZeroWeight(angular, measurements); break; case "PV" : - final PV pv = new PVParser().parseFields(fields, stations, pvData, + final PV pv = new PVParser().parseFields(fields, stations, pvData, satellite, satRangeBias, weights, line, lineNumber, file.getName()); if (pvOutliersManager != null) { @@ -1648,6 +1689,7 @@ public class OrbitDetermination { * @param fields measurements line fields * @param stations name to stations data map * @param pvData PV measurements data + * @param satellite satellite reference * @param satRangeBias range bias due to transponder delay * @param weight base weights for measurements * @param line complete line @@ -1657,7 +1699,7 @@ public class OrbitDetermination { */ public abstract T parseFields(String[] fields, Map<String, StationData> stations, - PVData pvData, + PVData pvData, ObservableSatellite satellite, Bias<Range> satRangeBias, Weights weight, String line, int lineNumber, String fileName) ; @@ -1730,19 +1772,20 @@ public class OrbitDetermination { public Range parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(4, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); - final Range range = new Range(stationData.station, + final Range range = new Range(stationData.station, true, getDate(fields[0], line, lineNumber, fileName), Double.parseDouble(fields[3]) * 1000.0, stationData.rangeSigma, - weights.rangeBaseWeight); + weights.rangeBaseWeight, + satellite); if (stationData.rangeBias != null) { range.addModifier(stationData.rangeBias); } @@ -1763,12 +1806,12 @@ public class OrbitDetermination { public RangeRate parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(4, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); final RangeRate rangeRate = new RangeRate(stationData.station, @@ -1776,7 +1819,7 @@ public class OrbitDetermination { Double.parseDouble(fields[3]) * 1000.0, stationData.rangeRateSigma, weights.rangeRateBaseWeight, - true); + true, satellite); if (stationData.rangeRateBias != null) { rangeRate.addModifier(stationData.rangeRateBias); } @@ -1791,22 +1834,23 @@ public class OrbitDetermination { public AngularAzEl parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { checkFields(5, fields, line, lineNumber, fileName); final StationData stationData = getStationData(fields[2], stations, line, lineNumber, fileName); final AngularAzEl azEl = new AngularAzEl(stationData.station, - getDate(fields[0], line, lineNumber, fileName), - new double[] { + getDate(fields[0], line, lineNumber, fileName), + new double[] { FastMath.toRadians(Double.parseDouble(fields[3])), FastMath.toRadians(Double.parseDouble(fields[4])) }, - stationData.azElSigma, - weights.azElBaseWeight); + stationData.azElSigma, + weights.azElBaseWeight, + satellite); if (stationData.refractionCorrection != null) { azEl.addModifier(stationData.refractionCorrection); } @@ -1824,12 +1868,12 @@ public class OrbitDetermination { public PV parseFields(final String[] fields, final Map<String, StationData> stations, final PVData pvData, + final ObservableSatellite satellite, final Bias<Range> satRangeBias, final Weights weights, final String line, final int lineNumber, - final String fileName) - { + final String fileName) { // field 2, which corresponds to stations in other measurements, is ignored // this allows the measurements files to be columns aligned // by inserting something like "----" instead of a station name @@ -1843,7 +1887,8 @@ public class OrbitDetermination { Double.parseDouble(fields[8]) * 1000.0), pvData.positionSigma, pvData.velocitySigma, - weights.pvBaseWeight); + weights.pvBaseWeight, + satellite); } }; @@ -2461,10 +2506,18 @@ public class OrbitDetermination { ON_BOARD_ANTENNA_PHASE_CENTER_X, ON_BOARD_ANTENNA_PHASE_CENTER_Y, ON_BOARD_ANTENNA_PHASE_CENTER_Z, + ON_BOARD_CLOCK_OFFSET, + ON_BOARD_CLOCK_OFFSET_MIN, + ON_BOARD_CLOCK_OFFSET_MAX, + ON_BOARD_CLOCK_OFFSET_ESTIMATED, GROUND_STATION_NAME, GROUND_STATION_LATITUDE, GROUND_STATION_LONGITUDE, GROUND_STATION_ALTITUDE, + GROUND_STATION_CLOCK_OFFSET, + GROUND_STATION_CLOCK_OFFSET_MIN, + GROUND_STATION_CLOCK_OFFSET_MAX, + GROUND_STATION_CLOCK_OFFSET_ESTIMATED, GROUND_STATION_POSITION_ESTIMATED, GROUND_STATION_TROPOSPHERIC_MODEL_ESTIMATED, GROUND_STATION_TROPOSPHERIC_ZENITH_DELAY, diff --git a/src/tutorials/java/fr/cs/examples/frames/Frames1.java b/src/tutorials/java/fr/cs/examples/frames/Frames1.java index fcb794d875d63f41b712a63b55ad1cbd4e36c0d7..1ad9fe229bca25b462bf217a97857e11cfce75a4 100644 --- a/src/tutorials/java/fr/cs/examples/frames/Frames1.java +++ b/src/tutorials/java/fr/cs/examples/frames/Frames1.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/Frames2.java b/src/tutorials/java/fr/cs/examples/frames/Frames2.java index c0c7942e70d068cfba0ea482c723430c6be91a23..0ba025c7d34bb258d66e75ff74780b9ba6521e71 100644 --- a/src/tutorials/java/fr/cs/examples/frames/Frames2.java +++ b/src/tutorials/java/fr/cs/examples/frames/Frames2.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/frames/Frames3.java b/src/tutorials/java/fr/cs/examples/frames/Frames3.java index bbb62f3d93a59218436b7bd4863a535fb440f481..3753954a43b2a463e0e92c3d0e908f7d98289ab5 100644 --- a/src/tutorials/java/fr/cs/examples/frames/Frames3.java +++ b/src/tutorials/java/fr/cs/examples/frames/Frames3.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/gnss/DOPComputation.java b/src/tutorials/java/fr/cs/examples/gnss/DOPComputation.java index be4bd0ead718546cfcbef2b289cef54407b5e4d0..3d0ead48a17c660463dec0eea0fdd2c1ff40769e 100644 --- a/src/tutorials/java/fr/cs/examples/gnss/DOPComputation.java +++ b/src/tutorials/java/fr/cs/examples/gnss/DOPComputation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/DSSTPropagation.java b/src/tutorials/java/fr/cs/examples/propagation/DSSTPropagation.java index 6b4d79851c67f956c14de1848e583a71f019b7c2..feec9bbc5b7eb614c63d8cec611aadce13cee90b 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/DSSTPropagation.java +++ b/src/tutorials/java/fr/cs/examples/propagation/DSSTPropagation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/EphemerisMode.java b/src/tutorials/java/fr/cs/examples/propagation/EphemerisMode.java index 3a646d59a749d2303bceb06027b8f9dd4811a3a5..e2cd3c5d2b1cafe3bc6f21d2428ba266a6f5b076 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/EphemerisMode.java +++ b/src/tutorials/java/fr/cs/examples/propagation/EphemerisMode.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/FieldPropagation.java b/src/tutorials/java/fr/cs/examples/propagation/FieldPropagation.java index 246262b89fa59865b25a98585124fe7088944bc7..97f4319a32db4c5094bc30aecd2953f4d095c258 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/FieldPropagation.java +++ b/src/tutorials/java/fr/cs/examples/propagation/FieldPropagation.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/MasterMode.java b/src/tutorials/java/fr/cs/examples/propagation/MasterMode.java index 5b4892690997c8e6cd52a15177f62c27b051a4cb..d05f6cfef56f843d74c762902589fe2728e31f48 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/MasterMode.java +++ b/src/tutorials/java/fr/cs/examples/propagation/MasterMode.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/SlaveMode.java b/src/tutorials/java/fr/cs/examples/propagation/SlaveMode.java index 02742dd5f7218561d0fd010743f316f9f48081b4..66f08124adce1dcce287131327b45d7b69d6cbb9 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/SlaveMode.java +++ b/src/tutorials/java/fr/cs/examples/propagation/SlaveMode.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/TrackCorridor.java b/src/tutorials/java/fr/cs/examples/propagation/TrackCorridor.java index 7942fc4bba030f83d807810c2dc73a2ede38adb2..bb1a3489800a1c063bee363010818a9cf2a55da1 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/TrackCorridor.java +++ b/src/tutorials/java/fr/cs/examples/propagation/TrackCorridor.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/VisibilityCheck.java b/src/tutorials/java/fr/cs/examples/propagation/VisibilityCheck.java index 341cdbb2ec27f7ea063ef41b99771aa55b9e8a1e..8da480655270b7c904ca632dd456c77179f6180f 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/VisibilityCheck.java +++ b/src/tutorials/java/fr/cs/examples/propagation/VisibilityCheck.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/propagation/VisibilityCircle.java b/src/tutorials/java/fr/cs/examples/propagation/VisibilityCircle.java index 65ac41b013b91c4e0af0a1d33a1a9dcb32a5543f..6cbd81ae718a7f7d1160e58328ffdb46a33fec09 100644 --- a/src/tutorials/java/fr/cs/examples/propagation/VisibilityCircle.java +++ b/src/tutorials/java/fr/cs/examples/propagation/VisibilityCircle.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/time/Time1.java b/src/tutorials/java/fr/cs/examples/time/Time1.java index 8343ad6a1941ad7fb171dd43dea74c22c218df9c..8991920a02d4abb2f6a9d552cb1c7f40af670d92 100644 --- a/src/tutorials/java/fr/cs/examples/time/Time1.java +++ b/src/tutorials/java/fr/cs/examples/time/Time1.java @@ -1,4 +1,4 @@ -/* Copyright 2002-2018 CS Systèmes d'Information +/* Copyright 2002-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/resources/orbit-determination.in b/src/tutorials/resources/orbit-determination.in index 3bfe53e6d65f290ead26121cad4af5dc1056da9c..5c89c9e222a8efe200569a66f36c0a78f0d2aca3 100644 --- a/src/tutorials/resources/orbit-determination.in +++ b/src/tutorials/resources/orbit-determination.in @@ -176,6 +176,12 @@ on.board.antenna.phase.center.x = 0.0 on.board.antenna.phase.center.y = 0.0 on.board.antenna.phase.center.z = 0.0 +## On-board clock offset (s) [0.0] +on.board.clock.offset = 0.0 +on.board.clock.offset.min = -0.01 +on.board.clock.offset.max = +0.01 +on.board.clock.offset.estimated = false + ## correction of ground stations displacements (true/false) [false, false, false] ## if remove.permanent.deformation if true, the station coordinates are ## considered *mean tide* and already include the permanent deformation, hence @@ -191,6 +197,10 @@ ground.station.name [0] = Fucino ground.station.latitude [0] = 41.9774962512 ground.station.longitude [0] = 13.6004229863 ground.station.altitude [0] = 671.3542005921 +ground.station.clock.offset [0] = 0.0 +ground.station.clock.offset.min [0] = -0.001 +ground.station.clock.offset.max [0] = +0.001 +ground.station.clock.offset.estimated [0] = false ground.station.position.estimated [0] = false ground.station.range.sigma [0] = 20.0 ground.station.range.bias [0] = 13468.956 @@ -223,6 +233,10 @@ ground.station.name [1] = Kumsan ground.station.latitude [1] = 36.1247623774 ground.station.longitude [1] = 127.4871671976 ground.station.altitude [1] = 180.5488660489 +ground.station.clock.offset [1] = 0.0 +ground.station.clock.offset.min [1] = -0.001 +ground.station.clock.offset.max [1] = +0.001 +ground.station.clock.offset.estimated [1] = false ground.station.position.estimated [1] = false ground.station.range.sigma [1] = 20.0 ground.station.range.bias [1] = 13527.381 @@ -255,6 +269,10 @@ ground.station.name [2] = Uralla ground.station.latitude [2] = -30.632947613 ground.station.longitude [2] = 151.5650529068 ground.station.altitude [2] = 1163.2667864364 +ground.station.clock.offset [2] = 0.0 +ground.station.clock.offset.min [2] = -0.001 +ground.station.clock.offset.max [2] = +0.001 +ground.station.clock.offset.estimated [2] = false ground.station.position.estimated [2] = false ground.station.range.sigma [2] = 20.0 ground.station.range.bias [2] = 13314.655 @@ -287,6 +305,10 @@ ground.station.name [3] = Pretoria ground.station.latitude [3] = -25.8854896226 ground.station.longitude [3] = 27.7074493158 ground.station.altitude [3] = 1566.6334663324 +ground.station.clock.offset [3] = 0.0 +ground.station.clock.offset.min [3] = -0.001 +ground.station.clock.offset.max [3] = +0.001 +ground.station.clock.offset.estimated [3] = false ground.station.position.estimated [3] = false ground.station.range.sigma [3] = 20.0 ground.station.range.bias [3] = 13370.193 @@ -319,6 +341,10 @@ ground.station.name [4] = CastleRock ground.station.latitude [4] = 39.2764477379 ground.station.longitude [4] = -104.8063531025 ground.station.altitude [4] = 2095.3769797949 +ground.station.clock.offset [4] = 0.0 +ground.station.clock.offset.min [4] = -0.001 +ground.station.clock.offset.max [4] = +0.001 +ground.station.clock.offset.estimated [4] = false ground.station.position.estimated [4] = false ground.station.range.sigma [4] = 20.0 ground.station.range.bias [4] = 11473.623