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

Reintroduced @Override as master needs at least Java 7.

This commit is contained in:
Luc Maisonobe 2016-01-06 13:40:45 +01:00
parent 6e4265d61c
commit 0aa826e84b
15 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/apache/commons/math4/ode/AbstractFieldIntegrator.java
View File

@ -108,26 +108,31 @@ public abstract class AbstractFieldIntegrator<T extends RealFieldElement<T>> imp
}
/** {@inheritDoc} */
@Override
public String getName() {
return name;
}
/** {@inheritDoc} */
@Override
public void addStepHandler(final FieldStepHandler<T> handler) {
stepHandlers.add(handler);
}
/** {@inheritDoc} */
@Override
public Collection<FieldStepHandler<T>> getStepHandlers() {
return Collections.unmodifiableCollection(stepHandlers);
}
/** {@inheritDoc} */
@Override
public void clearStepHandlers() {
stepHandlers.clear();
}
/** {@inheritDoc} */
@Override
public void addEventHandler(final FieldEventHandler<T> handler,
final double maxCheckInterval,
final double convergence,
@ -141,6 +146,7 @@ public abstract class AbstractFieldIntegrator<T extends RealFieldElement<T>> imp
}
/** {@inheritDoc} */
@Override
public void addEventHandler(final FieldEventHandler<T> handler,
final double maxCheckInterval,
final double convergence,
@ -151,6 +157,7 @@ public abstract class AbstractFieldIntegrator<T extends RealFieldElement<T>> imp
}
/** {@inheritDoc} */
@Override
public Collection<FieldEventHandler<T>> getEventHandlers() {
final List<FieldEventHandler<T>> list = new ArrayList<FieldEventHandler<T>>(eventsStates.size());
for (FieldEventState<T> state : eventsStates) {
@ -160,31 +167,37 @@ public abstract class AbstractFieldIntegrator<T extends RealFieldElement<T>> imp
}
/** {@inheritDoc} */
@Override
public void clearEventHandlers() {
eventsStates.clear();
}
/** {@inheritDoc} */
@Override
public FieldODEStateAndDerivative<T> getCurrentStepStart() {
return stepStart;
}
/** {@inheritDoc} */
@Override
public T getCurrentSignedStepsize() {
return stepSize;
}
/** {@inheritDoc} */
@Override
public void setMaxEvaluations(int maxEvaluations) {
evaluations = evaluations.withMaximalCount((maxEvaluations < 0) ? Integer.MAX_VALUE : maxEvaluations);
}
/** {@inheritDoc} */
@Override
public int getMaxEvaluations() {
return evaluations.getMaximalCount();
}
/** {@inheritDoc} */
@Override
public int getEvaluations() {
return evaluations.getCount();
}
@ -294,6 +307,7 @@ public abstract class AbstractFieldIntegrator<T extends RealFieldElement<T>> imp
SortedSet<FieldEventState<T>> occurringEvents = new TreeSet<FieldEventState<T>>(new Comparator<FieldEventState<T>>() {
/** {@inheritDoc} */
@Override
public int compare(FieldEventState<T> es0, FieldEventState<T> es1) {
return orderingSign * Double.compare(es0.getEventTime().getReal(), es1.getEventTime().getReal());
}

1
src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
View File

@ -176,6 +176,7 @@ public class ContinuousOutputFieldModel<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
public void init(final FieldODEStateAndDerivative<T> initialState, final T t) {
initialTime = initialState.getTime();
finalTime = t;

1
src/main/java/org/apache/commons/math4/ode/events/FieldEventState.java
View File

@ -204,6 +204,7 @@ public class FieldEventState<T extends RealFieldElement<T>> {
final RealFieldUnivariateFunction<T> f = new RealFieldUnivariateFunction<T>() {
/** {@inheritDoc} */
@Override
public T value(final T t) {
return handler.g(interpolator.getInterpolatedState(t));
}

1
src/main/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaFieldStepInterpolator.java
View File

@ -82,6 +82,7 @@ class ClassicalRungeKuttaFieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected ClassicalRungeKuttaFieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolator.java
View File

@ -107,6 +107,7 @@ class DormandPrince54FieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected DormandPrince54FieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldStepInterpolator.java
View File

@ -188,6 +188,7 @@ class DormandPrince853FieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected DormandPrince853FieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/EulerFieldStepInterpolator.java
View File

@ -72,6 +72,7 @@ class EulerFieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected EulerFieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/GillFieldStepInterpolator.java
View File

@ -90,6 +90,7 @@ class GillFieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected GillFieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldStepInterpolator.java
View File

@ -58,6 +58,7 @@ class HighamHall54FieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected HighamHall54FieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/LutherFieldStepInterpolator.java
View File

@ -118,6 +118,7 @@ class LutherFieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected LutherFieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldStepInterpolator.java
View File

@ -74,6 +74,7 @@ class MidpointFieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected MidpointFieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldStepInterpolator.java
View File

@ -69,6 +69,7 @@ abstract class RungeKuttaFieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected RungeKuttaFieldStepInterpolator<T> create(boolean newForward,
FieldODEStateAndDerivative<T> newGlobalPreviousState,
FieldODEStateAndDerivative<T> newGlobalCurrentState,

1
src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldStepInterpolator.java
View File

@ -84,6 +84,7 @@ class ThreeEighthesFieldStepInterpolator<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
@Override
protected ThreeEighthesFieldStepInterpolator<T> create(final Field<T> newField, final boolean newForward, final T[][] newYDotK,
final FieldODEStateAndDerivative<T> newGlobalPreviousState,
final FieldODEStateAndDerivative<T> newGlobalCurrentState,

4
src/main/java/org/apache/commons/math4/ode/sampling/AbstractFieldStepInterpolator.java
View File

@ -128,16 +128,19 @@ public abstract class AbstractFieldStepInterpolator<T extends RealFieldElement<T
}
/** {@inheritDoc} */
@Override
public FieldODEStateAndDerivative<T> getPreviousState() {
return softPreviousState;
}
/** {@inheritDoc} */
@Override
public FieldODEStateAndDerivative<T> getCurrentState() {
return softCurrentState;
}
/** {@inheritDoc} */
@Override
public FieldODEStateAndDerivative<T> getInterpolatedState(final T time) {
final T thetaH = time.subtract(globalPreviousState.getTime());
final T oneMinusThetaH = globalCurrentState.getTime().subtract(time);
@ -146,6 +149,7 @@ public abstract class AbstractFieldStepInterpolator<T extends RealFieldElement<T
}
/** {@inheritDoc} */
@Override
public boolean isForward() {
return forward;
}

1
src/main/java/org/apache/commons/math4/ode/sampling/FieldStepNormalizer.java
View File

@ -168,6 +168,7 @@ public class FieldStepNormalizer<T extends RealFieldElement<T>> implements Field
}
/** {@inheritDoc} */
@Override
public void init(final FieldODEStateAndDerivative<T> initialState, final T finalTime) {
first = null;