Commit acf59c9a authored by Luc Maisonobe's avatar Luc Maisonobe

Merge branch 'master' into B1950-frame

Conflicts:
	src/main/java/org/orekit/frames/FramesFactory.java
	src/main/java/org/orekit/frames/MODProvider.java
	src/main/java/org/orekit/overview.html
	src/site/apt/architecture/frames.apt
	src/site/apt/index.apt
	src/test/java/org/orekit/frames/FramesFactoryTest.java
parents 2606d2a6 01b00298
......@@ -47,4 +47,6 @@ src/*/resources/*/unx*.405 -text
src/*/resources/*/*/unx*.405 -text
src/*/resources/*/unx*.406 -text
src/*/resources/*/*/unx*.406 -text
src/*/resources/inpop/*.dat -text
......@@ -4,3 +4,6 @@
.checkstyle
bin
target
/build
/lib
*.class
......@@ -40,7 +40,7 @@ Building with Eclipse:
orekit/src/test/resources, orekit/src/tutorials in
the source tab of the Configure Build Path dialog
- set the external libraries to JRE system library (provided by Eclipse),
Junit 4.x (provided by Eclipse) and commons-math 3.2 (available at
Junit 4.x (provided by Eclipse) and Apache Commons Math (available at
Apache Software Foundation commons-math
http://commons.apache.org/downloads/download_math.cgi
http://commons.apache.org/proper/commons-math/download_math.cgi
in the libraries tab of the Configure Build Path dialog
OREKIT
Copyright 2002-2013 CS Systèmes d'Information
Copyright 2002-2014 CS Systèmes d'Information
This product includes software developed by
CS Systèmes d'Information (http://www.c-s.fr/)
......@@ -16,6 +16,12 @@ Felix R. Hoots, Ronald L. Roehrich
This product includes software translated from original work developed by
R. Biancale, S. Bruinsma (CNES)
This product includes data computed by
P. Gégout (CNRS / UMR5563 - GET)
This product includes software translated from original work developed by
R. Biancale, S. Bruinsma (CNES)
This product includes software translated from original work developed by
Mickaël Gastineau (CNRS - Observatoire de Paris - IMCCE)
......
......@@ -20,7 +20,7 @@ business friendly free licenses.
compile-time/run-time dependency:
- commons-math from the Apache Software Foundation
- Apache Commons Math from the Apache Software Foundation
http://commons.apache.org/math/
released under the Apache license, version 2
......
......@@ -2,7 +2,7 @@
<project name="orekit" default="jar" basedir=".">
<property name="project.version" value="6.0" />
<property name="project.version" value="6.1" />
<property name="src.dir" location="src" />
<property name="main.src.dir" value="${src.dir}/main/java" />
......@@ -23,7 +23,7 @@
<property name="commons-math.maven.path" value="org/apache/commons/commons-math3" />
<property name="maven.repository" value="http://repo1.maven.org/maven2" />
<property name="copyright" value="2002-2013 CS Syst&#232;mes d&#039;Information" />
<property name="copyright" value="2002-2014 CS Syst&#232;mes d&#039;Information" />
<available classname="org.junit.Test" property="junit4.present" />
<available file="${lib.dir}/${commons-math.jar}" property="apache-commons-math.present" />
......
......@@ -6,16 +6,29 @@
-->
<FindBugsFilter>
<!-- the following inner classes serialization pattern are intentional -->
<!-- the inner classes and the enclosing classes should be serialized together -->
<!-- the following serialization classes already takes care of non-serializable parts. -->
<Match>
<Or>
<Class name="~.*\.ConstantThrustManeuver\$\w+Switch$" />
<Class name="~.*\.SolarRadiationPressure\$\w+Switch$" />
<Class name="~.*\.NumericalPropagator\$MappingSwitchingFunction$" />
<Class name="~.*\.AbstractPropagator\$LocalPVProvider$" />
<Class name="~.*\.DSSTPropagator\$MeanPlusShortPeriodicMapper\$DataTransferObject$" />
<Class name="~.*\.IntegratedEphemeris\$DataTransferObject$" />
</Or>
<Bug pattern="SE_INNER_CLASS" />
<Bug pattern="SE_BAD_FIELD" />
</Match>
<!-- the following classes are serialized using writeReplace/readResolve with proxy classes,
so the is no real problem about the base class not having a proper constructor.
This is tested in the IntegratedEphemerisTest for the ephemeris and both propagators. -->
<Match>
<Or>
<Class name="~.*\.IntegratedEphemeris$" />
<Class name="~.*\.DSSTPropagator\$MeanPlusShortPeriodicMapper$" />
<Class name="~.*\.NumericalPropagator\$OsculatingMapper$" />
</Or>
<Bug pattern="SE_NO_SUITABLE_CONSTRUCTOR" />
</Match>
<Match>
<Class name="~.*\.DSSTPropagator\$MeanPlusShortPeriodicMapper$" />
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
</Match>
<!-- The following is an intentional behaviour, to be removed when class is suppressed -->
......
......@@ -5,7 +5,7 @@
<groupId>org.orekit</groupId>
<artifactId>orekit</artifactId>
<packaging>bundle</packaging>
<version>6.1-SNAPSHOT</version>
<version>7.0-SNAPSHOT</version>
<name>ORbit Extrapolation KIT</name>
<url>http://www.orekit.org/</url>
......@@ -20,24 +20,24 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<orekit.findbugs-maven-plugin.version>2.5.2</orekit.findbugs-maven-plugin.version>
<orekit.jacoco-maven-plugin.version>0.6.2.201302030002</orekit.jacoco-maven-plugin.version>
<orekit.findbugs-maven-plugin.version>2.5.3</orekit.findbugs-maven-plugin.version>
<orekit.jacoco-maven-plugin.version>0.7.1.201405082137</orekit.jacoco-maven-plugin.version>
<orekit.maven-assembly-plugin.version>2.4</orekit.maven-assembly-plugin.version>
<orekit.maven-bundle-plugin.version>2.3.7</orekit.maven-bundle-plugin.version>
<orekit.maven-changes-plugin.version>2.9</orekit.maven-changes-plugin.version>
<orekit.maven-checkstyle-plugin.version>2.10</orekit.maven-checkstyle-plugin.version>
<orekit.maven-bundle-plugin.version>2.4.0</orekit.maven-bundle-plugin.version>
<orekit.maven-changes-plugin.version>2.10</orekit.maven-changes-plugin.version>
<orekit.maven-checkstyle-plugin.version>2.12.1</orekit.maven-checkstyle-plugin.version>
<orekit.maven-clean-plugin.version>2.5</orekit.maven-clean-plugin.version>
<orekit.maven-compiler-plugin.version>3.1</orekit.maven-compiler-plugin.version>
<orekit.maven-javadoc-plugin.version>2.9.1</orekit.maven-javadoc-plugin.version>
<orekit.maven-jxr-plugin.version>2.3</orekit.maven-jxr-plugin.version>
<orekit.maven-jxr-plugin.version>2.4</orekit.maven-jxr-plugin.version>
<orekit.maven-plantuml-plugin.version>7940</orekit.maven-plantuml-plugin.version>
<orekit.maven-project-info-reports-plugin.version>2.6</orekit.maven-project-info-reports-plugin.version>
<orekit.maven-project-info-reports-plugin.version>2.7</orekit.maven-project-info-reports-plugin.version>
<orekit.maven-resources-plugin.version>2.6</orekit.maven-resources-plugin.version>
<orekit.maven-site-plugin.version>3.3</orekit.maven-site-plugin.version>
<orekit.maven-source-plugin.version>2.2.1</orekit.maven-source-plugin.version>
<orekit.maven-surefire-plugin.version>2.14.1</orekit.maven-surefire-plugin.version>
<orekit.maven-surefire-report-plugin.version>2.14.1</orekit.maven-surefire-report-plugin.version>
<orekit.plantuml.version>7955</orekit.plantuml.version>
<orekit.maven-surefire-plugin.version>2.17</orekit.maven-surefire-plugin.version>
<orekit.maven-surefire-report-plugin.version>2.17</orekit.maven-surefire-report-plugin.version>
<orekit.plantuml.version>7999</orekit.plantuml.version>
</properties>
<developers>
......@@ -63,6 +63,13 @@
<role>developer</role>
</roles>
</developer>
<developer>
<name>Hank Grabowski</name>
<id>hankg</id>
<roles>
<role>developer</role>
</roles>
</developer>
<developer>
<name>Fabien Maussion</name>
<roles>
......@@ -121,6 +128,18 @@
</developers>
<contributors>
<contributor>
<name>Daniel Aguilar Taboada</name>
</contributor>
<contributor>
<name>Lucian Barbulescu</name>
</contributor>
<contributor>
<name>Petre Bazavan</name>
</contributor>
<contributor>
<name>Nicolas Bernard</name>
</contributor>
<contributor>
<name>Espen Bj&#248;rntvedt</name>
</contributor>
......@@ -142,6 +161,12 @@
<contributor>
<name>Christine Fernandez-Martin</name>
</contributor>
<contributor>
<name>Hank Grabowski</name>
</contributor>
<contributor>
<name>Steven Ports</name>
</contributor>
<contributor>
<name>Silvia R&#237;os Berganti&#241;os</name>
</contributor>
......@@ -154,6 +179,9 @@
<contributor>
<name>Beatriz Salazar</name>
</contributor>
<contributor>
<name>Ioanna Stypsanelli</name>
</contributor>
<contributor>
<name>Michael Turner</name>
</contributor>
......@@ -166,7 +194,7 @@
<licenses>
<license>
<name>Apache 2</name>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
......@@ -209,7 +237,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.2</version>
<version>3.3</version>
<type>jar</type>
<optional>false</optional>
</dependency>
......@@ -326,14 +354,43 @@
<goal>check</goal>
</goals>
<configuration>
<check>
<classRatio>100</classRatio>
<instructionRatio>90</instructionRatio>
<methodRatio>95</methodRatio>
<branchRatio>85</branchRatio>
<complexityRatio>85</complexityRatio>
<lineRatio>90</lineRatio>
</check>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>CLASS</counter>
<value>COVEREDRATIO</value>
<minimum>1.00</minimum>
</limit>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.90</minimum>
</limit>
<limit>
<counter>METHOD</counter>
<value>COVEREDRATIO</value>
<minimum>0.95</minimum>
</limit>
<limit>
<counter>BRANCH</counter>
<value>COVEREDRATIO</value>
<minimum>0.85</minimum>
</limit>
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<minimum>0.85</minimum>
</limit>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
<minimum>0.90</minimum>
</limit>
</limits>
</rule>
</rules>
<haltOnFailure>false</haltOnFailure>
</configuration>
</execution>
......
' Copyright 2002-2013 CS Systèmes d'Information
' Copyright 2002-2014 CS Systèmes d'Information
' Licensed to CS Systèmes 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,19 +25,19 @@
skinparam NoteFontColor #691616
skinparam ClassFontSize 11
package org.orekit #ECEBD8
package org.orekit #ECEBD8 {
package frames #DDEBD8
package frames #DDEBD8 {
class Frame
end package
}
package time #DDEBD8
package time #DDEBD8 {
interface TimeStamped
interface "TimeShiftable<T>" as TimeShiftable_T_
interface "TimeInterpolable<T>" as TimeInterpolable_T_
end package
}
package attitude #DDEBD8
package attitude #DDEBD8 {
class Attitude {
+Vector3D estimateSpin
......@@ -104,9 +104,10 @@
AttitudeProvider <|-- CelestialBodyPointed
AttitudeProvider <|-- InertialProvider
AttitudeProvider <|-- LofOffset
AttitudeProvider <|-- TabulatedProvider
end package
}
end package
}
@enduml
' Copyright 2002-2013 CS Systèmes d'Information
' Copyright 2002-2014 CS Systèmes d'Information
' Licensed to CS Systèmes 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,15 +25,15 @@
skinparam NoteFontColor #691616
skinparam ClassFontSize 11
package org.orekit #ECEBD8
package org.orekit #ECEBD8 {
package utils #DDEBD8
package utils #DDEBD8 {
interface PVCoordinatesProvider {
+PVCoordinates getPVCoordinates(AbsoluteDate date, Frame frame)
}
end package
}
package propagation #DDEBD8
package propagation #DDEBD8 {
interface Propagator {
+int getMode()
+void setSlaveMode()
......@@ -65,7 +65,7 @@
Propagator <|.. AbstractPropagator
Propagator <|.. BoundedPropagator
package analytical #ECEBD8
package analytical #ECEBD8 {
abstract class AbstractAnalyticalPropagator {
+PVCoordinatesProvider getPvProvider()
......@@ -80,13 +80,13 @@
AbstractAnalyticalPropagator <|-- Ephemeris
BoundedPropagator <|.. Ephemeris
package tle #DDEBD8
package tle #DDEBD8 {
AbstractAnalyticalPropagator <|-- TLEPropagator
end package
}
end package
}
package integration #ECEBD8
package integration #ECEBD8 {
abstract class AbstractIntegratedPropagator {
+void setIntegrator(FirstOrderIntegrator integrator)
......@@ -98,20 +98,20 @@
AbstractIntegratedPropagator o-down-> IntegratedEphemeris : creates
AbstractPropagator <|-- AbstractIntegratedPropagator
end package
}
package semianalytical #ECEBD8
package semianalytical #ECEBD8 {
package dsst #DDEBD8
package dsst #DDEBD8 {
AbstractIntegratedPropagator <|-right- DSSTPropagator
end package
}
end package
}
package numerical #ECEBD8
package numerical #ECEBD8 {