Skip to content

Commit a07a791

Browse files
petrushypetrushy
committed
Updates with new subclassing strategy
1 parent fbf8f1d commit a07a791

File tree

5 files changed

+14
-129
lines changed

5 files changed

+14
-129
lines changed

‎src/main/java/org/orekit/forces/maneuvers/propulsion/PythonAbstractConstantThrustPropulsionModel.java

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,27 +84,11 @@ public PythonAbstractConstantThrustPropulsionModel(double thrust, double isp, Ve
8484

8585
/** {@inheritDoc} */
8686
@Override
87-
public <T extends CalculusFieldElement<T>> FieldVector3D<T> getThrustVector(T[] parameters) {
88-
return this.getThrustVector_T(parameters);
89-
}
90-
91-
/** {@inheritDoc} */
92-
public native <T extends CalculusFieldElement<T>> FieldVector3D<T> getThrustVector_T(T[] parameters);
87+
public native <T extends CalculusFieldElement<T>> FieldVector3D<T> getThrustVector(T[] parameters);
9388

9489
/** {@inheritDoc} */
9590
@Override
96-
public <T extends CalculusFieldElement<T>> T getFlowRate(T[] parameters) {
97-
return this.getFlowRate_T(parameters);
98-
}
99-
100-
101-
/** {@inheritDoc} */
102-
public native <T extends CalculusFieldElement<T>> T getFlowRate_T(T[] parameters);
103-
104-
105-
///** {@inheritDoc} */
106-
//@Override
107-
//public native void init(SpacecraftState initialState, AbsoluteDate target);
91+
public native <T extends CalculusFieldElement<T>> T getFlowRate(T[] parameters);
10892

10993
/** {@inheritDoc} */
11094
@Override

‎src/main/java/org/orekit/models/earth/troposphere/PythonMappingFunction.java

Lines changed: 3 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -52,59 +52,12 @@ public void finalize()
5252
/** Part of JCC Python interface to object */
5353
public native void pythonDecRef();
5454

55-
/**
56-
* This method allows the computation of the hydrostatic and
57-
* wet mapping functions. The resulting element is an array having the following form:
58-
* <ul>
59-
* <li>double[0] = m<sub>h</sub>(e) -&gt hydrostatic mapping function
60-
* <li>double[1] = m<sub>w</sub>(e) -&gt wet mapping function
61-
* </ul>
62-
*
63-
* @param elevation the elevation of the satellite, in radians.
64-
* @param height the height of the station in m above sea level.
65-
* @param parameters tropospheric model parameters.
66-
* @param date current date
67-
* @return a two components array containing the hydrostatic and wet mapping functions.
68-
*/
55+
/** {@inheritDoc} */
6956
@Override
7057
public native double[] mappingFactors(double elevation, GeodeticPoint point, AbsoluteDate date);
7158

72-
/**
73-
* This method allows the computation of the hydrostatic and
74-
* wet mapping functions. The resulting element is an array having the following form:
75-
* <ul>
76-
* <li>T[0] = m<sub>h</sub>(e) -&gt hydrostatic mapping function
77-
* <li>T[1] = m<sub>w</sub>(e) -&gt wet mapping function
78-
* </ul>
79-
*
80-
* @param elevation the elevation of the satellite, in radians.
81-
* @param height the height of the station in m above sea level.
82-
* @param parameters tropospheric model parameters.
83-
* @param date current date
84-
* @return a two components array containing the hydrostatic and wet mapping functions.
85-
*/
59+
/** {@inheritDoc} */
8660
@Override
87-
public <T extends CalculusFieldElement<T>> T[] mappingFactors(T elevation, FieldGeodeticPoint<T> point, FieldAbsoluteDate<T> date) {
88-
return this.mappingFactors_TTTF(elevation, point, date);
89-
}
90-
91-
92-
/**
93-
* This method allows the computation of the hydrostatic and
94-
* wet mapping functions. The resulting element is an array having the following form:
95-
* <ul>
96-
* <li>T[0] = m<sub>h</sub>(e) -&gt hydrostatic mapping function
97-
* <li>T[1] = m<sub>w</sub>(e) -&gt wet mapping function
98-
* </ul>
99-
*
100-
* @param elevation the elevation of the satellite, in radians.
101-
* @param height the height of the station in m above sea level.
102-
* @param parameters tropospheric model parameters.
103-
* @param date current date
104-
* @return a two components array containing the hydrostatic and wet mapping functions.
105-
*/
106-
public native <T extends CalculusFieldElement<T>> T[] mappingFactors_TTTF(T elevation, FieldGeodeticPoint<T> point, FieldAbsoluteDate<T> date);
107-
108-
61+
public native <T extends CalculusFieldElement<T>> T[] mappingFactors(T elevation, FieldGeodeticPoint<T> point, FieldAbsoluteDate<T> date);
10962

11063
}

