Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Whitespace.

This commit is contained in:
Luc Maisonobe 2015-11-15 10:41:39 +01:00
parent ea0dabfd1b
commit 97a65021c7
2 changed files with 62 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/org/apache/commons/math3/ode/nonstiff/EulerFieldIntegrator.java
View File

@ -51,26 +51,26 @@ import org.apache.commons.math3.RealFieldElement;
public class EulerFieldIntegrator<T extends RealFieldElement<T>> extends RungeKuttaFieldIntegrator<T> {
/** Time steps Butcher array. */
private static final double[] STATIC_C = {
};
/** Time steps Butcher array. */
private static final double[] STATIC_C = {
};
/** Internal weights Butcher array. */
private static final double[][] STATIC_A = {
};
/** Internal weights Butcher array. */
private static final double[][] STATIC_A = {
};
/** Propagation weights Butcher array. */
private static final double[] STATIC_B = {
1.0
};
/** Propagation weights Butcher array. */
private static final double[] STATIC_B = {
1.0
};
/** Simple constructor.
* Build an Euler integrator with the given step.
* @param field field to which the time and state vector elements belong
* @param step integration step
*/
public EulerFieldIntegrator(final Field<T> field, final T step) {
super(field, "Euler", STATIC_C, STATIC_A, STATIC_B, new EulerFieldStepInterpolator<T>(), step);
}
/** Simple constructor.
* Build an Euler integrator with the given step.
* @param field field to which the time and state vector elements belong
* @param step integration step
*/
public EulerFieldIntegrator(final Field<T> field, final T step) {
super(field, "Euler", STATIC_C, STATIC_A, STATIC_B, new EulerFieldStepInterpolator<T>(), step);
}
}

91
src/main/java/org/apache/commons/math3/ode/nonstiff/EulerFieldStepInterpolator.java
View File

@ -47,57 +47,54 @@ import org.apache.commons.math3.util.MathArrays;
*/
class EulerFieldStepInterpolator<T extends RealFieldElement<T>>
extends RungeKuttaFieldStepInterpolator<T> {
extends RungeKuttaFieldStepInterpolator<T> {
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
* {@link
* org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
* method should be called before using the instance in order to
* initialize the internal arrays. This constructor is used only
* in order to delay the initialization in some cases. The {@link
* RungeKuttaIntegrator} class uses the prototyping design pattern
* to create the step interpolators by cloning an uninitialized model
* and later initializing the copy.
*/
EulerFieldStepInterpolator() {
}
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
* {@link
* org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
* method should be called before using the instance in order to
* initialize the internal arrays. This constructor is used only
* in order to delay the initialization in some cases. The {@link
* RungeKuttaIntegrator} class uses the prototyping design pattern
* to create the step interpolators by cloning an uninitialized model
* and later initializing the copy.
*/
EulerFieldStepInterpolator() {
}
/** Copy constructor.
* @param interpolator interpolator to copy from. The copy is a deep
* copy: its arrays are separated from the original arrays of the
* instance
*/
EulerFieldStepInterpolator(final EulerFieldStepInterpolator<T> interpolator) {
super(interpolator);
}
/** Copy constructor.
* @param interpolator interpolator to copy from. The copy is a deep
* copy: its arrays are separated from the original arrays of the
* instance
*/
EulerFieldStepInterpolator(final EulerFieldStepInterpolator<T> interpolator) {
super(interpolator);
}
/** {@inheritDoc} */
@Override
protected EulerFieldStepInterpolator<T> doCopy() {
return new EulerFieldStepInterpolator<T>(this);
}
/** {@inheritDoc} */
@Override
protected EulerFieldStepInterpolator<T> doCopy() {
return new EulerFieldStepInterpolator<T>(this);
}
/** {@inheritDoc} */
@Override
protected FieldODEStateAndDerivative<T> computeInterpolatedStateAndDerivatives(final FieldEquationsMapper<T> mapper,
final T time, final T theta,
final T oneMinusThetaH) {
final T[] interpolatedState = MathArrays.buildArray(theta.getField(), previousState.length);
if ((previousState != null) && (theta.getReal() <= 0.5)) {
for (int i = 0; i < previousState.length; ++i) {
interpolatedState[i] = previousState[i].add(theta.multiply(h).multiply(yDotK[0][i]));
}
} else {
for (int i = 0; i < previousState.length; ++i) {
interpolatedState[i] = currentState[i].subtract(oneMinusThetaH.multiply(yDotK[0][i]));
}
}
/** {@inheritDoc} */
@Override
protected FieldODEStateAndDerivative<T> computeInterpolatedStateAndDerivatives(final FieldEquationsMapper<T> mapper,
final T time, final T theta,
final T oneMinusThetaH) {
final T[] interpolatedState = MathArrays.buildArray(theta.getField(), previousState.length);
if ((previousState != null) && (theta.getReal() <= 0.5)) {
for (int i = 0; i < previousState.length; ++i) {
interpolatedState[i] = previousState[i].add(theta.multiply(h).multiply(yDotK[0][i]));
}
} else {
for (int i = 0; i < previousState.length; ++i) {
interpolatedState[i] = currentState[i].subtract(oneMinusThetaH.multiply(yDotK[0][i]));
}
}
return new FieldODEStateAndDerivative<T>(time,
interpolatedState,
yDotK[0]);
}
return new FieldODEStateAndDerivative<T>(time, interpolatedState, yDotK[0]);
}
}