You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2009/04/05 16:20:23 UTC
svn commit: r762087 [2/4] - in /commons/proper/math/trunk/src:
java/org/apache/commons/math/
java/org/apache/commons/math/analysis/integration/
java/org/apache/commons/math/analysis/polynomials/
java/org/apache/commons/math/analysis/solvers/ java/org/a...
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorFormat.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorFormat.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorFormat.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorFormat.java Sun Apr 5 14:20:18 2009
@@ -237,6 +237,7 @@
* @see java.text.Format#format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition)
* @throws IllegalArgumentException is <code>obj</code> is not a valid type.
*/
+ @Override
public StringBuffer format(Object obj, StringBuffer toAppendTo,
FieldPosition pos) {
@@ -329,6 +330,7 @@
* @return the parsed object.
* @see java.text.Format#parseObject(java.lang.String, java.text.ParsePosition)
*/
+ @Override
public Object parseObject(String source, ParsePosition pos) {
return parse(source, pos);
}
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorImpl.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorImpl.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/linear/RealVectorImpl.java Sun Apr 5 14:20:18 2009
@@ -1259,6 +1259,7 @@
}
/** {@inheritDoc} */
+ @Override
public String toString(){
return DEFAULT_FORMAT.format(this);
}
@@ -1344,6 +1345,7 @@
* not equal to this Vector3D instance
*
*/
+ @Override
public boolean equals(Object other) {
if (this == other) {
@@ -1384,6 +1386,7 @@
* <p>All NaN values have the same hash code.</p>
* @return a hash code value for this object
*/
+ @Override
public int hashCode() {
if (isNaN()) {
return 9;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealMatrix.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealMatrix.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealMatrix.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealMatrix.java Sun Apr 5 14:20:18 2009
@@ -81,6 +81,7 @@
}
/** {@inheritDoc} */
+ @Override
public RealMatrix add(final RealMatrix m)
throws IllegalArgumentException {
try {
@@ -115,6 +116,7 @@
}
/** {@inheritDoc} */
+ @Override
public RealMatrix subtract(final RealMatrix m)
throws IllegalArgumentException {
try {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -91,11 +91,13 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new AdamsBashforthStepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void initializeCoefficients() {
neville = new double[previousF.length];
@@ -112,6 +114,7 @@
}
/** {@inheritDoc} */
+ @Override
public void storeTime(final double t) {
nonTruncatedEnd = t;
nonTruncatedH = nonTruncatedEnd - previousTime;
@@ -129,6 +132,7 @@
}
/** {@inheritDoc} */
+ @Override
public void setInterpolatedTime(final double time)
throws DerivativeException {
interpolatedTime = time;
@@ -139,6 +143,7 @@
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta, final double oneMinusThetaH) {
interpolateDerivatives();
interpolateState(theta);
@@ -275,6 +280,7 @@
}
/** {@inheritDoc} */
+ @Override
public void writeExternal(final ObjectOutput out)
throws IOException {
super.writeExternal(out);
@@ -282,6 +288,7 @@
}
/** {@inheritDoc} */
+ @Override
public void readExternal(final ObjectInput in)
throws IOException {
nonTruncatedEnd = in.readDouble();
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -91,11 +91,13 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new AdamsMoultonStepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void initializeCoefficients() {
neville = new double[previousF.length];
@@ -112,6 +114,7 @@
}
/** {@inheritDoc} */
+ @Override
public void storeTime(final double t) {
nonTruncatedEnd = t;
nonTruncatedH = nonTruncatedEnd - previousTime;
@@ -129,6 +132,7 @@
}
/** {@inheritDoc} */
+ @Override
public void setInterpolatedTime(final double time)
throws DerivativeException {
interpolatedTime = time;
@@ -139,6 +143,7 @@
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta, final double oneMinusThetaH) {
interpolateDerivatives();
interpolateState(theta);
@@ -276,6 +281,7 @@
}
/** {@inheritDoc} */
+ @Override
public void writeExternal(final ObjectOutput out)
throws IOException {
super.writeExternal(out);
@@ -283,6 +289,7 @@
}
/** {@inheritDoc} */
+ @Override
public void readExternal(final ObjectInput in)
throws IOException {
nonTruncatedEnd = in.readDouble();
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java Sun Apr 5 14:20:18 2009
@@ -144,6 +144,7 @@
* @param y placeholder where to put the state vector
* @exception IntegratorException if some inconsistency is detected
*/
+ @Override
protected void sanityChecks(final FirstOrderDifferentialEquations equations,
final double t0, final double[] y0,
final double t, final double[] y)
@@ -286,6 +287,7 @@
throws DerivativeException, IntegratorException;
/** {@inheritDoc} */
+ @Override
public double getCurrentStepStart() {
return stepStart;
}
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -74,11 +74,13 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new ClassicalRungeKuttaStepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java Sun Apr 5 14:20:18 2009
@@ -125,11 +125,13 @@
}
/** {@inheritDoc} */
+ @Override
public int getOrder() {
return 5;
}
/** {@inheritDoc} */
+ @Override
protected double estimateError(final double[][] yDotK,
final double[] y0, final double[] y1,
final double h) {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -82,12 +82,14 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new DormandPrince54StepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
public void reinitialize(final FirstOrderDifferentialEquations equations,
final double[] y, final double[][] yDotK, final boolean forward) {
super.reinitialize(equations, y, yDotK, forward);
@@ -99,12 +101,14 @@
}
/** {@inheritDoc} */
+ @Override
public void storeTime(final double t) {
super.storeTime(t);
vectorsInitialized = false;
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java Sun Apr 5 14:20:18 2009
@@ -239,11 +239,13 @@
}
/** {@inheritDoc} */
+ @Override
public int getOrder() {
return 8;
}
/** {@inheritDoc} */
+ @Override
protected double estimateError(final double[][] yDotK,
final double[] y0, final double[] y1,
final double h) {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -94,11 +94,13 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new DormandPrince853StepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
public void reinitialize(final FirstOrderDifferentialEquations equations,
final double[] y, final double[][] yDotK, final boolean forward) {
@@ -121,12 +123,14 @@
}
/** {@inheritDoc} */
+ @Override
public void storeTime(final double t) {
super.storeTime(t);
vectorsInitialized = false;
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
@@ -201,6 +205,7 @@
}
/** {@inheritDoc} */
+ @Override
protected void doFinalize()
throws DerivativeException {
@@ -244,6 +249,7 @@
}
/** {@inheritDoc} */
+ @Override
public void writeExternal(final ObjectOutput out)
throws IOException {
@@ -266,6 +272,7 @@
}
/** {@inheritDoc} */
+ @Override
public void readExternal(final ObjectInput in)
throws IOException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java Sun Apr 5 14:20:18 2009
@@ -164,6 +164,7 @@
}
/** {@inheritDoc} */
+ @Override
public double integrate(final FirstOrderDifferentialEquations equations,
final double t0, final double[] y0,
final double t, final double[] y)
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -68,12 +68,14 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new EulerStepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -70,12 +70,14 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new GillStepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java Sun Apr 5 14:20:18 2009
@@ -282,6 +282,7 @@
}
/** {@inheritDoc} */
+ @Override
public void addStepHandler (final StepHandler handler) {
super.addStepHandler(handler);
@@ -293,6 +294,7 @@
}
/** {@inheritDoc} */
+ @Override
public void addEventHandler(final EventHandler function,
final double maxCheckInterval,
final double convergence,
@@ -500,6 +502,7 @@
}
/** {@inheritDoc} */
+ @Override
public double integrate(final FirstOrderDifferentialEquations equations,
final double t0, final double[] y0, final double t, final double[] y)
throws DerivativeException, IntegratorException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -224,6 +224,7 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new GraggBulirschStoerStepInterpolator(this);
}
@@ -305,6 +306,7 @@
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
@@ -352,6 +354,7 @@
}
/** {@inheritDoc} */
+ @Override
public void writeExternal(final ObjectOutput out)
throws IOException {
@@ -371,6 +374,7 @@
}
/** {@inheritDoc} */
+ @Override
public void readExternal(final ObjectInput in)
throws IOException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java Sun Apr 5 14:20:18 2009
@@ -98,11 +98,13 @@
}
/** {@inheritDoc} */
+ @Override
public int getOrder() {
return 5;
}
/** {@inheritDoc} */
+ @Override
protected double estimateError(final double[][] yDotK,
final double[] y0, final double[] y1,
final double h) {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -57,12 +57,14 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new HighamHall54StepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -67,12 +67,14 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new MidpointStepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -125,6 +125,7 @@
}
/** {@inheritDoc} */
+ @Override
public void writeExternal(final ObjectOutput out)
throws IOException {
@@ -144,6 +145,7 @@
}
/** {@inheritDoc} */
+ @Override
public void readExternal(final ObjectInput in)
throws IOException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -72,12 +72,14 @@
}
/** {@inheritDoc} */
+ @Override
protected StepInterpolator doCopy() {
return new ThreeEighthesStepInterpolator(this);
}
/** {@inheritDoc} */
+ @Override
protected void computeInterpolatedState(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -77,6 +77,7 @@
/** Really copy the finalized instance.
* @return a copy of the finalized instance
*/
+ @Override
protected StepInterpolator doCopy() {
return new DummyStepInterpolator(this);
}
@@ -91,6 +92,7 @@
* @throws DerivativeException this exception is propagated to the caller if the
* underlying user function triggers one
*/
+ @Override
protected void computeInterpolatedState(final double theta, final double oneMinusThetaH)
throws DerivativeException {
System.arraycopy(currentState, 0, interpolatedState, 0, currentState.length);
@@ -100,6 +102,7 @@
* @param out output channel
* @exception IOException if the instance cannot be written
*/
+ @Override
public void writeExternal(final ObjectOutput out)
throws IOException {
// save the state of the base class
@@ -110,6 +113,7 @@
* @param in input channel
* @exception IOException if the instance cannot be read
*/
+ @Override
public void readExternal(final ObjectInput in)
throws IOException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/MultistepStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/MultistepStepInterpolator.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/MultistepStepInterpolator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/MultistepStepInterpolator.java Sun Apr 5 14:20:18 2009
@@ -115,6 +115,7 @@
protected abstract void initializeCoefficients();
/** {@inheritDoc} */
+ @Override
public void writeExternal(final ObjectOutput out)
throws IOException {
@@ -133,6 +134,7 @@
}
/** {@inheritDoc} */
+ @Override
public void readExternal(final ObjectInput in)
throws IOException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java Sun Apr 5 14:20:18 2009
@@ -59,6 +59,7 @@
}
/** {@inheritDoc} */
+ @Override
protected void iterateSimplex(final Comparator<RealPointValuePair> comparator)
throws FunctionEvaluationException, OptimizationException, IllegalArgumentException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java Sun Apr 5 14:20:18 2009
@@ -73,6 +73,7 @@
}
/** {@inheritDoc} */
+ @Override
protected void iterateSimplex(final Comparator<RealPointValuePair> comparator)
throws FunctionEvaluationException, OptimizationException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java Sun Apr 5 14:20:18 2009
@@ -62,6 +62,7 @@
}
/** {@inheritDoc} */
+ @Override
public VectorialPointValuePair doOptimize()
throws FunctionEvaluationException, OptimizationException, IllegalArgumentException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java Sun Apr 5 14:20:18 2009
@@ -209,6 +209,7 @@
}
/** {@inheritDoc} */
+ @Override
protected VectorialPointValuePair doOptimize()
throws FunctionEvaluationException, OptimizationException, IllegalArgumentException {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java Sun Apr 5 14:20:18 2009
@@ -113,6 +113,7 @@
}
/** {@inheritDoc} */
+ @Override
protected RealPointValuePair doOptimize()
throws FunctionEvaluationException, OptimizationException, IllegalArgumentException {
try {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/linear/SimplexSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/linear/SimplexSolver.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/linear/SimplexSolver.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/linear/SimplexSolver.java Sun Apr 5 14:20:18 2009
@@ -182,6 +182,7 @@
}
/** {@inheritDoc} */
+ @Override
public RealPointValuePair doOptimize()
throws OptimizationException {
final SimplexTableau tableau =
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java Sun Apr 5 14:20:18 2009
@@ -261,6 +261,7 @@
* @param delta grid size
* @throws IOException if an IO error occurs
*/
+ @Override
public void computeBinStats(double min, double delta)
throws IOException {
String str = null;
@@ -279,6 +280,7 @@
*
* @throws IOException if an IOError occurs
*/
+ @Override
public void computeStats() throws IOException {
String str = null;
double val = 0.0;
@@ -314,6 +316,7 @@
*
* @throws IOException if an IO error occurs
*/
+ @Override
public void computeStats() throws IOException {
sampleStats = new SummaryStatistics();
for (int i = 0; i < inputArray.length; i++) {
@@ -327,6 +330,7 @@
* @param delta grid size
* @throws IOException if an IO error occurs
*/
+ @Override
public void computeBinStats(double min, double delta)
throws IOException {
for (int i = 0; i < inputArray.length; i++) {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/random/RandomAdaptor.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/random/RandomAdaptor.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/random/RandomAdaptor.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/random/RandomAdaptor.java Sun Apr 5 14:20:18 2009
@@ -68,6 +68,7 @@
* <code>boolean</code> value from this random number generator's
* sequence
*/
+ @Override
public boolean nextBoolean() {
return randomGenerator.nextBoolean();
}
@@ -80,6 +81,7 @@
* @param bytes the non-null byte array in which to put the
* random bytes
*/
+ @Override
public void nextBytes(byte[] bytes) {
randomGenerator.nextBytes(bytes);
}
@@ -93,6 +95,7 @@
* <code>double</code> value between <code>0.0</code> and
* <code>1.0</code> from this random number generator's sequence
*/
+ @Override
public double nextDouble() {
return randomGenerator.nextDouble();
}
@@ -106,6 +109,7 @@
* value between <code>0.0</code> and <code>1.0</code> from this
* random number generator's sequence
*/
+ @Override
public float nextFloat() {
return randomGenerator.nextFloat();
}
@@ -120,6 +124,7 @@
* standard deviation <code>1.0</code> from this random number
* generator's sequence
*/
+ @Override
public double nextGaussian() {
return randomGenerator.nextGaussian();
}
@@ -133,6 +138,7 @@
* @return the next pseudorandom, uniformly distributed <code>int</code>
* value from this random number generator's sequence
*/
+ @Override
public int nextInt() {
return randomGenerator.nextInt();
}
@@ -148,6 +154,7 @@
* value between 0 (inclusive) and n (exclusive).
* @throws IllegalArgumentException if n is not positive.
*/
+ @Override
public int nextInt(int n) {
return randomGenerator.nextInt(n);
}
@@ -161,6 +168,7 @@
* @return the next pseudorandom, uniformly distributed <code>long</code>
*value from this random number generator's sequence
*/
+ @Override
public long nextLong() {
return randomGenerator.nextLong();
}
@@ -172,6 +180,7 @@
*
* @param seed the seed value
*/
+ @Override
public void setSeed(long seed) {
if (randomGenerator != null) { // required to avoid NPE in constructor
randomGenerator.setSeed(seed);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/special/Beta.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/special/Beta.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/special/Beta.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/special/Beta.java Sun Apr 5 14:20:18 2009
@@ -134,6 +134,7 @@
private static final long serialVersionUID = -7658917278956100597L;
+ @Override
protected double getB(int n, double x) {
double ret;
double m;
@@ -149,6 +150,7 @@
return ret;
}
+ @Override
protected double getA(int n, double x) {
return 1.0;
}
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/special/Gamma.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/special/Gamma.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/special/Gamma.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/special/Gamma.java Sun Apr 5 14:20:18 2009
@@ -244,10 +244,12 @@
private static final long serialVersionUID = 5378525034886164398L;
+ @Override
protected double getA(int n, double x) {
return ((2.0 * n) + 1.0) - a + x;
}
+ @Override
protected double getB(int n, double x) {
return n * (a - n);
}
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/Frequency.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/Frequency.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/Frequency.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/Frequency.java Sun Apr 5 14:20:18 2009
@@ -68,6 +68,7 @@
*
* @return a string representation.
*/
+ @Override
public String toString() {
NumberFormat nf = NumberFormat.getPercentInstance();
StringBuffer outBuffer = new StringBuffer();
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java Sun Apr 5 14:20:18 2009
@@ -55,6 +55,7 @@
* @return the value of the statistic applied to the input array
* @see org.apache.commons.math.stat.descriptive.UnivariateStatistic#evaluate(double[])
*/
+ @Override
public double evaluate(final double[] values) {
if (values == null) {
throw new IllegalArgumentException("input value array is null");
@@ -83,6 +84,7 @@
* @return the value of the statistic applied to the included array entries
* @see org.apache.commons.math.stat.descriptive.UnivariateStatistic#evaluate(double[], int, int)
*/
+ @Override
public double evaluate(final double[] values, final int begin, final int length) {
if (test(values, begin, length)) {
clear();
@@ -94,6 +96,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public abstract StorelessUnivariateStatistic copy();
/**
@@ -156,6 +159,7 @@
* @param object object to test equality against.
* @return true if object returns the same value as this
*/
+ @Override
public boolean equals(Object object) {
if (object == this ) {
return true;
@@ -173,6 +177,7 @@
*
* @return hash code
*/
+ @Override
public int hashCode() {
return 31* (31 + MathUtils.hash(getResult())) + MathUtils.hash(getN());
}
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java Sun Apr 5 14:20:18 2009
@@ -399,6 +399,7 @@
*
* @return String with line feeds displaying statistics
*/
+ @Override
public String toString() {
StringBuffer outBuffer = new StringBuffer();
String endl = "\n";
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java Sun Apr 5 14:20:18 2009
@@ -301,6 +301,7 @@
* have been added.
* @return String with line feeds displaying statistics
*/
+ @Override
public String toString() {
StringBuffer outBuffer = new StringBuffer();
outBuffer.append("MultivariateSummaryStatistics:\n");
@@ -359,6 +360,7 @@
* @param object the object to test equality against.
* @return true if object equals this
*/
+ @Override
public boolean equals(Object object) {
if (object == this ) {
return true;
@@ -384,6 +386,7 @@
*
* @return hash code
*/
+ @Override
public int hashCode() {
int result = 31 + MathUtils.hash(getGeometricMean());
result = result * 31 + MathUtils.hash(getGeometricMean());
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValues.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValues.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValues.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValues.java Sun Apr 5 14:20:18 2009
@@ -126,6 +126,7 @@
* @param object the object to test equality against.
* @return true if object equals this
*/
+ @Override
public boolean equals(Object object) {
if (object == this ) {
return true;
@@ -147,6 +148,7 @@
*
* @return hash code
*/
+ @Override
public int hashCode() {
int result = 31 + MathUtils.hash(getMax());
result = result * 31 + MathUtils.hash(getMean());
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java Sun Apr 5 14:20:18 2009
@@ -290,6 +290,7 @@
* @return String with line feeds displaying statistics
* @since 1.2
*/
+ @Override
public String toString() {
StringBuffer outBuffer = new StringBuffer();
String endl = "\n";
@@ -335,6 +336,7 @@
* @param object the object to test equality against.
* @return true if object equals this
*/
+ @Override
public boolean equals(Object object) {
if (object == this) {
return true;
@@ -358,6 +360,7 @@
* Returns hash code based on values of statistics
* @return hash code
*/
+ @Override
public int hashCode() {
int result = 31 + MathUtils.hash(getGeometricMean());
result = result * 31 + MathUtils.hash(getGeometricMean());
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatistics.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatistics.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatistics.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatistics.java Sun Apr 5 14:20:18 2009
@@ -61,15 +61,15 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void addValue(double v) {
super.addValue(v);
}
/**
- * Apply the given statistic to this univariate collection.
- * @param stat the statistic to apply
- * @return the computed value of the statistic.
+ * {@inheritDoc}
*/
+ @Override
public synchronized double apply(UnivariateStatistic stat) {
return super.apply(stat);
}
@@ -77,6 +77,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void clear() {
super.clear();
}
@@ -84,6 +85,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getElement(int index) {
return super.getElement(index);
}
@@ -91,15 +93,15 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized long getN() {
return super.getN();
}
/**
- * Returns the standard deviation of the available values.
- * @return The standard deviation, Double.NaN if no values have been added
- * or 0.0 for a single value set.
+ * {@inheritDoc}
*/
+ @Override
public synchronized double getStandardDeviation() {
return super.getStandardDeviation();
}
@@ -107,14 +109,15 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getValues() {
return super.getValues();
}
/**
- * Access the window size.
- * @return the current window size.
+ * {@inheritDoc}
*/
+ @Override
public synchronized int getWindowSize() {
return super.getWindowSize();
}
@@ -122,17 +125,15 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setWindowSize(int windowSize) {
super.setWindowSize(windowSize);
}
/**
- * Generates a text report displaying univariate statistics from values
- * that have been added. Each statistic is displayed on a separate
- * line.
- *
- * @return String with line feeds displaying statistics
+ * {@inheritDoc}
*/
+ @Override
public synchronized String toString() {
return super.toString();
}
@@ -143,6 +144,7 @@
*
* @return a copy of this
*/
+ @Override
public synchronized SynchronizedDescriptiveStatistics copy() {
SynchronizedDescriptiveStatistics result =
new SynchronizedDescriptiveStatistics();
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java Sun Apr 5 14:20:18 2009
@@ -51,6 +51,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void addValue(double[] value)
throws DimensionMismatchException {
super.addValue(value);
@@ -59,6 +60,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized int getDimension() {
return super.getDimension();
}
@@ -66,6 +68,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized long getN() {
return super.getN();
}
@@ -73,6 +76,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getSum() {
return super.getSum();
}
@@ -80,6 +84,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getSumSq() {
return super.getSumSq();
}
@@ -87,6 +92,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getSumLog() {
return super.getSumLog();
}
@@ -94,6 +100,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getMean() {
return super.getMean();
}
@@ -101,6 +108,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getStandardDeviation() {
return super.getStandardDeviation();
}
@@ -108,6 +116,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized RealMatrix getCovariance() {
return super.getCovariance();
}
@@ -115,6 +124,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getMax() {
return super.getMax();
}
@@ -122,6 +132,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getMin() {
return super.getMin();
}
@@ -129,6 +140,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double[] getGeometricMean() {
return super.getGeometricMean();
}
@@ -136,6 +148,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized String toString() {
return super.toString();
}
@@ -143,6 +156,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void clear() {
super.clear();
}
@@ -150,6 +164,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized boolean equals(Object object) {
return super.equals(object);
}
@@ -157,6 +172,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized int hashCode() {
return super.hashCode();
}
@@ -164,6 +180,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic[] getSumImpl() {
return super.getSumImpl();
}
@@ -171,6 +188,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setSumImpl(StorelessUnivariateStatistic[] sumImpl)
throws DimensionMismatchException {
super.setSumImpl(sumImpl);
@@ -179,6 +197,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic[] getSumsqImpl() {
return super.getSumsqImpl();
}
@@ -186,6 +205,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setSumsqImpl(StorelessUnivariateStatistic[] sumsqImpl)
throws DimensionMismatchException {
super.setSumsqImpl(sumsqImpl);
@@ -194,6 +214,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic[] getMinImpl() {
return super.getMinImpl();
}
@@ -201,6 +222,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setMinImpl(StorelessUnivariateStatistic[] minImpl)
throws DimensionMismatchException {
super.setMinImpl(minImpl);
@@ -209,6 +231,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic[] getMaxImpl() {
return super.getMaxImpl();
}
@@ -216,6 +239,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setMaxImpl(StorelessUnivariateStatistic[] maxImpl)
throws DimensionMismatchException {
super.setMaxImpl(maxImpl);
@@ -224,6 +248,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic[] getSumLogImpl() {
return super.getSumLogImpl();
}
@@ -231,6 +256,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setSumLogImpl(StorelessUnivariateStatistic[] sumLogImpl)
throws DimensionMismatchException {
super.setSumLogImpl(sumLogImpl);
@@ -239,6 +265,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic[] getGeoMeanImpl() {
return super.getGeoMeanImpl();
}
@@ -246,6 +273,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setGeoMeanImpl(StorelessUnivariateStatistic[] geoMeanImpl)
throws DimensionMismatchException {
super.setGeoMeanImpl(geoMeanImpl);
@@ -254,6 +282,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic[] getMeanImpl() {
return super.getMeanImpl();
}
@@ -261,6 +290,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setMeanImpl(StorelessUnivariateStatistic[] meanImpl)
throws DimensionMismatchException {
super.setMeanImpl(meanImpl);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatistics.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatistics.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatistics.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatistics.java Sun Apr 5 14:20:18 2009
@@ -53,6 +53,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StatisticalSummary getSummary() {
return super.getSummary();
}
@@ -60,6 +61,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void addValue(double value) {
super.addValue(value);
}
@@ -67,6 +69,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized long getN() {
return super.getN();
}
@@ -74,6 +77,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getSum() {
return super.getSum();
}
@@ -81,6 +85,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getSumsq() {
return super.getSumsq();
}
@@ -88,6 +93,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getMean() {
return super.getMean();
}
@@ -95,6 +101,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getStandardDeviation() {
return super.getStandardDeviation();
}
@@ -102,6 +109,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getVariance() {
return super.getVariance();
}
@@ -109,6 +117,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getMax() {
return super.getMax();
}
@@ -116,6 +125,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getMin() {
return super.getMin();
}
@@ -123,6 +133,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized double getGeometricMean() {
return super.getGeometricMean();
}
@@ -130,6 +141,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized String toString() {
return super.toString();
}
@@ -137,6 +149,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void clear() {
super.clear();
}
@@ -144,6 +157,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized boolean equals(Object object) {
return super.equals(object);
}
@@ -151,6 +165,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized int hashCode() {
return super.hashCode();
}
@@ -158,6 +173,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getSumImpl() {
return super.getSumImpl();
}
@@ -165,6 +181,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setSumImpl(StorelessUnivariateStatistic sumImpl) {
super.setSumImpl(sumImpl);
}
@@ -172,6 +189,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getSumsqImpl() {
return super.getSumsqImpl();
}
@@ -179,6 +197,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setSumsqImpl(StorelessUnivariateStatistic sumsqImpl) {
super.setSumsqImpl(sumsqImpl);
}
@@ -186,6 +205,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getMinImpl() {
return super.getMinImpl();
}
@@ -193,6 +213,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setMinImpl(StorelessUnivariateStatistic minImpl) {
super.setMinImpl(minImpl);
}
@@ -200,6 +221,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getMaxImpl() {
return super.getMaxImpl();
}
@@ -207,6 +229,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setMaxImpl(StorelessUnivariateStatistic maxImpl) {
super.setMaxImpl(maxImpl);
}
@@ -214,6 +237,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getSumLogImpl() {
return super.getSumLogImpl();
}
@@ -221,6 +245,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setSumLogImpl(StorelessUnivariateStatistic sumLogImpl) {
super.setSumLogImpl(sumLogImpl);
}
@@ -228,6 +253,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getGeoMeanImpl() {
return super.getGeoMeanImpl();
}
@@ -235,6 +261,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setGeoMeanImpl(StorelessUnivariateStatistic geoMeanImpl) {
super.setGeoMeanImpl(geoMeanImpl);
}
@@ -242,6 +269,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getMeanImpl() {
return super.getMeanImpl();
}
@@ -249,6 +277,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setMeanImpl(StorelessUnivariateStatistic meanImpl) {
super.setMeanImpl(meanImpl);
}
@@ -256,6 +285,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized StorelessUnivariateStatistic getVarianceImpl() {
return super.getVarianceImpl();
}
@@ -263,6 +293,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void setVarianceImpl(StorelessUnivariateStatistic varianceImpl) {
super.setVarianceImpl(varianceImpl);
}
@@ -273,6 +304,7 @@
*
* @return a copy of this
*/
+ @Override
public synchronized SynchronizedSummaryStatistics copy() {
SynchronizedSummaryStatistics result =
new SynchronizedSummaryStatistics();
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java Sun Apr 5 14:20:18 2009
@@ -93,6 +93,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (n == 0) {
m1 = 0.0;
@@ -107,6 +108,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
m1 = Double.NaN;
n = 0;
@@ -117,6 +119,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return m1;
}
@@ -131,6 +134,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public FirstMoment copy() {
FirstMoment result = new FirstMoment();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FourthMoment.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FourthMoment.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FourthMoment.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/FourthMoment.java Sun Apr 5 14:20:18 2009
@@ -80,6 +80,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (n < 1) {
m4 = 0.0;
@@ -102,6 +103,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return m4;
}
@@ -109,6 +111,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
super.clear();
m4 = Double.NaN;
@@ -117,6 +120,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public FourthMoment copy() {
FourthMoment result = new FourthMoment();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java Sun Apr 5 14:20:18 2009
@@ -74,6 +74,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public GeometricMean copy() {
GeometricMean result = new GeometricMean();
copy(this, result);
@@ -91,6 +92,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
sumOfLogs.increment(d);
}
@@ -98,6 +100,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
if (sumOfLogs.getN() > 0) {
return Math.exp(sumOfLogs.getResult() / (double) sumOfLogs.getN());
@@ -109,6 +112,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
sumOfLogs.clear();
}
@@ -129,6 +133,7 @@
* @throws IllegalArgumentException if the input array is null or the array
* index parameters are not valid
*/
+ @Override
public double evaluate(
final double[] values, final int begin, final int length) {
return Math.exp(
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java Sun Apr 5 14:20:18 2009
@@ -87,6 +87,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (incMoment) {
moment.increment(d);
@@ -99,6 +100,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
double kurtosis = Double.NaN;
if (moment.getN() > 3) {
@@ -119,6 +121,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
if (incMoment) {
moment.clear();
@@ -153,6 +156,7 @@
* @throws IllegalArgumentException if the input array is null or the array
* index parameters are not valid
*/
+ @Override
public double evaluate(final double[] values,final int begin, final int length) {
// Initialize the kurtosis
double kurt = Double.NaN;
@@ -190,6 +194,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Kurtosis copy() {
Kurtosis result = new Kurtosis();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Mean.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Mean.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Mean.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Mean.java Sun Apr 5 14:20:18 2009
@@ -101,6 +101,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (incMoment) {
moment.increment(d);
@@ -110,6 +111,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
if (incMoment) {
moment.clear();
@@ -119,6 +121,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return moment.m1;
}
@@ -146,6 +149,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values,final int begin, final int length) {
if (test(values, begin, length)) {
Sum sum = new Sum();
@@ -167,6 +171,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Mean copy() {
Mean result = new Mean();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/SecondMoment.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/SecondMoment.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/SecondMoment.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/SecondMoment.java Sun Apr 5 14:20:18 2009
@@ -72,6 +72,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (n < 1) {
m1 = m2 = 0.0;
@@ -83,6 +84,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
super.clear();
m2 = Double.NaN;
@@ -91,6 +93,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return m2;
}
@@ -98,6 +101,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public SecondMoment copy() {
SecondMoment result = new SecondMoment();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Skewness.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Skewness.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Skewness.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Skewness.java Sun Apr 5 14:20:18 2009
@@ -83,6 +83,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (incMoment) {
moment.increment(d);
@@ -96,6 +97,7 @@
*
* @return the skewness of the available values.
*/
+ @Override
public double getResult() {
if (moment.n < 3) {
@@ -121,6 +123,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
if (incMoment) {
moment.clear();
@@ -143,6 +146,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values,final int begin,
final int length) {
@@ -184,6 +188,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Skewness copy() {
Skewness result = new Skewness();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviation.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviation.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviation.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviation.java Sun Apr 5 14:20:18 2009
@@ -105,6 +105,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
variance.increment(d);
}
@@ -119,6 +120,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return Math.sqrt(variance.getResult());
}
@@ -126,6 +128,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
variance.clear();
}
@@ -144,6 +147,7 @@
* @return the standard deviation of the values or Double.NaN if length = 0
* @throws IllegalArgumentException if the array is null
*/
+ @Override
public double evaluate(final double[] values) {
return Math.sqrt(variance.evaluate(values));
}
@@ -166,6 +170,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values, final int begin, final int length) {
return Math.sqrt(variance.evaluate(values, begin, length));
}
@@ -241,6 +246,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public StandardDeviation copy() {
StandardDeviation result = new StandardDeviation();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/ThirdMoment.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/ThirdMoment.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/ThirdMoment.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/ThirdMoment.java Sun Apr 5 14:20:18 2009
@@ -81,6 +81,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (n < 1) {
m3 = m2 = m1 = 0.0;
@@ -96,6 +97,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return m3;
}
@@ -103,6 +105,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
super.clear();
m3 = Double.NaN;
@@ -112,6 +115,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ThirdMoment copy() {
ThirdMoment result = new ThirdMoment();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Variance.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Variance.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Variance.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/moment/Variance.java Sun Apr 5 14:20:18 2009
@@ -150,6 +150,7 @@
* list of values together to execute a two-pass algorithm.
* See {@link Variance}.</p>
*/
+ @Override
public void increment(final double d) {
if (incMoment) {
moment.increment(d);
@@ -159,6 +160,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
if (moment.n == 0) {
return Double.NaN;
@@ -183,6 +185,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
if (incMoment) {
moment.clear();
@@ -205,6 +208,7 @@
* @return the variance of the values or Double.NaN if length = 0
* @throws IllegalArgumentException if the array is null
*/
+ @Override
public double evaluate(final double[] values) {
if (values == null) {
throw new IllegalArgumentException("input values array is null");
@@ -232,6 +236,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values, final int begin, final int length) {
double var = Double.NaN;
@@ -349,6 +354,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Variance copy() {
Variance result = new Variance();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Max.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Max.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Max.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Max.java Sun Apr 5 14:20:18 2009
@@ -67,6 +67,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (d > value || Double.isNaN(value)) {
value = d;
@@ -77,6 +78,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
value = Double.NaN;
n = 0;
@@ -85,6 +87,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return value;
}
@@ -118,6 +121,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values, final int begin, final int length) {
double max = Double.NaN;
if (test(values, begin, length)) {
@@ -134,6 +138,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Max copy() {
Max result = new Max();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Min.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Min.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Min.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Min.java Sun Apr 5 14:20:18 2009
@@ -69,6 +69,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (d < value || Double.isNaN(value)) {
value = d;
@@ -79,6 +80,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
value = Double.NaN;
n = 0;
@@ -87,6 +89,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return value;
}
@@ -120,6 +123,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values,final int begin, final int length) {
double min = Double.NaN;
if (test(values, begin, length)) {
@@ -136,6 +140,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Min copy() {
Min result = new Min();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java Sun Apr 5 14:20:18 2009
@@ -155,6 +155,7 @@
* @throws IllegalArgumentException if the parameters are not valid
*
*/
+ @Override
public double evaluate( final double[] values, final int start, final int length) {
return evaluate(values, start, length, quantile);
}
@@ -251,6 +252,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Percentile copy() {
Percentile result = new Percentile();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Product.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Product.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Product.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Product.java Sun Apr 5 14:20:18 2009
@@ -67,6 +67,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (n == 0) {
value = d;
@@ -79,6 +80,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return value;
}
@@ -93,6 +95,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
value = Double.NaN;
n = 0;
@@ -112,6 +115,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values, final int begin, final int length) {
double product = Double.NaN;
if (test(values, begin, length)) {
@@ -126,6 +130,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Product copy() {
Product result = new Product();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Sum.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Sum.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Sum.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/Sum.java Sun Apr 5 14:20:18 2009
@@ -67,6 +67,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (n == 0) {
value = d;
@@ -79,6 +80,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return value;
}
@@ -93,6 +95,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
value = Double.NaN;
n = 0;
@@ -112,6 +115,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values, final int begin, final int length) {
double sum = Double.NaN;
if (test(values, begin, length)) {
@@ -126,6 +130,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Sum copy() {
Sum result = new Sum();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfLogs.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfLogs.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfLogs.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfLogs.java Sun Apr 5 14:20:18 2009
@@ -75,6 +75,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
value += Math.log(d);
n++;
@@ -83,6 +84,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
if (n > 0) {
return value;
@@ -101,6 +103,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
value = 0d;
n = 0;
@@ -123,6 +126,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values, final int begin, final int length) {
double sumLog = Double.NaN;
if (test(values, begin, length)) {
@@ -137,6 +141,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public SumOfLogs copy() {
SumOfLogs result = new SumOfLogs();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfSquares.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfSquares.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfSquares.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/descriptive/summary/SumOfSquares.java Sun Apr 5 14:20:18 2009
@@ -67,6 +67,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void increment(final double d) {
if (n == 0) {
value = d * d;
@@ -79,6 +80,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public double getResult() {
return value;
}
@@ -93,6 +95,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void clear() {
value = Double.NaN;
n = 0;
@@ -112,6 +115,7 @@
* @throws IllegalArgumentException if the array is null or the array index
* parameters are not valid
*/
+ @Override
public double evaluate(final double[] values,final int begin, final int length) {
double sumSq = Double.NaN;
if (test(values, begin, length)) {
@@ -126,6 +130,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public SumOfSquares copy() {
SumOfSquares result = new SumOfSquares();
copy(this, result);
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegression.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegression.java?rev=762087&r1=762086&r2=762087&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegression.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegression.java Sun Apr 5 14:20:18 2009
@@ -90,6 +90,7 @@
* </pre>
* @return beta
*/
+ @Override
protected RealMatrix calculateBeta() {
RealMatrix OI = getOmegaInverse();
RealMatrix XT = X.transpose();
@@ -105,6 +106,7 @@
* </pre>
* @return The beta variance matrix
*/
+ @Override
protected RealMatrix calculateBetaVariance() {
RealMatrix OI = getOmegaInverse();
RealMatrix XTOIX = X.transpose().multiply(OI).multiply(X);
@@ -118,6 +120,7 @@
* </pre>
* @return The Y variance
*/
+ @Override
protected double calculateYVariance() {
RealMatrix u = calculateResiduals();
RealMatrix sse = u.transpose().multiply(getOmegaInverse()).multiply(u);