Fixed lots of warnings due to missing @Deprecated annotations.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-math/commit/e875e6d5
Tree:
http://git-wip-us.apache.org/repos/asf/commons-math/tree/e875e6d5
Diff:
http://git-wip-us.apache.org/repos/asf/commons-math/diff/e875e6d5
Branch: refs/heads/master
Commit: e875e6d59875be86fb8de8df7642c370b652eb76
Parents: abffaf3
Author: Luc Maisonobe <l...@apache.org>
Authored: Mon Sep 22 18:07:54 2014 +0200
Committer: Luc Maisonobe <l...@apache.org>
Committed: Mon Sep 22 18:07:54 2014 +0200
----------------------------------------------------------------------
.../linear/SingularValueDecomposition.java | 3 -
.../MultiStartMultivariateVectorOptimizer.java | 1 +
.../vector/MultivariateVectorOptimizer.java | 1 +
.../commons/math3/random/ValueServer.java | 10 +--
.../math3/util/ResizableDoubleArray.java | 2 +-
.../analysis/integration/gauss/HermiteTest.java | 3 -
.../BicubicSplineInterpolatingFunctionTest.java | 1 -
.../KolmogorovSmirnovDistributionTest.java | 1 +
...riateNormalMixtureModelDistributionTest.java | 6 +-
.../commons/math3/fitting/CurveFitterTest.java | 1 +
.../math3/fitting/GaussianCurveFitterTest.java | 7 +-
.../math3/fitting/GaussianFitterTest.java | 1 +
.../math3/fitting/HarmonicCurveFitterTest.java | 13 ++--
.../math3/fitting/HarmonicFitterTest.java | 3 +-
.../fitting/PolynomialCurveFitterTest.java | 10 +--
.../math3/fitting/PolynomialFitterTest.java | 2 +
...stractLeastSquaresOptimizerAbstractTest.java | 2 +-
.../fitting/leastsquares/EvaluationTest.java | 2 +-
.../leastsquares/EvaluationTestValidation.java | 2 -
.../LevenbergMarquardtOptimizerTest.java | 42 ------------
.../math3/fitting/leastsquares/MinpackTest.java | 18 ------
.../math3/linear/BlockFieldMatrixTest.java | 2 +-
.../math3/linear/FieldMatrixImplTest.java | 2 +-
.../ml/neuralnet/OffsetFeatureInitializer.java | 4 --
.../ml/neuralnet/oned/NeuronStringTest.java | 15 ++---
.../neuralnet/sofm/KohonenTrainingTaskTest.java | 67
+++-----------------
.../sofm/TravellingSalesmanSolver.java | 3 -
.../neuralnet/twod/NeuronSquareMesh2DTest.java | 17 +++--
.../ode/sampling/DummyStepInterpolatorTest.java | 3 -
...NonLinearConjugateGradientOptimizerTest.java | 1 -
...ltiStartMultivariateVectorOptimizerTest.java | 1 +
...stractLeastSquaresOptimizerAbstractTest.java | 2 +
.../AbstractLeastSquaresOptimizerTest.java | 2 +
...ractLeastSquaresOptimizerTestValidation.java | 6 +-
.../vector/jacobian/CircleProblem.java | 2 +
.../vector/jacobian/CircleVectorial.java | 2 +
.../jacobian/GaussNewtonOptimizerTest.java | 2 +
.../LevenbergMarquardtOptimizerTest.java | 43 +------------
.../nonlinear/vector/jacobian/MinpackTest.java | 2 +
.../jacobian/RandomCirclePointGenerator.java | 1 +
.../RandomStraightLinePointGenerator.java | 2 +
.../jacobian/StatisticalReferenceDataset.java | 2 +
.../StatisticalReferenceDatasetFactory.java | 2 +
.../vector/jacobian/StraightLineProblem.java | 2 +
.../optim/univariate/BrentOptimizerTest.java | 2 -
...teDifferentiableMultiStartOptimizerTest.java | 1 +
...erentiableVectorMultiStartOptimizerTest.java | 1 +
.../MultivariateMultiStartOptimizerTest.java | 1 +
.../math3/optimization/PointValuePairTest.java | 1 +
.../optimization/PointVectorValuePairTest.java | 1 +
.../optimization/SimplePointCheckerTest.java | 1 +
.../optimization/SimpleValueCheckerTest.java | 1 +
.../SimpleVectorValueCheckerTest.java | 1 +
.../direct/BOBYQAOptimizerTest.java | 1 +
.../optimization/direct/CMAESOptimizerTest.java | 1 +
.../MultivariateFunctionMappingAdapterTest.java | 1 +
.../MultivariateFunctionPenaltyAdapterTest.java | 1 +
.../direct/PowellOptimizerTest.java | 1 +
.../SimplexOptimizerMultiDirectionalTest.java | 1 +
.../direct/SimplexOptimizerNelderMeadTest.java | 1 +
.../optimization/fitting/CurveFitterTest.java | 1 +
.../fitting/GaussianFitterTest.java | 2 +-
.../fitting/HarmonicFitterTest.java | 2 +-
.../fitting/PolynomialFitterTest.java | 4 +-
...stractLeastSquaresOptimizerAbstractTest.java | 1 +
.../AbstractLeastSquaresOptimizerTest.java | 2 +-
...ractLeastSquaresOptimizerTestValidation.java | 5 +-
.../optimization/general/CircleProblem.java | 1 +
.../optimization/general/CircleScalar.java | 1 +
.../optimization/general/CircleVectorial.java | 1 +
.../general/GaussNewtonOptimizerTest.java | 1 +
.../LevenbergMarquardtOptimizerTest.java | 1 +
.../math3/optimization/general/MinpackTest.java | 2 +-
...NonLinearConjugateGradientOptimizerTest.java | 1 +
.../general/RandomCirclePointGenerator.java | 1 +
.../RandomStraightLinePointGenerator.java | 2 +
.../general/StatisticalReferenceDataset.java | 1 +
.../StatisticalReferenceDatasetFactory.java | 1 +
.../general/StraightLineProblem.java | 1 +
.../optimization/linear/SimplexSolverTest.java | 1 +
.../optimization/linear/SimplexTableauTest.java | 1 +
.../univariate/BracketFinderTest.java | 2 +-
.../univariate/BrentOptimizerTest.java | 3 +-
.../SimpleUnivariateValueCheckerTest.java | 1 +
.../UnivariateMultiStartOptimizerTest.java | 1 +
.../math3/random/EmpiricalDistributionTest.java | 2 -
.../apache/commons/math3/special/BetaTest.java | 2 +-
.../stat/clustering/DBSCANClustererTest.java | 1 +
.../clustering/EuclideanDoublePointTest.java | 1 +
.../clustering/EuclideanIntegerPointTest.java | 1 +
.../clustering/KMeansPlusPlusClustererTest.java | 1 +
.../commons/math3/util/MathUtilsTest.java | 4 +-
.../math3/util/ResizableDoubleArrayTest.java | 52 +++++++--------
93 files changed, 163 insertions(+), 274 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java
----------------------------------------------------------------------
diff --git
a/src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java
b/src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java
index cb670ae..89c0afd 100644
---
a/src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java
+++
b/src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java
@@ -267,7 +267,6 @@ public class SingularValueDecomposition {
// Main iteration loop for the singular values.
final int pp = p - 1;
- int iter = 0;
while (p > 0) {
int k;
int kase;
@@ -429,7 +428,6 @@ public class SingularValueDecomposition {
}
}
e[p - 2] = f;
- iter++;
}
break;
// Convergence.
@@ -466,7 +464,6 @@ public class SingularValueDecomposition {
}
k++;
}
- iter = 0;
p--;
}
break;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java
----------------------------------------------------------------------
diff --git
a/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java
b/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java
index 237befe..1095057 100644
---
a/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java
+++
b/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java
@@ -38,6 +38,7 @@ import
org.apache.commons.math3.optim.PointVectorValuePair;
*
* @since 3.0
*/
+@Deprecated
public class MultiStartMultivariateVectorOptimizer
extends
BaseMultiStartMultivariateOptimizer<PointVectorValuePair> {
/** Underlying optimizer. */
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java
----------------------------------------------------------------------
diff --git
a/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java
b/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java
index 3f04b47..c79defa 100644
---
a/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java
+++
b/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java
@@ -31,6 +31,7 @@ import org.apache.commons.math3.linear.RealMatrix;
*
* @since 3.1
*/
+@Deprecated
public abstract class MultivariateVectorOptimizer
extends BaseMultivariateOptimizer<PointVectorValuePair> {
/** Target values for the model function at optimum. */
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/main/java/org/apache/commons/math3/random/ValueServer.java
----------------------------------------------------------------------
diff --git
a/src/main/java/org/apache/commons/math3/random/ValueServer.java
b/src/main/java/org/apache/commons/math3/random/ValueServer.java
index 767cdc2..975d2d8 100644
--- a/src/main/java/org/apache/commons/math3/random/ValueServer.java
+++ b/src/main/java/org/apache/commons/math3/random/ValueServer.java
@@ -87,13 +87,13 @@ public class ValueServer {
private BufferedReader filePointer = null;
/** RandomDataImpl to use for random data generation. */
- private final RandomDataImpl randomData;
+ private final RandomDataGenerator randomData;
// Data generation modes ======================================
/** Creates new ValueServer */
public ValueServer() {
- randomData = new RandomDataImpl();
+ randomData = new RandomDataGenerator();
}
/**
@@ -106,7 +106,7 @@ public class ValueServer {
*/
@Deprecated
public ValueServer(RandomDataImpl randomData) {
- this.randomData = randomData;
+ this.randomData = randomData.getDelegate();
}
/**
@@ -117,7 +117,7 @@ public class ValueServer {
* @param generator source of random data
*/
public ValueServer(RandomGenerator generator) {
- this.randomData = new RandomDataImpl(generator);
+ this.randomData = new RandomDataGenerator(generator);
}
/**
@@ -215,7 +215,7 @@ public class ValueServer {
* @throws ZeroException if URL contains no data
*/
public void computeDistribution(int binCount) throws
NullArgumentException, IOException, ZeroException {
- empiricalDistribution = new EmpiricalDistribution(binCount,
randomData);
+ empiricalDistribution = new EmpiricalDistribution(binCount,
randomData.getRandomGenerator());
empiricalDistribution.load(valuesFileURL);
mu = empiricalDistribution.getSampleStats().getMean();
sigma =
empiricalDistribution.getSampleStats().getStandardDeviation();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
----------------------------------------------------------------------
diff --git
a/src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
b/src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
index a988691..468ed74 100644
---
a/src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
+++
b/src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
@@ -411,7 +411,7 @@ public class ResizableDoubleArray implements
DoubleArray, Serializable {
numElements = 0;
startIndex = 0;
- if (data != null) {
+ if (data != null && data.length > 1) {
addElements(data);
}
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteTest.java
b/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteTest.java
index 5191170..659ac78 100644
---
a/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteTest.java
+++
b/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteTest.java
@@ -32,8 +32,6 @@ public class HermiteTest {
public void testNormalDistribution() {
final double oneOverSqrtPi = 1 / FastMath.sqrt(Math.PI);
- final double mu = 12345.6789;
- final double sigma = 987.654321;
// By defintion, Gauss-Hermite quadrature readily provides
the
// integral of the normal distribution density.
final int numPoints = 1;
@@ -87,7 +85,6 @@ public class HermiteTest {
public void testNormalVariance() {
final double twoOverSqrtPi = 2 / FastMath.sqrt(Math.PI);
- final double mu = 12345.6789;
final double sigma = 987.654321;
final double sigma2 = sigma * sigma;
final int numPoints = 5;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
b/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
index 8b40669..8c78aed 100644
---
a/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
+++
b/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
@@ -595,7 +595,6 @@ public final class
BicubicSplineInterpolatingFunctionTest {
= new UniformRealDistribution(rng, yval[0],
yval[yval.length - 1]);
final double tol = 224;
- double max = 0;
for (int i = 0; i < sz; i++) {
x = distX.sample();
for (int j = 0; j < sz; j++) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
b/src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
index d5fcaa0..53f4ff8 100644
---
a/src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
+++
b/src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
@@ -24,6 +24,7 @@ import org.junit.Test;
* Test cases for {@link KolmogorovSmirnovDistribution}.
*
*/
+@Deprecated
public class KolmogorovSmirnovDistributionTest {
private static final double TOLERANCE = 10e-10;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java
b/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java
index 03df012..12a23c2 100644
---
a/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java
+++
b/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java
@@ -58,8 +58,7 @@ public class
MultivariateNormalMixtureModelDistributionTest {
{ -1.1, 2.0 } },
{ { 3.5, 1.5 },
{ 1.5, 3.5 } } };
- final MultivariateNormalMixtureModelDistribution d
- = create(weights, means, covariances);
+ create(weights, means, covariances);
}
@Test(expected=NotPositiveException.class)
@@ -71,8 +70,7 @@ public class
MultivariateNormalMixtureModelDistributionTest {
{ -1.1, 2.0 } },
{ { 3.5, 1.5 },
{ 1.5, 3.5 } } };
- final MultivariateNormalMixtureModelDistribution d
- = create(negativeWeights, means, covariances);
+ create(negativeWeights, means, covariances);
}
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/CurveFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/CurveFitterTest.java
b/src/test/java/org/apache/commons/math3/fitting/CurveFitterTest.java
index 7f07e3d..d08e942 100644
---
a/src/test/java/org/apache/commons/math3/fitting/CurveFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/CurveFitterTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.math3.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class CurveFitterTest {
@Test
public void testMath303() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/GaussianCurveFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/GaussianCurveFitterTest.java
b/src/test/java/org/apache/commons/math3/fitting/GaussianCurveFitterTest.java
index 3437e9e..153274b 100644
---
a/src/test/java/org/apache/commons/math3/fitting/GaussianCurveFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/GaussianCurveFitterTest.java
@@ -210,10 +210,9 @@ public class GaussianCurveFitterTest {
final double[] init = { 3.5e6, 4.2, 0.1 };
GaussianCurveFitter fitter = GaussianCurveFitter.create();
- double[] parameters = fitter
- .withMaxIterations(maxIter)
- .withStartPoint(init)
- .fit(createDataset(DATASET1).toList());
+ fitter.withMaxIterations(maxIter)
+ .withStartPoint(init)
+ .fit(createDataset(DATASET1).toList());
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/GaussianFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/GaussianFitterTest.java
b/src/test/java/org/apache/commons/math3/fitting/GaussianFitterTest.java
index b7fd32d..ddec57d 100644
---
a/src/test/java/org/apache/commons/math3/fitting/GaussianFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/GaussianFitterTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
*
* @since 2.2
*/
+@Deprecated
public class GaussianFitterTest {
/** Good data. */
protected static final double[][] DATASET1 = new double[][] {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/HarmonicCurveFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/HarmonicCurveFitterTest.java
b/src/test/java/org/apache/commons/math3/fitting/HarmonicCurveFitterTest.java
index 9b797ea..9f6a15c 100644
---
a/src/test/java/org/apache/commons/math3/fitting/HarmonicCurveFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/HarmonicCurveFitterTest.java
@@ -16,18 +16,17 @@
*/
package org.apache.commons.math3.fitting;
-import java.util.Random;
-import java.util.List;
import java.util.ArrayList;
-import
org.apache.commons.math3.optim.nonlinear.vector.jacobian.LevenbergMarquardtOptimizer;
+import java.util.List;
+import java.util.Random;
+
import
org.apache.commons.math3.analysis.function.HarmonicOscillator;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
import org.apache.commons.math3.util.FastMath;
import org.apache.commons.math3.util.MathUtils;
-
-import org.junit.Test;
import org.junit.Assert;
+import org.junit.Test;
public class HarmonicCurveFitterTest {
/**
@@ -92,7 +91,7 @@ public class HarmonicCurveFitterTest {
}
final HarmonicCurveFitter fitter =
HarmonicCurveFitter.create();
- final double[] fitted = fitter.fit(points.toList());
+ fitter.fit(points.toList());
// This test serves to cover the part of the code of
"guessAOmega"
// when the algorithm using integrals fails.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/HarmonicFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/HarmonicFitterTest.java
b/src/test/java/org/apache/commons/math3/fitting/HarmonicFitterTest.java
index 50cb3ba..8a6dcea 100644
---
a/src/test/java/org/apache/commons/math3/fitting/HarmonicFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/HarmonicFitterTest.java
@@ -17,16 +17,17 @@
package org.apache.commons.math3.fitting;
import java.util.Random;
+
import
org.apache.commons.math3.optim.nonlinear.vector.jacobian.LevenbergMarquardtOptimizer;
import
org.apache.commons.math3.analysis.function.HarmonicOscillator;
import org.apache.commons.math3.exception.NumberIsTooSmallException;
import org.apache.commons.math3.exception.MathIllegalStateException;
import org.apache.commons.math3.util.FastMath;
import org.apache.commons.math3.util.MathUtils;
-
import org.junit.Test;
import org.junit.Assert;
+@Deprecated
public class HarmonicFitterTest {
@Test(expected=NumberIsTooSmallException.class)
public void testPreconditions1() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/PolynomialCurveFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/PolynomialCurveFitterTest.java
b/src/test/java/org/apache/commons/math3/fitting/PolynomialCurveFitterTest.java
index 3681cae..6b8dfa2 100644
---
a/src/test/java/org/apache/commons/math3/fitting/PolynomialCurveFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/PolynomialCurveFitterTest.java
@@ -17,15 +17,15 @@
package org.apache.commons.math3.fitting;
import java.util.Random;
+
+import org.apache.commons.math3.TestUtils;
import
org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math3.exception.ConvergenceException;
-import
org.apache.commons.math3.optim.nonlinear.vector.MultivariateVectorOptimizer;
-import org.apache.commons.math3.util.FastMath;
import org.apache.commons.math3.distribution.RealDistribution;
import
org.apache.commons.math3.distribution.UniformRealDistribution;
-import org.apache.commons.math3.TestUtils;
-import org.junit.Test;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.util.FastMath;
import org.junit.Assert;
+import org.junit.Test;
/**
* Test for class {@link PolynomialCurveFitter}.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/PolynomialFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/PolynomialFitterTest.java
b/src/test/java/org/apache/commons/math3/fitting/PolynomialFitterTest.java
index e9fe61f..a053157 100644
---
a/src/test/java/org/apache/commons/math3/fitting/PolynomialFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/PolynomialFitterTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.math3.fitting;
import java.util.Random;
+
import
org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
import
org.apache.commons.math3.analysis.polynomials.PolynomialFunction.Parametric;
import org.apache.commons.math3.exception.ConvergenceException;
@@ -36,6 +37,7 @@ import org.junit.Assert;
* Test for class {@link CurveFitter} where the function to fit is a
* polynomial.
*/
+@Deprecated
public class PolynomialFitterTest {
@Test
public void testFit() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
index 6ff34aa..bb9c9ac 100644
---
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
@@ -556,7 +556,7 @@ public abstract class
AbstractLeastSquaresOptimizerAbstractTest {
return true;
}
});
- Optimum optimum = optimizer.optimize(builder.build());
+ optimizer.optimize(builder.build());
Assert.assertThat(checked[0], is(true));
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTest.java
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTest.java
index 8e03fdf..9cfbe0b 100644
---
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTest.java
@@ -295,7 +295,7 @@ public class EvaluationTest {
try {
// Should throw.
- final Evaluation eval = p.evaluate(dummy);
+ p.evaluate(dummy);
Assert.fail("Exception expected");
} catch (RuntimeException e) {
// Expecting exception.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTestValidation.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTestValidation.java
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTestValidation.java
index 9d79988..eaa7b8d 100644
---
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTestValidation.java
+++
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/EvaluationTestValidation.java
@@ -201,7 +201,6 @@ public class EvaluationTestValidation {
// Number of observations.
final int numObs = 10;
// number of parameters.
- final int numParams = 2;
// Create a single set of observations.
final Point2D.Double[] obs = lineGenerator.generate(numObs);
@@ -218,7 +217,6 @@ public class EvaluationTestValidation {
// Dummy optimizer (to compute the chi-square).
final LeastSquaresProblem lsp = builder(problem).build();
- final double[] init = { slope, offset };
// Get chi-square of the best parameters set for the given
set of
// observations.
final double bestChi2N = getChi2N(lsp, regress);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
index 96831fc..b2c8f54 100644
---
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
@@ -288,48 +288,6 @@ public class LevenbergMarquardtOptimizerTest
Assert.assertThat(optimum.getEvaluations(), is(2));
}
- //TODO delete or use
- private static class QuadraticProblem {
- private List<Double> x;
- private List<Double> y;
-
- public QuadraticProblem() {
- x = new ArrayList<Double>();
- y = new ArrayList<Double>();
- }
-
- public void addPoint(double x, double y) {
- this.x.add(x);
- this.y.add(y);
- }
-
- public MultivariateVectorFunction getModelFunction() {
- return new MultivariateVectorFunction() {
- public double[] value(double[] variables) {
- double[] values = new double[x.size()];
- for (int i = 0; i < values.length; ++i) {
- values[i] = (variables[0] * x.get(i) +
variables[1]) * x.get(i) + variables[2];
- }
- return values;
- }
- };
- }
-
- public MultivariateMatrixFunction getModelFunctionJacobian()
{
- return new MultivariateMatrixFunction() {
- public double[][] value(double[] params) {
- double[][] jacobian = new double[x.size()][3];
- for (int i = 0; i < jacobian.length; ++i) {
- jacobian[i][0] = x.get(i) * x.get(i);
- jacobian[i][1] = x.get(i);
- jacobian[i][2] = 1.0;
- }
- return jacobian;
- }
- };
- }
- }
-
private static class BevingtonProblem {
private List<Double> time;
private List<Double> count;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/fitting/leastsquares/MinpackTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/MinpackTest.java
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/MinpackTest.java
index c0ed21a..b91140b 100644
---
a/src/test/java/org/apache/commons/math3/fitting/leastsquares/MinpackTest.java
+++
b/src/test/java/org/apache/commons/math3/fitting/leastsquares/MinpackTest.java
@@ -610,7 +610,6 @@ public class MinpackTest {
}
private static class LinearFullRankFunction extends
MinpackFunction {
- private static final long serialVersionUID =
-9030323226268039536L;
public LinearFullRankFunction(int m, int n, double x0,
double theoreticalStartCost,
@@ -649,7 +648,6 @@ public class MinpackTest {
}
private static class LinearRank1Function extends MinpackFunction
{
- private static final long serialVersionUID =
8494863245104608300L;
public LinearRank1Function(int m, int n, double x0,
double theoreticalStartCost,
@@ -684,7 +682,6 @@ public class MinpackTest {
}
private static class LinearRank1ZeroColsAndRowsFunction extends
MinpackFunction {
- private static final long serialVersionUID =
-3316653043091995018L;
public LinearRank1ZeroColsAndRowsFunction(int m, int n,
double x0) {
super(m, buildArray(n, x0),
@@ -728,7 +725,6 @@ public class MinpackTest {
}
private static class RosenbrockFunction extends MinpackFunction
{
- private static final long serialVersionUID =
2893438180956569134L;
public RosenbrockFunction(double[] startParams, double
theoreticalStartCost) {
super(2, startParams, 0.0, buildArray(2, 1.0));
}
@@ -748,7 +744,6 @@ public class MinpackTest {
}
private static class HelicalValleyFunction extends
MinpackFunction {
- private static final long serialVersionUID =
220613787843200102L;
public HelicalValleyFunction(double[] startParams,
double theoreticalStartCost) {
super(3, startParams, 0.0, new double[] { 1.0, 0.0, 0.0
});
@@ -794,7 +789,6 @@ public class MinpackTest {
}
private static class PowellSingularFunction extends
MinpackFunction {
- private static final long serialVersionUID =
7298364171208142405L;
public PowellSingularFunction(double[] startParams,
double theoreticalStartCost) {
@@ -834,7 +828,6 @@ public class MinpackTest {
}
private static class FreudensteinRothFunction extends
MinpackFunction {
- private static final long serialVersionUID =
2892404999344244214L;
public FreudensteinRothFunction(double[] startParams,
double theoreticalStartCost,
@@ -865,7 +858,6 @@ public class MinpackTest {
}
private static class BardFunction extends MinpackFunction {
- private static final long serialVersionUID =
5990442612572087668L;
public BardFunction(double x0,
double theoreticalStartCost,
@@ -914,7 +906,6 @@ public class MinpackTest {
}
private static class KowalikOsborneFunction extends
MinpackFunction {
- private static final long serialVersionUID =
-4867445739880495801L;
public KowalikOsborneFunction(double[] startParams,
double theoreticalStartCost,
@@ -970,7 +961,6 @@ public class MinpackTest {
}
private static class MeyerFunction extends MinpackFunction {
- private static final long serialVersionUID =
-838060619150131027L;
public MeyerFunction(double[] startParams,
double theoreticalStartCost,
@@ -1021,7 +1011,6 @@ public class MinpackTest {
}
private static class WatsonFunction extends MinpackFunction {
- private static final long serialVersionUID =
-9034759294980218927L;
public WatsonFunction(int n, double x0,
double theoreticalStartCost,
@@ -1092,7 +1081,6 @@ public class MinpackTest {
}
private static class Box3DimensionalFunction extends
MinpackFunction {
- private static final long serialVersionUID =
5511403858142574493L;
public Box3DimensionalFunction(int m, double[] startParams,
double theoreticalStartCost)
{
@@ -1132,7 +1120,6 @@ public class MinpackTest {
}
private static class JennrichSampsonFunction extends
MinpackFunction {
- private static final long serialVersionUID =
-2489165190443352947L;
public JennrichSampsonFunction(int m, double[] startParams,
double theoreticalStartCost,
@@ -1168,7 +1155,6 @@ public class MinpackTest {
}
private static class BrownDennisFunction extends MinpackFunction
{
- private static final long serialVersionUID =
8340018645694243910L;
public BrownDennisFunction(int m, double[] startParams,
double theoreticalStartCost,
@@ -1216,7 +1202,6 @@ public class MinpackTest {
}
private static class ChebyquadFunction extends MinpackFunction {
- private static final long serialVersionUID =
-2394877275028008594L;
private static double[] buildChebyquadArray(int n, double
factor) {
double[] array = new double[n];
@@ -1294,7 +1279,6 @@ public class MinpackTest {
}
private static class BrownAlmostLinearFunction extends
MinpackFunction {
- private static final long serialVersionUID =
8239594490466964725L;
public BrownAlmostLinearFunction(int m, double factor,
double
theoreticalStartCost,
@@ -1355,7 +1339,6 @@ public class MinpackTest {
}
private static class Osborne1Function extends MinpackFunction {
- private static final long serialVersionUID =
4006743521149849494L;
public Osborne1Function(double[] startParams,
double theoreticalStartCost,
@@ -1408,7 +1391,6 @@ public class MinpackTest {
}
private static class Osborne2Function extends MinpackFunction {
- private static final long serialVersionUID =
-8418268780389858746L;
public Osborne2Function(double[] startParams,
double theoreticalStartCost,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
b/src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
index 8f4854b..193b873 100644
---
a/src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
+++
b/src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
@@ -376,7 +376,7 @@ public final class BlockFieldMatrixTest {
public void testOperate() {
FieldMatrix<Fraction> m = new
BlockFieldMatrix<Fraction>(id);
TestUtils.assertEquals(testVector, m.operate(testVector));
- TestUtils.assertEquals(testVector, m.operate(new
ArrayFieldVector<Fraction>(testVector)).getData());
+ TestUtils.assertEquals(testVector, m.operate(new
ArrayFieldVector<Fraction>(testVector)).toArray());
m = new BlockFieldMatrix<Fraction>(bigSingular);
try {
m.operate(testVector);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
b/src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
index 0dd77f7..11e4bee 100644
---
a/src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
+++
b/src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
@@ -269,7 +269,7 @@ public final class FieldMatrixImplTest {
public void testOperate() {
FieldMatrix<Fraction> m = new
Array2DRowFieldMatrix<Fraction>(id);
TestUtils.assertEquals(testVector, m.operate(testVector));
- TestUtils.assertEquals(testVector, m.operate(new
ArrayFieldVector<Fraction>(testVector)).getData());
+ TestUtils.assertEquals(testVector, m.operate(new
ArrayFieldVector<Fraction>(testVector)).toArray());
m = new Array2DRowFieldMatrix<Fraction>(bigSingular);
try {
m.operate(testVector);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/ml/neuralnet/OffsetFeatureInitializer.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/ml/neuralnet/OffsetFeatureInitializer.java
b/src/test/java/org/apache/commons/math3/ml/neuralnet/OffsetFeatureInitializer.java
index 15ee1ad..9c800cc 100644
---
a/src/test/java/org/apache/commons/math3/ml/neuralnet/OffsetFeatureInitializer.java
+++
b/src/test/java/org/apache/commons/math3/ml/neuralnet/OffsetFeatureInitializer.java
@@ -17,10 +17,6 @@
package org.apache.commons.math3.ml.neuralnet;
-import org.junit.Test;
-import org.junit.Assert;
-import org.apache.commons.math3.random.RandomGenerator;
-import org.apache.commons.math3.random.Well44497b;
/**
* Wraps a given initializer.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/ml/neuralnet/oned/NeuronStringTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/ml/neuralnet/oned/NeuronStringTest.java
b/src/test/java/org/apache/commons/math3/ml/neuralnet/oned/NeuronStringTest.java
index 7f67130..782cbda 100644
---
a/src/test/java/org/apache/commons/math3/ml/neuralnet/oned/NeuronStringTest.java
+++
b/src/test/java/org/apache/commons/math3/ml/neuralnet/oned/NeuronStringTest.java
@@ -17,23 +17,20 @@
package org.apache.commons.math3.ml.neuralnet.oned;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.Collection;
-import org.junit.Test;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
+
import org.apache.commons.math3.ml.neuralnet.FeatureInitializer;
import
org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory;
import org.apache.commons.math3.ml.neuralnet.Network;
import org.apache.commons.math3.ml.neuralnet.Neuron;
-import org.apache.commons.math3.random.Well44497b;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Tests for {@link NeuronString} and {@link Network} functionality
for
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
b/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
index cd1d60f..6d5177b 100644
---
a/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
+++
b/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
@@ -17,26 +17,22 @@
package org.apache.commons.math3.ml.neuralnet.sofm;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
-import java.util.ArrayList;
-import java.util.concurrent.Executors;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.ExecutionException;
-import java.io.PrintWriter;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-import org.apache.commons.math3.RetryRunner;
+
import org.apache.commons.math3.Retry;
+import org.apache.commons.math3.RetryRunner;
import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* Tests for {@link KohonenTrainingTask}
@@ -128,24 +124,6 @@ public class KohonenTrainingTaskTest {
}
/**
- * Creates a map of the travel suggested by the solver.
- *
- * @param solver Solver.
- * @return a 4-columns table: {@code <x (neuron)> <y (neuron)>
<x (city)> <y (city)>}.
- */
- private String travelCoordinatesTable(TravellingSalesmanSolver
solver) {
- final StringBuilder s = new StringBuilder();
- for (double[] c : solver.getCoordinatesList()) {
- s.append(c[0]).append(" ").append(c[1]).append(" ");
- final City city = solver.getClosestCity(c[0], c[1]);
- final double[] cityCoord = city.getCoordinates();
- s.append(cityCoord[0]).append("
").append(cityCoord[1]).append(" ");
- s.append(" # ").append(city.getName()).append("\n");
- }
- return s.toString();
- }
-
- /**
* Compute the distance covered by the salesman, including
* the trip back (from the last to first city).
*
@@ -182,29 +160,4 @@ public class KohonenTrainingTaskTest {
return dist;
}
- /**
- * Prints a summary of the current state of the solver to the
- * given filename.
- *
- * @param filename File.
- * @param solver Solver.
- */
- private void printSummary(String filename,
- TravellingSalesmanSolver solver) {
- PrintWriter out = null;
- try {
- out = new PrintWriter(filename);
- out.println(travelCoordinatesTable(solver));
-
- final City[] result = solver.getCityList();
- out.println("# Number of unique cities: " +
uniqueCities(result).size());
- out.println("# Travel distance: " +
computeTravelDistance(result));
- } catch (Exception e) {
- // Do nothing.
- } finally {
- if (out != null) {
- out.close();
- }
- }
- }
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.java
b/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.java
index f64f2eb..369ea33 100644
---
a/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.java
+++
b/src/test/java/org/apache/commons/math3/ml/neuralnet/sofm/TravellingSalesmanSolver.java
@@ -79,9 +79,6 @@ public class TravellingSalesmanSolver {
long seed) {
random = new Well44497b(seed);
- final double[] xRange = {Double.POSITIVE_INFINITY,
Double.NEGATIVE_INFINITY};
- final double[] yRange = {Double.POSITIVE_INFINITY,
Double.NEGATIVE_INFINITY};
-
// Make sure that each city will appear only once in the
list.
for (City city : cityList) {
cities.add(city);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
b/src/test/java/org/apache/commons/math3/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
index 1067dcd..9d5f21c 100644
---
a/src/test/java/org/apache/commons/math3/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
+++
b/src/test/java/org/apache/commons/math3/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
@@ -17,23 +17,22 @@
package org.apache.commons.math3.ml.neuralnet.twod;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.Collection;
-import org.junit.Test;
-import org.junit.Assert;
-import org.junit.Ignore;
+import java.util.HashSet;
+
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
import org.apache.commons.math3.ml.neuralnet.FeatureInitializer;
import
org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory;
import org.apache.commons.math3.ml.neuralnet.Network;
import org.apache.commons.math3.ml.neuralnet.Neuron;
import org.apache.commons.math3.ml.neuralnet.SquareNeighbourhood;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Tests for {@link NeuronSquareMesh2D} and {@link Network}
functionality for
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
b/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
index 3804125..3f4ad37 100644
---
a/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
+++
b/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
@@ -120,9 +120,6 @@ public class DummyStepInterpolatorTest {
}
private static class BadStepInterpolator extends
DummyStepInterpolator {
- @SuppressWarnings("unused")
- public BadStepInterpolator() {
- }
public BadStepInterpolator(double[] y, boolean forward) {
super(y, new double[y.length], forward);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
index 6673368..bf22542 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
@@ -19,7 +19,6 @@ package
org.apache.commons.math3.optim.nonlinear.scalar.gradient;
import org.apache.commons.math3.analysis.MultivariateFunction;
import org.apache.commons.math3.analysis.MultivariateVectorFunction;
-import org.apache.commons.math3.analysis.solvers.BrentSolver;
import
org.apache.commons.math3.exception.MathUnsupportedOperationException;
import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
import org.apache.commons.math3.linear.BlockRealMatrix;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java
index 0a75c5e..af565e5 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java
@@ -96,6 +96,7 @@ import org.junit.Test;
* @author Jorge J. More (original fortran minpack tests)
* @author Luc Maisonobe (non-minpack tests and minpack tests Java
translation)
*/
+@Deprecated
public class MultiStartMultivariateVectorOptimizerTest {
@Test(expected=NullPointerException.class)
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerAbstractTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerAbstractTest.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerAbstractTest.java
index 2dc8efe..7a9c9eb 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerAbstractTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerAbstractTest.java
@@ -18,6 +18,7 @@ package
org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.io.IOException;
import java.util.Arrays;
+
import org.apache.commons.math3.analysis.MultivariateVectorFunction;
import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
import org.apache.commons.math3.exception.ConvergenceException;
@@ -98,6 +99,7 @@ import org.junit.Test;
* @author Jorge J. More (original fortran minpack tests)
* @author Luc Maisonobe (non-minpack tests and minpack tests Java
translation)
*/
+@Deprecated
public abstract class AbstractLeastSquaresOptimizerAbstractTest {
public abstract AbstractLeastSquaresOptimizer createOptimizer();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTest.java
index 7197616..92ad195 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTest.java
@@ -15,6 +15,7 @@ package
org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.io.IOException;
import java.util.Arrays;
+
import org.apache.commons.math3.optim.PointVectorValuePair;
import org.apache.commons.math3.optim.InitialGuess;
import org.apache.commons.math3.optim.MaxEval;
@@ -24,6 +25,7 @@ import org.apache.commons.math3.util.FastMath;
import org.junit.Test;
import org.junit.Assert;
+@Deprecated
public class AbstractLeastSquaresOptimizerTest {
public static AbstractLeastSquaresOptimizer createOptimizer() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTestValidation.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTestValidation.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTestValidation.java
index d9aa761..575b95c 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTestValidation.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizerTestValidation.java
@@ -17,6 +17,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
import java.awt.geom.Point2D;
+
import org.apache.commons.math3.optim.PointVectorValuePair;
import org.apache.commons.math3.optim.InitialGuess;
import org.apache.commons.math3.optim.MaxEval;
@@ -45,6 +46,7 @@ import org.junit.Assert;
* mvn test -Dtest=AbstractLeastSquaresOptimizerTestValidation
-DargLine="-DmcRuns=1234 -server"
* </code></pre>
*/
+@Deprecated
public class AbstractLeastSquaresOptimizerTestValidation {
private static final int MONTE_CARLO_RUNS =
Integer.parseInt(System.getProperty("mcRuns",
"100"));
@@ -208,8 +210,6 @@ public class
AbstractLeastSquaresOptimizerTestValidation {
// Number of observations.
final int numObs = 10;
- // number of parameters.
- final int numParams = 2;
// Create a single set of observations.
final Point2D.Double[] obs = lineGenerator.generate(numObs);
@@ -225,7 +225,6 @@ public class
AbstractLeastSquaresOptimizerTestValidation {
// Dummy optimizer (to compute the chi-square).
final AbstractLeastSquaresOptimizer optim = new
DummyOptimizer();
- final double[] init = { slope, offset };
// Get chi-square of the best parameters set for the given
set of
// observations.
final double bestChi2N = getChi2N(optim, problem, regress);
@@ -316,6 +315,7 @@ public class
AbstractLeastSquaresOptimizerTestValidation {
* A dummy optimizer.
* Used for computing the covariance matrix.
*/
+@Deprecated
class DummyOptimizer extends AbstractLeastSquaresOptimizer {
public DummyOptimizer() {
super(null);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleProblem.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleProblem.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleProblem.java
index 41414fb..fe2c3bc 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleProblem.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleProblem.java
@@ -17,6 +17,7 @@
package org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.util.ArrayList;
+
import org.apache.commons.math3.analysis.MultivariateVectorFunction;
import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
import org.apache.commons.math3.util.MathUtils;
@@ -38,6 +39,7 @@ import
org.apache.commons.math3.optim.nonlinear.vector.ModelFunctionJacobian;
* corresponding circle.</li>
* </ul>
*/
+@Deprecated
class CircleProblem {
/** Cloud of points assumed to be fitted by a circle. */
private final ArrayList<double[]> points;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleVectorial.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleVectorial.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleVectorial.java
index 0248f9e..2f63547 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleVectorial.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/CircleVectorial.java
@@ -18,6 +18,7 @@
package org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.util.ArrayList;
+
import org.apache.commons.math3.analysis.MultivariateVectorFunction;
import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
@@ -27,6 +28,7 @@ import
org.apache.commons.math3.optim.nonlinear.vector.ModelFunctionJacobian;
/**
* Class used in the tests.
*/
+@Deprecated
class CircleVectorial {
private ArrayList<Vector2D> points;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/GaussNewtonOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/GaussNewtonOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/GaussNewtonOptimizerTest.java
index 900f834..ee3d00f 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/GaussNewtonOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/GaussNewtonOptimizerTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.io.IOException;
+
import org.apache.commons.math3.exception.ConvergenceException;
import
org.apache.commons.math3.exception.TooManyEvaluationsException;
import
org.apache.commons.math3.exception.MathUnsupportedOperationException;
@@ -91,6 +92,7 @@ import org.junit.Test;
* @author Jorge J. More (original fortran minpack tests)
* @author Luc Maisonobe (non-minpack tests and minpack tests Java
translation)
*/
+@Deprecated
public class GaussNewtonOptimizerTest
extends AbstractLeastSquaresOptimizerAbstractTest {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizerTest.java
index 9d5de80..9a27089 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizerTest.java
@@ -19,6 +19,7 @@ package
org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.commons.math3.optim.PointVectorValuePair;
import org.apache.commons.math3.optim.InitialGuess;
import org.apache.commons.math3.optim.MaxEval;
@@ -101,6 +102,7 @@ import org.junit.Test;
* @author Jorge J. More (original fortran minpack tests)
* @author Luc Maisonobe (non-minpack tests and minpack tests Java
translation)
*/
+@Deprecated
public class LevenbergMarquardtOptimizerTest
extends AbstractLeastSquaresOptimizerAbstractTest {
@Override
@@ -316,47 +318,6 @@ public class LevenbergMarquardtOptimizerTest
Assert.assertEquals(radius, paramFound[2],
asymptoticStandardErrorFound[2]);
}
- private static class QuadraticProblem {
- private List<Double> x;
- private List<Double> y;
-
- public QuadraticProblem() {
- x = new ArrayList<Double>();
- y = new ArrayList<Double>();
- }
-
- public void addPoint(double x, double y) {
- this.x.add(x);
- this.y.add(y);
- }
-
- public ModelFunction getModelFunction() {
- return new ModelFunction(new
MultivariateVectorFunction() {
- public double[] value(double[] variables) {
- double[] values = new double[x.size()];
- for (int i = 0; i < values.length; ++i) {
- values[i] = (variables[0] * x.get(i) +
variables[1]) * x.get(i) + variables[2];
- }
- return values;
- }
- });
- }
-
- public ModelFunctionJacobian getModelFunctionJacobian() {
- return new ModelFunctionJacobian(new
MultivariateMatrixFunction() {
- public double[][] value(double[] params) {
- double[][] jacobian = new
double[x.size()][3];
- for (int i = 0; i < jacobian.length; ++i) {
- jacobian[i][0] = x.get(i) * x.get(i);
- jacobian[i][1] = x.get(i);
- jacobian[i][2] = 1.0;
- }
- return jacobian;
- }
- });
- }
- }
-
private static class BevingtonProblem {
private List<Double> time;
private List<Double> count;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/MinpackTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/MinpackTest.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/MinpackTest.java
index a48cb55..898dbdd 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/MinpackTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/MinpackTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.util.Arrays;
+
import
org.apache.commons.math3.exception.TooManyEvaluationsException;
import org.apache.commons.math3.analysis.MultivariateVectorFunction;
import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
@@ -94,6 +95,7 @@ import org.junit.Test;
* @author Jorge J. More (original fortran minpack tests)
* @author Luc Maisonobe (non-minpack tests and minpack tests Java
translation)
*/
+@Deprecated
public class MinpackTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java
index 2c74715..fdbe236 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java
@@ -28,6 +28,7 @@ import
org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
/**
* Factory for generating a cloud of points that approximate a
circle.
*/
+@Deprecated
public class RandomCirclePointGenerator {
/** RNG for the x-coordinate of the center. */
private final RealDistribution cX;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java
index 91e4bae..2da67c6 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java
@@ -18,6 +18,7 @@
package org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.awt.geom.Point2D;
+
import org.apache.commons.math3.random.RandomGenerator;
import org.apache.commons.math3.random.Well44497b;
import org.apache.commons.math3.distribution.RealDistribution;
@@ -27,6 +28,7 @@ import
org.apache.commons.math3.distribution.NormalDistribution;
/**
* Factory for generating a cloud of points that approximate a
straight line.
*/
+@Deprecated
public class RandomStraightLinePointGenerator {
/** Slope. */
private final double slope;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java
index 93dcbbf..6fca154 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java
@@ -19,6 +19,7 @@ package
org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.ArrayList;
+
import org.apache.commons.math3.analysis.MultivariateVectorFunction;
import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
import
org.apache.commons.math3.optim.nonlinear.vector.ModelFunction;
@@ -32,6 +33,7 @@ import org.apache.commons.math3.util.MathArrays;
* Instances of this class can be created by invocation of the
* {@link StatisticalReferenceDatasetFactory}.
*/
+@Deprecated
public abstract class StatisticalReferenceDataset {
/** The name of this dataset. */
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java
index a9cac8a..2c49165 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java
@@ -20,12 +20,14 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+
import org.apache.commons.math3.util.FastMath;
/**
* A factory to create instances of {@link
StatisticalReferenceDataset} from
* available resources.
*/
+@Deprecated
public class StatisticalReferenceDatasetFactory {
private StatisticalReferenceDatasetFactory() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StraightLineProblem.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StraightLineProblem.java
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StraightLineProblem.java
index 09c16df..092e37f 100644
---
a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StraightLineProblem.java
+++
b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/jacobian/StraightLineProblem.java
@@ -18,6 +18,7 @@
package org.apache.commons.math3.optim.nonlinear.vector.jacobian;
import java.util.ArrayList;
+
import org.apache.commons.math3.analysis.MultivariateVectorFunction;
import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
import org.apache.commons.math3.analysis.UnivariateFunction;
@@ -37,6 +38,7 @@ import
org.apache.commons.math3.optim.nonlinear.vector.ModelFunctionJacobian;
* <li>for each pair (a, b), the y-coordinate of the line.</li>
* </ul>
*/
+@Deprecated
class StraightLineProblem {
/** Cloud of points assumed to be fitted by a straight line. */
private final ArrayList<double[]> points;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optim/univariate/BrentOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optim/univariate/BrentOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optim/univariate/BrentOptimizerTest.java
index a3cc73e..575eb5c 100644
---
a/src/test/java/org/apache/commons/math3/optim/univariate/BrentOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optim/univariate/BrentOptimizerTest.java
@@ -255,7 +255,6 @@ public final class BrentOptimizerTest {
new SearchInterval(minSin - 6.789 *
delta,
minSin + 9.876 *
delta,
init));
- final int numEval = optimizer.getEvaluations();
final double sol = result.getPoint();
final double expected = init;
@@ -289,7 +288,6 @@ public final class BrentOptimizerTest {
GoalType.MINIMIZE,
new SearchInterval(minSin - 6.789 *
delta,
minSin + 9.876 *
delta));
- final int numEval = optimizer.getEvaluations();
final double sol = result.getPoint();
final double expected = 4.712389027602411;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java
index 7e0aa53..9eabe99 100644
---
a/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java
@@ -30,6 +30,7 @@ import
org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class MultivariateDifferentiableMultiStartOptimizerTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java
index 9e53ae6..bdc1c13 100644
---
a/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java
@@ -93,6 +93,7 @@ import org.junit.Test;
* @author Jorge J. More (original fortran minpack tests)
* @author Luc Maisonobe (non-minpack tests and minpack tests Java
translation)
*/
+@Deprecated
public class MultivariateDifferentiableVectorMultiStartOptimizerTest
{
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
index f9444fd..dc52366 100644
---
a/src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
@@ -28,6 +28,7 @@ import
org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class MultivariateMultiStartOptimizerTest {
@Test
public void testRosenbrock() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/PointValuePairTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/PointValuePairTest.java
b/src/test/java/org/apache/commons/math3/optimization/PointValuePairTest.java
index fb66014..e683ee6 100644
---
a/src/test/java/org/apache/commons/math3/optimization/PointValuePairTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/PointValuePairTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.math3.TestUtils;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class PointValuePairTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/PointVectorValuePairTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/PointVectorValuePairTest.java
b/src/test/java/org/apache/commons/math3/optimization/PointVectorValuePairTest.java
index 0233fb7..153de52 100644
---
a/src/test/java/org/apache/commons/math3/optimization/PointVectorValuePairTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/PointVectorValuePairTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.math3.TestUtils;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class PointVectorValuePairTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/SimplePointCheckerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/SimplePointCheckerTest.java
b/src/test/java/org/apache/commons/math3/optimization/SimplePointCheckerTest.java
index 03e5f63..5595b11 100644
---
a/src/test/java/org/apache/commons/math3/optimization/SimplePointCheckerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/SimplePointCheckerTest.java
@@ -20,6 +20,7 @@ import
org.apache.commons.math3.exception.NotStrictlyPositiveException;
import org.junit.Test;
import org.junit.Assert;
+@Deprecated
public class SimplePointCheckerTest {
@Test(expected=NotStrictlyPositiveException.class)
public void testIterationCheckPrecondition() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/SimpleValueCheckerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/SimpleValueCheckerTest.java
b/src/test/java/org/apache/commons/math3/optimization/SimpleValueCheckerTest.java
index 668ffbd..baf865f 100644
---
a/src/test/java/org/apache/commons/math3/optimization/SimpleValueCheckerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/SimpleValueCheckerTest.java
@@ -20,6 +20,7 @@ import
org.apache.commons.math3.exception.NotStrictlyPositiveException;
import org.junit.Test;
import org.junit.Assert;
+@Deprecated
public class SimpleValueCheckerTest {
@Test(expected=NotStrictlyPositiveException.class)
public void testIterationCheckPrecondition() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/SimpleVectorValueCheckerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/SimpleVectorValueCheckerTest.java
b/src/test/java/org/apache/commons/math3/optimization/SimpleVectorValueCheckerTest.java
index 3730b44..54ade9f 100644
---
a/src/test/java/org/apache/commons/math3/optimization/SimpleVectorValueCheckerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/SimpleVectorValueCheckerTest.java
@@ -20,6 +20,7 @@ import
org.apache.commons.math3.exception.NotStrictlyPositiveException;
import org.junit.Test;
import org.junit.Assert;
+@Deprecated
public class SimpleVectorValueCheckerTest {
@Test(expected=NotStrictlyPositiveException.class)
public void testIterationCheckPrecondition() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
index 8ed6cb7..a957637 100644
---
a/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
@@ -36,6 +36,7 @@ import org.junit.Test;
/**
* Test for {@link BOBYQAOptimizer}.
*/
+@Deprecated
public class BOBYQAOptimizerTest {
static final int DIM = 13;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
index e0ac150..29c3eec 100644
---
a/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
@@ -40,6 +40,7 @@ import org.junit.runner.RunWith;
/**
* Test for {@link CMAESOptimizer}.
*/
+@Deprecated
@RunWith(RetryRunner.class)
public class CMAESOptimizerTest {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
index 62f638c..138584a 100644
---
a/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
@@ -24,6 +24,7 @@ import
org.apache.commons.math3.optimization.PointValuePair;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class MultivariateFunctionMappingAdapterTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
index 6796269..0ad840b 100644
---
a/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
@@ -25,6 +25,7 @@ import
org.apache.commons.math3.optimization.SimplePointChecker;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class MultivariateFunctionPenaltyAdapterTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
b/src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
index f21ebf2..fcb31fb 100644
---
a/src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
/**
* Test for {@link PowellOptimizer}.
*/
+@Deprecated
public class PowellOptimizerTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
index d130f93..9dfa46c 100644
---
a/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
@@ -25,6 +25,7 @@ import org.apache.commons.math3.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class SimplexOptimizerMultiDirectionalTest {
@Test
public void testMinimize1() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
index b47ff6e..83ba20a 100644
---
a/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
@@ -30,6 +30,7 @@ import org.apache.commons.math3.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class SimplexOptimizerNelderMeadTest {
@Test
public void testMinimize1() {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
b/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
index 4d3804b..eb1bdb7 100644
---
a/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
@@ -23,6 +23,7 @@ import org.apache.commons.math3.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class CurveFitterTest {
@Test
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
b/src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
index cc83a27..ddccdb2 100644
---
a/src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
@@ -19,7 +19,6 @@ package
org.apache.commons.math3.optimization.fitting;
import
org.apache.commons.math3.exception.MathIllegalArgumentException;
import
org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer;
-
import org.junit.Assert;
import org.junit.Test;
@@ -28,6 +27,7 @@ import org.junit.Test;
*
* @since 2.2
*/
+@Deprecated
public class GaussianFitterTest {
/** Good data. */
protected static final double[][] DATASET1 = new double[][] {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e875e6d5/src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
----------------------------------------------------------------------
diff --git
a/src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
b/src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
index 698faaa..f2c1108 100644
---
a/src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
+++
b/src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
@@ -25,10 +25,10 @@ import
org.apache.commons.math3.exception.NumberIsTooSmallException;
import org.apache.commons.math3.exception.MathIllegalStateException;
import org.apache.commons.math3.util.FastMath;
import org.apache.commons.math3.util.MathUtils;
-
import org.junit.Test;
import org.junit.Assert;
+@Deprecated
public class HarmonicFitterTest {
@Test(expected=NumberIsTooSmallException.class)
public void testPreconditions1() {
