Skip to content
Snippets Groups Projects
Commit 685f5967 authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Merge branch 'luc' 

Conflicts:
	src/main/java/fr/cs/examples/estimation/MeasurementsGeneration.java
	src/main/resources/maxvalier.in
parents 37a49e2f 7802b2f9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
pom.xml
+ 101
− 55
View file @ 685f5967
......@@ -4,65 +4,111 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>orbitdetermination</groupId>
<artifactId>orbitdetermination</artifactId>
<groupId>org.orekit</groupId>
<artifactId>satnogs-orbit-determination</artifactId>
<version>1.0-SNAPSHOT</version>
<description>
Orbit determination improvements as part of the ESA Socis project 2019
- Author: Noel Janes
</description>
<developers>
<developer>
<name>Noel Janes</name>
<id>noeljanes</id>
<roles>
<role>developer</role>
</roles>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<satnogs.spotbugs-maven-plugin.version>3.1.12</satnogs.spotbugs-maven-plugin.version>
<satnogs.jacoco-maven-plugin.version>0.8.4</satnogs.jacoco-maven-plugin.version>
<satnogs.maven-assembly-plugin.version>3.1.1</satnogs.maven-assembly-plugin.version>
<satnogs.maven-bundle-plugin.version>4.2.0</satnogs.maven-bundle-plugin.version>
<satnogs.maven-changes-plugin.version>2.12.1</satnogs.maven-changes-plugin.version>
<satnogs.maven-checkstyle-plugin.version>3.1.0</satnogs.maven-checkstyle-plugin.version>
<satnogs.checkstyle.version>8.18</satnogs.checkstyle.version>
<satnogs.maven-clean-plugin.version>3.1.0</satnogs.maven-clean-plugin.version>
<satnogs.maven-compiler-plugin.version>3.8.1</satnogs.maven-compiler-plugin.version>
<satnogs.maven-javadoc-plugin.version>3.1.0</satnogs.maven-javadoc-plugin.version>
<satnogs.maven-jar-plugin.version>3.1.1</satnogs.maven-jar-plugin.version>
<satnogs.maven-jxr-plugin.version>3.0.0</satnogs.maven-jxr-plugin.version>
<satnogs.plantuml-maven-plugin.version>1.2</satnogs.plantuml-maven-plugin.version>
<satnogs.plantuml.version>1.2018.12</satnogs.plantuml.version>
<satnogs.maven-project-info-reports-plugin.version>3.0.0</satnogs.maven-project-info-reports-plugin.version>
<satnogs.maven-resources-plugin.version>3.1.0</satnogs.maven-resources-plugin.version>
<satnogs.maven-site-plugin.version>3.7.1</satnogs.maven-site-plugin.version>
<satnogs.maven-source-plugin.version>3.1.0</satnogs.maven-source-plugin.version>
<satnogs.maven-surefire-plugin.version>2.22.2</satnogs.maven-surefire-plugin.version>
<satnogs.maven-surefire-report-plugin.version>2.22.2</satnogs.maven-surefire-report-plugin.version>
<satnogs.mockito-core.version>2.28.2</satnogs.mockito-core.version>
<satnogs.jgit.buildnumber.version>1.2.10</satnogs.jgit.buildnumber.version>
<satnogs.build-helper-maven-plugin.version>3.0.0</satnogs.build-helper-maven-plugin.version>
<satnogs.nexus-staging-maven-plugin.version>1.6.8</satnogs.nexus-staging-maven-plugin.version>
<satnogs.maven-gpg-plugin.version>1.6</satnogs.maven-gpg-plugin.version>
<satnogs.maven-install-plugin.version>3.0.0-M1</satnogs.maven-install-plugin.version>
<satnogs.orekit.version>10.0</satnogs.orekit.version>
<satnogs.hipparchus.version>1.5</satnogs.hipparchus.version>
<satnogs.junit.version>4.12</satnogs.junit.version>
<satnog.compiler.source>1.8</satnog.compiler.source>
<satnog.compiler.target>1.8</satnog.compiler.target>
<satnogs.implementation.build>${git.revision}; ${maven.build.timestamp}</satnogs.implementation.build>
</properties>
<dependencies>
<dependency>
<groupId>org.orekit</groupId>
<artifactId>orekit</artifactId>
<version>10.0-SNAPSHOT</version>
<version>${satnogs.orekit.version}</version>
</dependency>
<dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-core</artifactId>
<version>1.5</version>
<version>${satnogs.hipparchus.version}</version>
<type>jar</type>
<optional>false</optional>
</dependency>
<dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-geometry</artifactId>
<version>1.5</version>
<version>${satnogs.hipparchus.version}</version>
</dependency>
<dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-ode</artifactId>
<version>1.5</version>
<version>${satnogs.hipparchus.version}</version>
<type>jar</type>
<optional>false</optional>
</dependency>
<dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-fitting</artifactId>
<version>1.5</version>
<version>${satnogs.hipparchus.version}</version>
<type>jar</type>
<optional>false</optional>
</dependency>
<dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-optim</artifactId>
<version>1.5</version>
<version>${satnogs.hipparchus.version}</version>
<type>jar</type>
<optional>false</optional>
</dependency>
<dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-filtering</artifactId>
<version>1.5</version>
<version>${satnogs.hipparchus.version}</version>
<type>jar</type>
<optional>false</optional>
</dependency>
<dependency>
<groupId>org.hipparchus</groupId>
<artifactId>hipparchus-stat</artifactId>
<version>1.5</version>
<version>${satnogs.hipparchus.version}</version>
</dependency>
</dependencies>
......@@ -72,16 +118,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${orekit.maven-compiler-plugin.version}</version>
<version>${satnogs.maven-compiler-plugin.version}</version>
<configuration>
<source>${orekit.compiler.source}</source>
<target>${orekit.compiler.target}</target>
<source>${satnog.compiler.source}</source>
<target>${satnog.compiler.target}</target>
<compilerArgument>-Xlint:deprecation</compilerArgument>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${orekit.maven-assembly-plugin.version}</version>
<version>${satnogs.maven-assembly-plugin.version}</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/source-jar-assembly.xml</descriptor>
......@@ -92,7 +138,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${orekit.maven-bundle-plugin.version}</version>
<version>${satnogs.maven-bundle-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<archive>
......@@ -117,7 +163,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${orekit.maven-resources-plugin.version}</version>
<version>${satnogs.maven-resources-plugin.version}</version>
<executions>
<execution>
<phase>process-resources</phase>
......@@ -142,32 +188,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${orekit.maven-clean-plugin.version}</version>
<version>${satnogs.maven-clean-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${orekit.maven-site-plugin.version}</version>
<version>${satnogs.maven-site-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${orekit.maven-surefire-plugin.version}</version>
<version>${satnogs.maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>${orekit.maven-changes-plugin.version}</version>
<version>${satnogs.maven-changes-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${orekit.maven-jxr-plugin.version}</version>
<version>${satnogs.maven-jxr-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${orekit.maven-javadoc-plugin.version}</version>
<version>${satnogs.maven-javadoc-plugin.version}</version>
<configuration>
<overview>${basedir}/src/main/java/org/orekit/overview.html</overview>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Syst&egrave;mes d&apos;information</a>. All rights reserved.]]></bottom>
......@@ -175,13 +221,13 @@
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://www.hipparchus.org/apidocs/</link>
</links>
<source>${orekit.compiler.source}</source>
<source>${satnog.compiler.source}</source>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${orekit.jacoco-maven-plugin.version}</version>
<version>${satnogs.jacoco-maven-plugin.version}</version>
<executions>
<execution>
<id>prepare-agent</id>
......@@ -261,7 +307,7 @@
<plugin>
<groupId>com.github.jeluard</groupId>
<artifactId>plantuml-maven-plugin</artifactId>
<version>${orekit.plantuml-maven-plugin.version}</version>
<version>${satnogs.plantuml-maven-plugin.version}</version>
<configuration>
<sourceFiles>
<directory>${basedir}/src/design</directory>
......@@ -279,7 +325,7 @@
<dependency>
<groupId>net.sourceforge.plantuml</groupId>
<artifactId>plantuml</artifactId>
<version>${orekit.plantuml.version}</version>
<version>${satnogs.plantuml.version}</version>
</dependency>
</dependencies>
<executions>
......@@ -294,13 +340,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${orekit.maven-jar-plugin.version}</version>
<version>${satnogs.maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
<manifestEntries>
<X-Compile-Source-JDK>${orekit.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${orekit.compiler.target}</X-Compile-Target-JDK>
<X-Compile-Source-JDK>${satnog.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${satnog.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
......@@ -308,12 +354,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${orekit.maven-checkstyle-plugin.version}</version>
<version>${satnogs.maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${orekit.checkstyle.version}</version>
<version>${satnogs.checkstyle.version}</version>
</dependency>
</dependencies>
<configuration>
......@@ -330,17 +376,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${orekit.maven-site-plugin.version}</version>
<version>${satnogs.maven-site-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${orekit.maven-project-info-reports-plugin.version}</version>
<version>${satnogs.maven-project-info-reports-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${orekit.spotbugs-maven-plugin.version}</version>
<version>${satnogs.spotbugs-maven-plugin.version}</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
......@@ -350,17 +396,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${orekit.maven-surefire-plugin.version}</version>
<version>${satnogs.maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${orekit.maven-surefire-report-plugin.version}</version>
<version>${satnogs.maven-surefire-report-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${orekit.maven-checkstyle-plugin.version}</version>
<version>${satnogs.maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
......@@ -377,7 +423,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>${orekit.maven-changes-plugin.version}</version>
<version>${satnogs.maven-changes-plugin.version}</version>
<configuration>
<teamlist>team.html</teamlist>
</configuration>
......@@ -392,7 +438,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${orekit.maven-jxr-plugin.version}</version>
<version>${satnogs.maven-jxr-plugin.version}</version>
<configuration>
<linkJavadoc>false</linkJavadoc>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Syst&egrave;mes d&apos;information</a>. All rights reserved.]]></bottom>
......@@ -401,7 +447,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${orekit.maven-javadoc-plugin.version}</version>
<version>${satnogs.maven-javadoc-plugin.version}</version>
<configuration>
<overview>${basedir}/src/main/java/org/orekit/overview.html</overview>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Syst&egrave;mes d&apos;information</a>. All rights reserved.]]></bottom>
......@@ -409,7 +455,7 @@
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://www.hipparchus.org/apidocs/</link>
</links>
<source>${orekit.compiler.source}</source>
<source>${satnog.compiler.source}</source>
</configuration>
<reportSets>
<reportSet>
......@@ -422,7 +468,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${orekit.jacoco-maven-plugin.version}</version>
<version>${satnogs.jacoco-maven-plugin.version}</version>
</plugin>
</plugins>
</reporting>
......@@ -440,7 +486,7 @@
<plugin>
<groupId>ru.concerteza.buildnumber</groupId>
<artifactId>maven-jgit-buildnumber-plugin</artifactId>
<version>${orekit.jgit.buildnumber.version}</version>
<version>${satnogs.jgit.buildnumber.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
......@@ -453,14 +499,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${orekit.maven-jar-plugin.version}</version>
<version>${satnogs.maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
<manifestEntries>
<Implementation-Build>${orekit.implementation.build}</Implementation-Build>
<X-Compile-Source-JDK>${orekit.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${orekit.compiler.target}</X-Compile-Target-JDK>
<Implementation-Build>${satnogs.implementation.build}</Implementation-Build>
<X-Compile-Source-JDK>${satnog.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${satnog.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
......@@ -475,7 +521,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${orekit.maven-source-plugin.version}</version>
<version>${satnogs.maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
......@@ -488,7 +534,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${orekit.maven-javadoc-plugin.version}</version>
<version>${satnogs.maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
......@@ -501,7 +547,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${orekit.nexus-staging-maven-plugin.version}</version>
<version>${satnogs.nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
......@@ -512,7 +558,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${orekit.build-helper-maven-plugin.version}</version>
<version>${satnogs.build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
......@@ -534,7 +580,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${orekit.maven-gpg-plugin.version}</version>
<version>${satnogs.maven-gpg-plugin.version}</version>
<configuration>
<gpgArguments>
<arg>--digest-algo=SHA512</arg>
......@@ -553,7 +599,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${orekit.maven-install-plugin.version}</version>
<version>${satnogs.maven-install-plugin.version}</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
......@@ -583,7 +629,7 @@
<pluginExecutionFilter>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<versionRange>[${orekit.maven-bundle-plugin.version},)</versionRange>
<versionRange>[${satnogs.maven-bundle-plugin.version},)</versionRange>
<goals>
<goal>manifest</goal>
</goals>
......
src/main/java/fr/cs/examples/estimation/MeasurementsGeneration.java → src/main/java/fr/cs/examples/MeasurementsGeneration.java
+ 4
− 8
View file @ 685f5967
......@@ -62,7 +62,6 @@ import org.orekit.frames.TopocentricFrame;
import org.orekit.models.AtmosphericRefractionModel;
import org.orekit.models.earth.EarthITU453AtmosphereRefraction;
import org.orekit.models.earth.atmosphere.Atmosphere;
import org.orekit.models.earth.atmosphere.DTM2000;
import org.orekit.models.earth.atmosphere.NRLMSISE00;
import org.orekit.models.earth.atmosphere.data.MarshallSolarActivityFutureEstimation;
import org.orekit.models.earth.troposphere.DiscreteTroposphericModel;
......@@ -72,8 +71,6 @@ import org.orekit.models.earth.troposphere.ViennaThreeModel;
import org.orekit.orbits.CartesianOrbit;
import org.orekit.orbits.OrbitType;
import org.orekit.propagation.SpacecraftState;
import org.orekit.propagation.analytical.tle.TLE;
import org.orekit.propagation.analytical.tle.TLEPropagator;
import org.orekit.propagation.events.ElevationDetector;
import org.orekit.propagation.events.EventDetector;
import org.orekit.propagation.events.handlers.ContinueOnEvent;
......@@ -137,7 +134,7 @@ public class MeasurementsGeneration {
// Input to define the location of the ground station and it's name
final GeodeticPoint location = new GeodeticPoint(FastMath.toRadians(52.834),
FastMath.toRadians(6.379),
10);
10.0);
final GroundStation station = new GroundStation(new TopocentricFrame(earth, location, "39-CGBSAT-VHF"));
......@@ -155,7 +152,6 @@ public class MeasurementsGeneration {
new MarshallSolarActivityFutureEstimation(MarshallSolarActivityFutureEstimation.DEFAULT_SUPPORTED_NAMES,
MarshallSolarActivityFutureEstimation.StrengthLevel.AVERAGE);
manager.feed(msafe.getSupportedNames(), msafe);
//Atmosphere atmosphere = new DTM2000(msafe, CelestialBodyFactory.getSun(), earth);
Atmosphere atmosphere = new NRLMSISE00(msafe, CelestialBodyFactory.getSun(), earth);
// this orbit is a dummy one, close to the first results from orbit determination from Max Valier satellite
......@@ -209,7 +205,7 @@ public class MeasurementsGeneration {
Range rate builder
*/
final double sigma = 15; // the value we will tune
final double sigma = 15.0; // the value we will tune
final RealMatrix covariance = MatrixUtils.createRealDiagonalMatrix(new double[] { sigma * sigma });
final RandomGenerator random = new Well19937c(0x9e9409e2520c1fc3l); // you can change this seed as you like, it's just a seed
......@@ -220,7 +216,7 @@ public class MeasurementsGeneration {
new GaussianRandomGenerator(random));
final RangeRateBuilder builder = new RangeRateBuilder(crvg, station, false, sigma, 1.0, os);//*/
final double rangeRateBias = 375;
final double rangeRateBias = 375.0;
builder.addModifier(new Bias<RangeRate>(new String[] { station.getBaseFrame().getName() + "-range-rate-bias" },
new double[] { rangeRateBias },
new double[] { 1.0 },
......@@ -254,7 +250,7 @@ public class MeasurementsGeneration {
m.getDate(),
"RANGE_RATE",
station.getBaseFrame().getName(),
(m.getObservedValue()[0]/1000 )));
(m.getObservedValue()[0]/1000)));
// Uncomment to get mjd column
/*forEach(m -> out.format(Locale.US, "%s %14.8f %s %s %12.6f%n",
m.getDate(),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment