Merge branch 'develop' into issue-603

341db008 · Luc Maisonobe · 927e9423 · a48d2bed · 341db008 · 341db008
Commit 341db008 authored 5 years ago by Luc Maisonobe
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,6 +21,9 @@
  </properties>
  <body>
    <release version="10.1" date="TBD" description="TBD">
+      <action dev="evan" type="fix" issue="589">
+        Improve performance of AggregateBoundedPropagator by factor of 2.
+      </action>
      <action dev="luc" type="fix" issue="600">
        Fixed parsing of compact RINEX files with many observation types.
      </action>

--- a/src/main/java/org/orekit/propagation/analytical/AggregateBoundedPropagator.java
+++ b/src/main/java/org/orekit/propagation/analytical/AggregateBoundedPropagator.java
@@ -21,6 +21,7 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.TreeMap;

+import org.orekit.attitudes.Attitude;
 import org.orekit.errors.OrekitException;
 import org.orekit.errors.OrekitMessages;
 import org.orekit.frames.Frame;
@@ -71,6 +72,27 @@ public class AggregateBoundedPropagator extends AbstractAnalyticalPropagator
                this.propagators.firstEntry().getValue().getInitialState());
    }

+    @Override
+    protected SpacecraftState basicPropagate(final AbsoluteDate date) {
+        // #589 override this method for a performance benefit,
+        // getPropagator(date).propagate(date) is only called once
+
+        // do propagation
+        final SpacecraftState state = getPropagator(date).propagate(date);
+
+        // evaluate attitude
+        final Attitude attitude =
+                getAttitudeProvider().getAttitude(this, date, state.getFrame());
+
+        // build raw state
+        if (state.isOrbitDefined()) {
+            return new SpacecraftState(
+                    state.getOrbit(), attitude, state.getMass(), state.getAdditionalStates());
+        } else {
+            return new SpacecraftState(
+                    state.getAbsPVA(), attitude, state.getMass(), state.getAdditionalStates());
+        }
+    }

    @Override
    public TimeStampedPVCoordinates getPVCoordinates(final AbsoluteDate date,