From a48186437b2b5c4a10f831234052af5859ac3d52 Mon Sep 17 00:00:00 2001 From: Luc Maisonobe Date: Fri, 30 Jul 2010 20:31:11 +0000 Subject: [PATCH] removed unused import git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@980944 13f79535-47bb-0310-9956-ffa450edef68 --- .../BicubicSplineInterpolatingFunction.java | 10 +++++----- .../interpolation/BicubicSplineInterpolator.java | 5 ++--- .../MicrosphereInterpolatingFunction.java | 3 +-- .../interpolation/MicrosphereInterpolator.java | 3 +-- .../TricubicSplineInterpolatingFunction.java | 7 +++---- .../DifferentiableMultivariateRealOptimizer.java | 1 - .../math/optimization/MultivariateRealOptimizer.java | 1 - .../general/AbstractScalarDifferentiableOptimizer.java | 4 +--- .../optimization/general/AbstractScalarOptimizer.java | 10 +--------- .../general/BaseAbstractScalarOptimizer.java | 3 +-- .../general/NonLinearConjugateGradientOptimizer.java | 1 - .../math/optimization/general/PowellOptimizer.java | 10 +++------- .../univariate/AbstractUnivariateRealOptimizer.java | 5 ++--- .../math/optimization/univariate/BrentOptimizer.java | 1 - .../org/apache/commons/math/analysis/SincFunction.java | 1 - .../math/optimization/general/PowellOptimizerTest.java | 7 ++----- .../org/apache/commons/math/random/RandomDataTest.java | 1 - 17 files changed, 22 insertions(+), 51 deletions(-) diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java b/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java index e4cae996f..67dc4dd27 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java @@ -16,13 +16,13 @@ */ package org.apache.commons.math.analysis.interpolation; -import org.apache.commons.math.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.DimensionMismatchException; +import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.analysis.BivariateRealFunction; +import org.apache.commons.math.exception.NoDataException; +import org.apache.commons.math.exception.NonMonotonousSequenceException; +import org.apache.commons.math.exception.OutOfRangeException; +import org.apache.commons.math.util.MathUtils; /** * Function that implements the diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java b/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java index 10c85e148..e0833d1ce 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java @@ -17,12 +17,11 @@ package org.apache.commons.math.analysis.interpolation; import org.apache.commons.math.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction; +import org.apache.commons.math.exception.NoDataException; +import org.apache.commons.math.util.MathUtils; /** * Generates a bicubic interpolating function. diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatingFunction.java b/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatingFunction.java index 0e7d82489..97822b7b1 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatingFunction.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatingFunction.java @@ -22,12 +22,11 @@ import java.util.List; import java.util.Map; import org.apache.commons.math.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.analysis.MultivariateRealFunction; +import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.linear.ArrayRealVector; import org.apache.commons.math.linear.RealVector; import org.apache.commons.math.random.UnitSphereRandomVectorGenerator; -import org.apache.commons.math.util.LocalizedFormats; /** * Interpolating function that implements the diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java b/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java index d8872c777..0c734560a 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java @@ -17,11 +17,10 @@ package org.apache.commons.math.analysis.interpolation; import org.apache.commons.math.MathException; +import org.apache.commons.math.analysis.MultivariateRealFunction; import org.apache.commons.math.exception.NotPositiveException; import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.analysis.MultivariateRealFunction; import org.apache.commons.math.random.UnitSphereRandomVectorGenerator; -import org.apache.commons.math.util.LocalizedFormats; /** * Interpolator that implements the algorithm described in diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunction.java b/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunction.java index 4f2b77bcf..ca16001c0 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunction.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunction.java @@ -16,12 +16,11 @@ */ package org.apache.commons.math.analysis.interpolation; -import org.apache.commons.math.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math.analysis.TrivariateRealFunction; +import org.apache.commons.math.exception.DimensionMismatchException; import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.analysis.TrivariateRealFunction; +import org.apache.commons.math.util.MathUtils; /** * Function that implements the diff --git a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java index 3e3aea3bf..86752928e 100644 --- a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java @@ -17,7 +17,6 @@ package org.apache.commons.math.optimization; -import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.analysis.DifferentiableMultivariateRealFunction; /** diff --git a/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java index 016869b59..e602debf8 100644 --- a/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java @@ -17,7 +17,6 @@ package org.apache.commons.math.optimization; -import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.analysis.MultivariateRealFunction; /** diff --git a/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java index 07d57df08..48fccb1dd 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java @@ -18,14 +18,12 @@ package org.apache.commons.math.optimization.general; import org.apache.commons.math.FunctionEvaluationException; -import org.apache.commons.math.MaxEvaluationsExceededException; -import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.DifferentiableMultivariateRealFunction; import org.apache.commons.math.analysis.MultivariateVectorialFunction; +import org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer; import org.apache.commons.math.optimization.GoalType; import org.apache.commons.math.optimization.OptimizationException; import org.apache.commons.math.optimization.RealConvergenceChecker; -import org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer; import org.apache.commons.math.optimization.RealPointValuePair; import org.apache.commons.math.optimization.SimpleScalarValueChecker; diff --git a/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarOptimizer.java index 7b3b827ab..8fbf40132 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarOptimizer.java @@ -17,17 +17,9 @@ package org.apache.commons.math.optimization.general; -import org.apache.commons.math.FunctionEvaluationException; -import org.apache.commons.math.MaxEvaluationsExceededException; -import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.MultivariateRealFunction; -import org.apache.commons.math.analysis.MultivariateVectorialFunction; -import org.apache.commons.math.optimization.GoalType; -import org.apache.commons.math.optimization.OptimizationException; -import org.apache.commons.math.optimization.RealConvergenceChecker; -import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer; import org.apache.commons.math.optimization.MultivariateRealOptimizer; -import org.apache.commons.math.optimization.RealPointValuePair; +import org.apache.commons.math.optimization.RealConvergenceChecker; import org.apache.commons.math.optimization.SimpleScalarValueChecker; /** diff --git a/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java index 89d72c4e6..e9f9269f8 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java @@ -21,11 +21,10 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MaxEvaluationsExceededException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.MultivariateRealFunction; -import org.apache.commons.math.analysis.MultivariateVectorialFunction; +import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer; import org.apache.commons.math.optimization.GoalType; import org.apache.commons.math.optimization.OptimizationException; import org.apache.commons.math.optimization.RealConvergenceChecker; -import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer; import org.apache.commons.math.optimization.RealPointValuePair; import org.apache.commons.math.optimization.SimpleScalarValueChecker; diff --git a/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java index 3b8b2b60d..0c5d1713b 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java @@ -24,7 +24,6 @@ import org.apache.commons.math.analysis.solvers.BrentSolver; import org.apache.commons.math.analysis.solvers.UnivariateRealSolver; import org.apache.commons.math.optimization.GoalType; import org.apache.commons.math.optimization.OptimizationException; -import org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer; import org.apache.commons.math.optimization.RealPointValuePair; import org.apache.commons.math.util.LocalizedFormats; diff --git a/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java index 9ef5d598b..ba10d03fc 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java @@ -17,18 +17,14 @@ package org.apache.commons.math.optimization.general; -import org.apache.commons.math.ConvergenceException; import org.apache.commons.math.FunctionEvaluationException; -import org.apache.commons.math.analysis.MultivariateRealFunction; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.optimization.univariate.AbstractUnivariateRealOptimizer; -import org.apache.commons.math.optimization.univariate.BrentOptimizer; -import org.apache.commons.math.optimization.univariate.BracketFinder; import org.apache.commons.math.optimization.GoalType; -import org.apache.commons.math.optimization.MultivariateRealOptimizer; import org.apache.commons.math.optimization.OptimizationException; import org.apache.commons.math.optimization.RealPointValuePair; -import org.apache.commons.math.optimization.SimpleScalarValueChecker; +import org.apache.commons.math.optimization.univariate.AbstractUnivariateRealOptimizer; +import org.apache.commons.math.optimization.univariate.BracketFinder; +import org.apache.commons.math.optimization.univariate.BrentOptimizer; /** * Powell algorithm. diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java index c6eeb53d0..08fdb89e3 100644 --- a/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java @@ -21,11 +21,10 @@ import org.apache.commons.math.ConvergingAlgorithmImpl; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MaxEvaluationsExceededException; import org.apache.commons.math.MaxIterationsExceededException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.optimization.UnivariateRealOptimizer; +import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.optimization.GoalType; +import org.apache.commons.math.optimization.UnivariateRealOptimizer; /** * Provide a default implementation for several functions useful to generic diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java b/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java index 46c4afae0..3889bb3ed 100644 --- a/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java @@ -19,7 +19,6 @@ package org.apache.commons.math.optimization.univariate; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.optimization.GoalType; /** diff --git a/src/test/java/org/apache/commons/math/analysis/SincFunction.java b/src/test/java/org/apache/commons/math/analysis/SincFunction.java index 5b717652c..d84ece029 100644 --- a/src/test/java/org/apache/commons/math/analysis/SincFunction.java +++ b/src/test/java/org/apache/commons/math/analysis/SincFunction.java @@ -16,7 +16,6 @@ */ package org.apache.commons.math.analysis; -import org.apache.commons.math.FunctionEvaluationException; /** * Auxiliary class for testing optimizers. diff --git a/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java b/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java index 4fb0c3731..c5c00c918 100644 --- a/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java +++ b/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java @@ -16,17 +16,14 @@ */ package org.apache.commons.math.optimization.general; -import java.util.Arrays; - -import org.apache.commons.math.MathException; import org.apache.commons.math.FunctionEvaluationException; +import org.apache.commons.math.MathException; import org.apache.commons.math.analysis.MultivariateRealFunction; import org.apache.commons.math.analysis.SumSincFunction; import org.apache.commons.math.optimization.GoalType; import org.apache.commons.math.optimization.MultivariateRealOptimizer; -import org.apache.commons.math.optimization.SimpleScalarValueChecker; import org.apache.commons.math.optimization.RealPointValuePair; - +import org.apache.commons.math.optimization.SimpleScalarValueChecker; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/math/random/RandomDataTest.java b/src/test/java/org/apache/commons/math/random/RandomDataTest.java index 96e47169b..3bb84ad31 100644 --- a/src/test/java/org/apache/commons/math/random/RandomDataTest.java +++ b/src/test/java/org/apache/commons/math/random/RandomDataTest.java @@ -30,7 +30,6 @@ import org.apache.commons.math.distribution.BinomialDistributionImpl; import org.apache.commons.math.distribution.BinomialDistributionTest; import org.apache.commons.math.distribution.CauchyDistributionImpl; import org.apache.commons.math.distribution.ChiSquaredDistributionImpl; -import org.apache.commons.math.distribution.ContinuousDistribution; import org.apache.commons.math.distribution.FDistributionImpl; import org.apache.commons.math.distribution.GammaDistributionImpl; import org.apache.commons.math.distribution.HypergeometricDistributionImpl;