‎src/main/java/org/orekit/propagation/PythonBoundedPropagator.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,7 @@ public void finalize()
127127

128128
/** {@inheritDoc} */
129129
@Override
130-
public SpacecraftState propagate(AbsoluteDate start, AbsoluteDate target) {
131-
return this.propagate_AA(start, target);
132-
}
133-
134-
/** {@inheritDoc} */
135-
public native SpacecraftState propagate_AA(AbsoluteDate start, AbsoluteDate target);
130+
public native SpacecraftState propagate(AbsoluteDate start, AbsoluteDate target);
136131

137132
/** {@inheritDoc} */
138133
@Override

‎src/main/java/org/orekit/propagation/PythonPropagator.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,7 @@ public long pythonExtension() {
116116

117117
/** {@inheritDoc} */
118118
@Override
119-
public SpacecraftState propagate(AbsoluteDate start, AbsoluteDate target) {
120-
return this.propagate_AA(start, target);
121-
}
122-
123-
/** {@inheritDoc} */
124-
public native SpacecraftState propagate_AA(AbsoluteDate start, AbsoluteDate target);
119+
public native SpacecraftState propagate(AbsoluteDate start, AbsoluteDate target);
125120

126121
/** {@inheritDoc} */
127122
@Override

‎src/main/java/org/orekit/propagation/conversion/PythonPropagatorConverter.java

Lines changed: 7 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -53,62 +53,20 @@ public void finalize()
5353
/** Part of JCC Python interface to object */
5454
public native void pythonDecRef();
5555

56-
/**
57-
* Convert a propagator into another one.
58-
*
59-
* @param source propagator to convert
60-
* @param timeSpan time span considered for conversion
61-
* @param nbPoints number of points for sampling over the time span
62-
* @param freeParameters names of the free parameters
63-
* @return adapted propagator
64-
*/
56+
/** {@inheritDoc} */
6557
@Override
6658
public native Propagator convert(Propagator source, double timeSpan, int nbPoints, List<String> freeParameters);
6759

68-
/**
69-
* Convert a propagator into another one.
70-
*
71-
* @param source propagator to convert
72-
* @param timeSpan time span considered for conversion
73-
* @param nbPoints number of points for sampling over the time span
74-
* @param freeParameters names of the free parameters
75-
* @return adapted propagator
76-
*/
60+
/** {@inheritDoc} */
7761
@Override
78-
public Propagator convert(Propagator source, double timeSpan, int nbPoints, String... freeParameters) {
79-
return this.convert_PdiS(source, timeSpan, nbPoints, freeParameters);
80-
}
81-
82-
public native Propagator convert_PdiS(Propagator source, double timeSpan, int nbPoints, String... freeParameters);
62+
public native Propagator convert(Propagator source, double timeSpan, int nbPoints, String... freeParameters);
8363

84-
/**
85-
* Find the propagator that minimize the mean square error for a sample of {@link SpacecraftState states}.
86-
*
87-
* @param states spacecraft states sample to fit
88-
* @param positionOnly if true, consider only position data otherwise both position and velocity are used
89-
* @param freeParameters names of the free parameters
90-
* @return adapted propagator
91-
*/
64+
/** {@inheritDoc} */
9265
@Override
93-
public Propagator convert(List<SpacecraftState> states, boolean positionOnly, List<String> freeParameters) {
94-
return this.convert_LbL(states, positionOnly, freeParameters);
95-
}
66+
public native Propagator convert(List<SpacecraftState> states, boolean positionOnly, List<String> freeParameters);
9667

97-
public native Propagator convert_LbL(List<SpacecraftState> states, boolean positionOnly, List<String> freeParameters);
98-
99-
/**
100-
* Find the propagator that minimize the mean square error for a sample of {@link SpacecraftState states}.
101-
*
102-
* @param states spacecraft states sample to fit
103-
* @param positionOnly if true, consider only position data otherwise both position and velocity are used
104-
* @param freeParameters names of the free parameters
105-
* @return adapted propagator
106-
*/
68+
/** {@inheritDoc} */
10769
@Override
108-
public Propagator convert(List<SpacecraftState> states, boolean positionOnly, String... freeParameters) {
109-
return this.convert_LbS(states, positionOnly, freeParameters);
110-
}
111-
112-
public native Propagator convert_LbS(List<SpacecraftState> states, boolean positionOnly, String... freeParameters);
70+
public native Propagator convert(List<SpacecraftState> states, boolean positionOnly, String... freeParameters);
11371

11472
}

0 commit comments

Comments
 (0)