Updates for Python wrappers for 12.0

Author: petrushy

src/main/java/org/hipparchus/analysis/PythonFieldUnivariateFunction.java

@@ -24,7 +24,6 @@
 import org.hipparchus.analysis.FieldUnivariateFunction;
 
 public class PythonFieldUnivariateFunction implements org.hipparchus.analysis.FieldUnivariateFunction  {
-    static final long serialVersionUID = 1L;
 
     /** Part of JCC Python interface to object */
     private long pythonObject;

src/main/java/org/hipparchus/analysis/PythonUnivariateFunction.java

@@ -20,38 +20,23 @@
 
 package org.hipparchus.analysis;
 
+import org.orekit.python.JCCBase;
+
 /** import org.hipparchus.analysis.UnivariateFunction; **/
 
 
 public class PythonUnivariateFunction implements UnivariateFunction {
 
-	static final long serialVersionUID = 1L;
-
-    /** Part of JCC Python interface to object */
-    private long pythonObject;
-
-    /** Part of JCC Python interface to object */
-  	public void pythonExtension(long pythonObject)
-  	{
-  		this.pythonObject = pythonObject;
-  	}
-
-  	/** Part of JCC Python interface to object */
-  	public long pythonExtension()
-  	{
-  		return this.pythonObject;
-  	}
-
-  	/** Part of JCC Python interface to object */
-  	public void finalize()
-  			throws Throwable
-  			{
-  				pythonDecRef();
-  			}
-
-  	/** Part of JCC Python interface to object */
-  	public native void pythonDecRef();
-
+	/** Part of JCC Python interface to object */
+	protected long pythonObject;
+	public void pythonExtension(long pythonObject) {
+		this.pythonObject = pythonObject;
+	}
+	public long pythonExtension() {
+		return this.pythonObject;
+	}
+	public void finalize() throws Throwable { pythonDecRef(); }
+	public native void pythonDecRef();
 
 	/** {@inheritDoc} */
 	@Override

src/main/java/org/orekit/attitudes/PythonAttitudeProviderModifier.java

@@ -29,8 +29,6 @@
 
 public class PythonAttitudeProviderModifier  implements AttitudeProviderModifier {
 
-    private static final long serialVersionUID = 4242537148465131675L;
-    
     /** Part of JCC Python interface to object */
     private long pythonObject;
 

src/main/java/org/orekit/estimation/leastsquares/PythonAbstractBatchLSModel.java

@@ -9,9 +9,8 @@
 import org.orekit.orbits.Orbit;
 import org.orekit.propagation.MatricesHarvester;
 import org.orekit.propagation.Propagator;
-import org.orekit.propagation.conversion.OrbitDeterminationPropagatorBuilder;
+import org.orekit.propagation.conversion.PropagatorBuilder;
 import org.orekit.propagation.integration.AbstractIntegratedPropagator;
-import org.orekit.propagation.integration.AbstractJacobiansMapper;
 import org.orekit.utils.ParameterDriversList;
 
 import java.util.List;
@@ -21,17 +20,8 @@ public class PythonAbstractBatchLSModel extends AbstractBatchLSModel {
     /** Part of JCC Python interface to object */
     private long pythonObject;
 
-    /**
-     * Constructor.
-     *
-     * @param propagatorBuilders              builders to use for propagation
-     * @param measurements                    measurements
-     * @param estimatedMeasurementsParameters estimated measurements parameters
-     * @param mappers                         jacobian mappers
-     * @param observer                        observer to be notified at model calls
-     */
-    public PythonAbstractBatchLSModel(OrbitDeterminationPropagatorBuilder[] propagatorBuilders, List<ObservedMeasurement<?>> measurements, ParameterDriversList estimatedMeasurementsParameters, AbstractJacobiansMapper[] mappers, ModelObserver observer) {
-        super(propagatorBuilders, measurements, estimatedMeasurementsParameters, mappers, observer);
+    public PythonAbstractBatchLSModel(PropagatorBuilder[] propagatorBuilders, List<ObservedMeasurement<?>> measurements, ParameterDriversList estimatedMeasurementsParameters,  ModelObserver observer) {
+        super(propagatorBuilders, measurements, estimatedMeasurementsParameters, observer);
     }
 
     /** Part of JCC Python interface to object */
@@ -90,7 +80,7 @@ public void finalize()
 
     /** {@inheritDoc} */
     @Override
-    public native AbstractJacobiansMapper configureDerivatives(Propagator propagators);
+    public native MatricesHarvester configureHarvester(Propagator propagator);
 
     /** {@inheritDoc} */
     @Override

src/main/java/org/orekit/estimation/measurements/PythonAbstractMeasurement.java

@@ -51,30 +51,17 @@ public void finalize()
     /** Part of JCC Python interface to object */
     public native void pythonDecRef();
 
-    /**
-     * Estimate the theoretical value.
-     * Extension point for Python.
-     * <p>
-     * The theoretical value does not have <em>any</em> modifiers applied.
-     * </p>
-     *
-     * @param iteration  iteration number
-     * @param evaluation evaluation number
-     * @param states     orbital states at measurement date
-     * @return theoretical value
-     * @see #estimate(int, int, SpacecraftState[])
-     */
+    /** {@inheritDoc} */
     @Override
     public native EstimatedMeasurement<T> theoreticalEvaluation(int iteration, int evaluation, SpacecraftState[] states);
 
-    /**
-     * Add a parameter driver.
-     *
-     * @param driver parameter driver to add
-     * @since 9.3
-     */
+    /** {@inheritDoc} */
     @Override
     public void addParameterDriver(ParameterDriver driver) {
         super.addParameterDriver(driver);
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public native EstimatedMeasurementBase<T> theoreticalEvaluationWithoutDerivatives(int iteration, int evaluation, SpacecraftState[] states);
 }

src/main/java/org/orekit/estimation/measurements/PythonEstimationModifier.java

@@ -50,19 +50,13 @@ public void finalize()
     /** Part of JCC Python interface to object */
     public native void pythonDecRef();
 
-    /**
-     * Get the drivers for this modifier parameters.
-     *
-     * @return drivers for this modifier parameters
-     */
-    @Override
+    /** {@inheritDoc} */    @Override
     public native List<ParameterDriver> getParametersDrivers();
 
-    /**
-     * Apply a modifier to an estimated measurement.
-     *
-     * @param estimated estimated measurement to modify
-     */
+    /** {@inheritDoc} */
     @Override
+    public native void modifyWithoutDerivatives(EstimatedMeasurementBase<T> estimated);
+
+    /** {@inheritDoc} */    @Override
     public native void modify(EstimatedMeasurement<T> estimated);
 }

src/main/java/org/orekit/estimation/measurements/PythonGroundReceiverMeasurement.java

@@ -0,0 +1,37 @@
+package org.orekit.estimation.measurements;
+
+import org.orekit.propagation.SpacecraftState;
+import org.orekit.time.AbsoluteDate;
+
+public class PythonGroundReceiverMeasurement<T extends GroundReceiverMeasurement<T>> extends GroundReceiverMeasurement<T> {
+    public PythonGroundReceiverMeasurement(GroundStation station, boolean twoWay, AbsoluteDate date, double observed, double sigma, double baseWeight, ObservableSatellite satellite) {
+        super(station, twoWay, date, observed, sigma, baseWeight, satellite);
+    }
+
+    /** Part of JCC Python interface to object */
+    protected long pythonObject;
+
+    /** Part of JCC Python interface to object */
+    public void pythonExtension(long pythonObject) {
+        this.pythonObject = pythonObject;
+    }
+
+    /** Part of JCC Python interface to object */
+    public long pythonExtension() {
+        return this.pythonObject;
+    }
+
+    /** Part of JCC Python interface to object */
+    public void finalize() throws Throwable {
+        pythonDecRef();
+    }
+
+    /** Part of JCC Python interface to object */
+    public native void pythonDecRef();
+
+    @Override
+    public native EstimatedMeasurementBase<T> theoreticalEvaluationWithoutDerivatives(int iteration, int evaluation, SpacecraftState[] states);
+
+    @Override
+    public native EstimatedMeasurement<T> theoreticalEvaluation(int iteration, int evaluation, SpacecraftState[] states);
+}

src/main/java/org/orekit/estimation/measurements/PythonObservedMeasurement.java

@@ -21,37 +21,23 @@
 import org.orekit.propagation.SpacecraftState;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.utils.ParameterDriver;
-
+import org.orekit.python.JCCBase;
 import java.util.List;
 import java.util.SortedSet;
 
-public class PythonObservedMeasurement<T extends ObservedMeasurement<T>> implements ObservedMeasurement<T> {
-
-    /** Part of JCC Python interface to object */
-    private long pythonObject;
+public class PythonObservedMeasurement<T extends ObservedMeasurement<T>> implements ObservedMeasurement<T>  {
 
     /** Part of JCC Python interface to object */
-    public void pythonExtension(long pythonObject)
-    {
+    protected long pythonObject;
+    public void pythonExtension(long pythonObject) {
         this.pythonObject = pythonObject;
     }
-
-    /** Part of JCC Python interface to object */
-    public long pythonExtension()
-    {
+    public long pythonExtension() {
         return this.pythonObject;
     }
-
-    /** Part of JCC Python interface to object */
-    public void finalize()
-            throws Throwable
-    {
-        pythonDecRef();
-    }
-
-    /** Part of JCC Python interface to object */
+    public void finalize() throws Throwable { pythonDecRef(); }
     public native void pythonDecRef();
-    
+
     /**
      * Enable or disable a measurement.
      * <p>
@@ -162,7 +148,10 @@ public void finalize()
     @Override
     public native List<ObservableSatellite> getSatellites();
 
-    /**
+    @Override
+    public native EstimatedMeasurementBase<T> estimateWithoutDerivatives(int iteration, int evaluation, SpacecraftState[] states);
+
+        /**
      * Estimate the theoretical value of the measurement.
      * <p>
      * The estimated value is the <em>combination</em> of the raw estimated

src/main/java/org/orekit/estimation/measurements/generation/PythonAbstractMeasurementBuilder.java

@@ -5,8 +5,11 @@
 import org.orekit.estimation.measurements.ObservedMeasurement;
 import org.orekit.estimation.measurements.generation.AbstractMeasurementBuilder;
 import org.orekit.propagation.SpacecraftState;
+import org.orekit.propagation.sampling.OrekitStepInterpolator;
 import org.orekit.time.AbsoluteDate;
 
+import java.util.Map;
+
 public class PythonAbstractMeasurementBuilder<T extends ObservedMeasurement<T>> extends AbstractMeasurementBuilder<T> {
     /** Part of JCC Python interface to object */
     private long pythonObject;
@@ -135,14 +138,7 @@ public ObservableSatellite[] getSatellites() {
         return super.getSatellites();
     }
 
-
-    /**
-     * Generate a single measurement.
-     * Extension point for Python.
-     *
-     * @param states spacecraft states
-     * @return generated measurement
-     */
     @Override
-    public native T build(SpacecraftState[] states);
+    public native T build(AbsoluteDate date, Map<ObservableSatellite, OrekitStepInterpolator> interpolators);
+
 }

src/main/java/org/orekit/estimation/measurements/generation/PythonAbstractScheduler.java

@@ -4,6 +4,7 @@
 import org.orekit.estimation.measurements.generation.AbstractScheduler;
 import org.orekit.estimation.measurements.generation.MeasurementBuilder;
 import org.orekit.propagation.sampling.OrekitStepInterpolator;
+import org.orekit.time.AbsoluteDate;
 import org.orekit.time.DatesSelector;
 
 import java.util.List;
@@ -23,6 +24,7 @@ public PythonAbstractScheduler(MeasurementBuilder<T> builder, DatesSelector sele
         super(builder, selector);
     }
 
+
     /** Part of JCC Python interface to object */
     public void pythonExtension(long pythonObject)
     {
@@ -45,13 +47,7 @@ public void finalize()
     /** Part of JCC Python interface to object */
     public native void pythonDecRef();
 
-    /**
-     * Generate a sequence of measurements.
-     * Extension point for Python.
-     *
-     * @param interpolators interpolators for spacecraft states
-     * @return generated measurements
-     */
     @Override
-    public native SortedSet<T> generate(List<OrekitStepInterpolator> interpolators);
+    public native boolean measurementIsFeasible(AbsoluteDate date);
+
 }

src/main/java/org/orekit/estimation/measurements/generation/PythonGeneratedMeasurementSubscriber.java

@@ -0,0 +1,24 @@
+package org.orekit.estimation.measurements.generation;
+
+import org.orekit.estimation.measurements.ObservedMeasurement;
+import org.orekit.python.JCCBase;
+import org.orekit.time.AbsoluteDate;
+
+public class PythonGeneratedMeasurementSubscriber implements GeneratedMeasurementSubscriber {
+    /** Part of JCC Python interface to object */
+    protected long pythonObject;
+    public void pythonExtension(long pythonObject) {
+        this.pythonObject = pythonObject;
+    }
+    public long pythonExtension() {
+        return this.pythonObject;
+    }
+    public void finalize() throws Throwable { pythonDecRef(); }
+    public native void pythonDecRef();
+
+    @Override
+    public native void init(AbsoluteDate start, AbsoluteDate end);
+
+    @Override
+    public native void handleGeneratedMeasurement(ObservedMeasurement<?> measurement);
+}

src/main/java/org/orekit/estimation/measurements/generation/PythonMeasurementBuilder.java

@@ -22,12 +22,15 @@
 package org.orekit.estimation.measurements.generation;
 
 import org.orekit.estimation.measurements.EstimationModifier;
+import org.orekit.estimation.measurements.ObservableSatellite;
 import org.orekit.estimation.measurements.ObservedMeasurement;
 import org.orekit.propagation.SpacecraftState;
 
+import org.orekit.propagation.sampling.OrekitStepInterpolator;
 import org.orekit.time.AbsoluteDate;
 
 import java.util.List;
+import java.util.Map;
 
 public class PythonMeasurementBuilder<T extends ObservedMeasurement<T>> implements MeasurementBuilder<T> {
     /** Part of JCC Python interface to object */
@@ -86,12 +89,10 @@ public void finalize()
     @Override
     public native List<EstimationModifier<T>> getModifiers();
 
-    /**
-     * Generate a single measurement.
-     *
-     * @param states all spacecraft states (i.e. including ones that may not be relevant for the current builder)
-     * @return generated measurement
-     */
     @Override
-    public native T build(SpacecraftState[] states);
+    public native ObservableSatellite[] getSatellites();
+
+    @Override
+    public native T build(AbsoluteDate date, Map<ObservableSatellite, OrekitStepInterpolator> interpolators);
+
 }