Author: sebb Date: Sun Dec 5 12:40:48 2010 New Revision: 1042336 URL: http://svn.apache.org/viewvc?rev=1042336&view=rev Log: Add missing @Deprecated annotations
Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithm.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithmImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/MathRuntimeException.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/HasDensity.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealVector.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/DerivativeException.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MathUtils.java commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/FunctionEvaluationExceptionTest.java commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolatorTest.java commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/util/MathUtilsTest.java Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithm.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithm.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithm.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithm.java Sun Dec 5 12:40:48 2010 @@ -31,6 +31,7 @@ package org.apache.commons.math; * currently is also contained in {...@link org.apache.commons.math.optimization.SimpleRealPointChecker} * and similar classes. */ +...@deprecated public interface ConvergingAlgorithm { /** Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithmImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithmImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithmImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ConvergingAlgorithmImpl.java Sun Dec 5 12:40:48 2010 @@ -57,6 +57,7 @@ public abstract class ConvergingAlgorith * @deprecated in 2.2. Derived classes should use the "setter" methods * in order to assign meaningful values to all the instances variables. */ + @Deprecated protected ConvergingAlgorithmImpl(final int defaultMaximalIterationCount, final double defaultAbsoluteAccuracy) { this.defaultAbsoluteAccuracy = defaultAbsoluteAccuracy; @@ -75,6 +76,7 @@ public abstract class ConvergingAlgorith * @deprecated in 2.2 (to be removed as soon as the single non-default one * has been removed). */ + @Deprecated protected ConvergingAlgorithmImpl() {} /** {...@inheritdoc} */ Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java Sun Dec 5 12:40:48 2010 @@ -32,6 +32,7 @@ import org.apache.commons.math.linear.Ar * @deprecated in 2.2 (to be removed in 3.0). Please use * {...@link org.apache.commons.math.exception.MathUserException} instead. */ +...@deprecated public class FunctionEvaluationException extends MathUserException { /** Serializable version identifier. */ Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/MathRuntimeException.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/MathRuntimeException.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/MathRuntimeException.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/MathRuntimeException.java Sun Dec 5 12:40:48 2010 @@ -558,6 +558,7 @@ public class MathRuntimeException extend * @deprecated in 2.2. Please use {...@link org.apache.commons.math.exception.MathUnsupportedOperationException} * instead. */ + @Deprecated public static UnsupportedOperationException createUnsupportedOperationException(final Localizable pattern, final Object ... arguments) { return new UnsupportedOperationException() { @@ -603,6 +604,7 @@ public class MathRuntimeException extend * @since 2.2 * @deprecated in 2.2. Checks for "null" must not be performed in Commons-Math. */ + @Deprecated public static NullPointerException createNullPointerException(final Localizable pattern, final Object ... arguments) { return new NullPointerException() { Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java Sun Dec 5 12:40:48 2010 @@ -29,6 +29,7 @@ import org.apache.commons.math.util.Fast * @version $Revision$ $Date$ * @deprecated in 2.2 */ +...@deprecated public abstract class BinaryFunction implements BivariateRealFunction { /** The + operator method wrapped as a {...@link BinaryFunction}. */ Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java Sun Dec 5 12:40:48 2010 @@ -28,6 +28,7 @@ import org.apache.commons.math.util.Fast * @version $Revision$ $Date$ * @deprecated in 2.2 */ +...@deprecated public abstract class ComposableFunction implements UnivariateRealFunction { /** The constant function always returning 0. */ Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java Sun Dec 5 12:40:48 2010 @@ -40,6 +40,7 @@ import org.apache.commons.math.exception * {...@link org.apache.commons.math.analysis.interpolation.SmoothingPolynomialBicubicSplineInterpolator}. * This class will be removed in math 3.0. */ +...@deprecated public class SmoothingBicubicSplineInterpolator implements BivariateRealGridInterpolator { /** Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java Sun Dec 5 12:40:48 2010 @@ -71,6 +71,7 @@ public class BisectionSolver extends Uni * {...@inheritdoc} * @deprecated in 2.2 (to be removed in 3.0). */ + @Deprecated public double solve(final UnivariateRealFunction f, double min, double max, double initial) throws MaxIterationsExceededException, MathUserException { return solve(f, min, max); @@ -95,6 +96,7 @@ public class BisectionSolver extends Uni * {...@inheritdoc} * @deprecated in 2.2 (to be removed in 3.0). */ + @Deprecated public double solve(final UnivariateRealFunction f, double min, double max) throws MaxIterationsExceededException, MathUserException { Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java Sun Dec 5 12:40:48 2010 @@ -186,6 +186,7 @@ public interface UnivariateRealSolver ex * @deprecated in 2.2 (to be removed in 3.0). Please use * {...@link #solve(int,UnivariateRealFunction,double,double,double)} instead. */ + @Deprecated double solve(UnivariateRealFunction f, double min, double max, double startValue) throws ConvergenceException, MathUserException, IllegalArgumentException; Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java Sun Dec 5 12:40:48 2010 @@ -32,6 +32,7 @@ import org.apache.commons.math.exception * @version $Revision$ $Date$ * @deprecated in 2.2 (to be removed in 3.0). */ +...@deprecated public abstract class UnivariateRealSolverImpl extends ConvergingAlgorithmImpl implements UnivariateRealSolver { Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java Sun Dec 5 12:40:48 2010 @@ -129,6 +129,7 @@ public class BetaDistributionImpl * @return The pdf at point x. * @deprecated */ + @Deprecated public double density(Double x) { return density(x.doubleValue()); } Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java Sun Dec 5 12:40:48 2010 @@ -115,6 +115,7 @@ public class ChiSquaredDistributionImpl * @return The pdf at point x. * @deprecated */ + @Deprecated public double density(Double x) { return density(x.doubleValue()); } Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java Sun Dec 5 12:40:48 2010 @@ -105,6 +105,7 @@ public class ExponentialDistributionImpl * @return The pdf at point x. * @deprecated - use density(double) */ + @Deprecated public double density(Double x) { return density(x.doubleValue()); } Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java Sun Dec 5 12:40:48 2010 @@ -213,6 +213,7 @@ public class GammaDistributionImpl exten * @return The pdf at point x. * @deprecated */ + @Deprecated public double density(Double x) { return density(x.doubleValue()); } Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/HasDensity.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/HasDensity.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/HasDensity.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/HasDensity.java Sun Dec 5 12:40:48 2010 @@ -31,6 +31,7 @@ import org.apache.commons.math.MathExcep * @deprecated to be removed in math 3.0 * @version $Revision$ $Date$ */ +...@deprecated public interface HasDensity<P> { /** Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java Sun Dec 5 12:40:48 2010 @@ -153,6 +153,7 @@ public class NormalDistributionImpl exte * @return The pdf at point x. * @deprecated */ + @Deprecated public double density(Double x) { return density(x.doubleValue()); } Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java Sun Dec 5 12:40:48 2010 @@ -27,6 +27,7 @@ import org.apache.commons.math.exception * @deprecated in 2.2 (to be removed in 3.0). Please use * {...@link org.apache.commons.math.exception.MathUserException} instead. */ +...@deprecated public class MatrixVisitorException extends MathUserException { /** Serializable version identifier */ Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealVector.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealVector.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealVector.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealVector.java Sun Dec 5 12:40:48 2010 @@ -255,6 +255,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapPow(double d); /** @@ -268,6 +269,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapPowToSelf(double d); /** @@ -279,6 +281,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapExp(); /** @@ -291,6 +294,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapExpToSelf(); /** @@ -301,6 +305,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapExpm1(); /** @@ -312,6 +317,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapExpm1ToSelf(); /** @@ -322,6 +328,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapLog(); /** @@ -333,6 +340,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapLogToSelf(); /** @@ -343,6 +351,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapLog10(); /** @@ -354,6 +363,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapLog10ToSelf(); /** @@ -364,6 +374,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapLog1p(); /** @@ -375,6 +386,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapLog1pToSelf(); /** @@ -385,6 +397,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCosh(); /** @@ -396,6 +409,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCoshToSelf(); /** @@ -406,6 +420,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSinh(); /** @@ -417,6 +432,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSinhToSelf(); /** @@ -427,6 +443,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapTanh(); /** @@ -438,6 +455,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapTanhToSelf(); /** @@ -448,6 +466,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCos(); /** @@ -459,6 +478,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCosToSelf(); /** @@ -469,6 +489,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSin(); /** @@ -480,6 +501,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSinToSelf(); /** @@ -490,6 +512,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapTan(); /** @@ -501,6 +524,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapTanToSelf(); /** @@ -511,6 +535,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAcos(); /** @@ -522,6 +547,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAcosToSelf(); /** @@ -532,6 +558,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAsin(); /** @@ -543,6 +570,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAsinToSelf(); /** @@ -553,6 +581,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAtan(); /** @@ -564,6 +593,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAtanToSelf(); /** @@ -574,6 +604,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapInv(); /** @@ -585,6 +616,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapInvToSelf(); /** @@ -595,6 +627,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAbs(); /** @@ -606,6 +639,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapAbsToSelf(); /** @@ -616,6 +650,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSqrt(); /** @@ -627,6 +662,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSqrtToSelf(); /** @@ -637,6 +673,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCbrt(); /** @@ -648,6 +685,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCbrtToSelf(); /** @@ -658,6 +696,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCeil(); /** @@ -669,6 +708,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapCeilToSelf(); /** @@ -679,6 +719,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapFloor(); /** @@ -690,6 +731,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapFloorToSelf(); /** @@ -700,6 +742,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapRint(); /** @@ -711,6 +754,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapRintToSelf(); /** @@ -721,6 +765,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSignum(); /** @@ -732,6 +777,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapSignumToSelf(); /** @@ -742,6 +788,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapUlp(); /** @@ -753,6 +800,7 @@ public interface RealVector { * the function classes in package * {...@link org.apache.commons.math.analysis.function}. */ + @Deprecated RealVector mapUlpToSelf(); /** Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/DerivativeException.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/DerivativeException.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/DerivativeException.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/DerivativeException.java Sun Dec 5 12:40:48 2010 @@ -30,6 +30,7 @@ import org.apache.commons.math.exception * @deprecated in 2.2 (to be removed in 3.0). Please use * {...@link org.apache.commons.math.exception.MathUserException} instead. */ +...@deprecated public class DerivativeException extends MathUserException { /** Serializable version identifier */ Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java Sun Dec 5 12:40:48 2010 @@ -42,6 +42,7 @@ public abstract class AbstractScalarDiff * @deprecated in 2.2 (to be removed in 3.0). Please use the accessor * {...@link BaseAbstractScalarOptimizer#getConvergenceChecker()} instead. */ + @Deprecated protected RealConvergenceChecker checker; /** * Type of optimization. @@ -49,10 +50,12 @@ public abstract class AbstractScalarDiff * @deprecated in 2.2 (to be removed in 3.0). Please use the accessor * {...@link BaseAbstractScalarOptimizer#getGoalType()} instead. */ + @Deprecated protected GoalType goal; /** Current point set. * @deprecated in 2.2 (to be removed in 3.0). */ + @Deprecated protected double[] point; /** Number of gradient evaluations. */ Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java Sun Dec 5 12:40:48 2010 @@ -66,6 +66,7 @@ public abstract class AbstractUnivariate * values to the maximum numbers of iterations and evaluations, and to the * absolute and relative accuracy thresholds. */ + @Deprecated protected AbstractUnivariateRealOptimizer(final int defaultMaximalIterationCount, final double defaultAbsoluteAccuracy) { super(defaultMaximalIterationCount, defaultAbsoluteAccuracy); @@ -84,6 +85,7 @@ public abstract class AbstractUnivariate * @throws NoDataException if no result has been computed * @deprecated in 2.2 (no alternative). */ + @Deprecated protected void checkResultComputed() { if (!resultComputed) { throw new NoDataException(); @@ -115,6 +117,7 @@ public abstract class AbstractUnivariate * @param iterationCount the iteration count to set * @deprecated in 2.2 (no alternative). */ + @Deprecated protected final void setResult(final double x, final double fx, final int iterationCount) { this.result = x; @@ -127,6 +130,7 @@ public abstract class AbstractUnivariate * Convenience function for implementations. * @deprecated in 2.2 (no alternative). */ + @Deprecated protected final void clearResult() { this.resultComputed = false; } @@ -181,6 +185,7 @@ public abstract class AbstractUnivariate * @deprecated in 2.2. Use this {...@link #computeObjectiveValue(double) * replacement} instead. */ + @Deprecated protected double computeObjectiveValue(final UnivariateRealFunction f, final double point) throws MathUserException { Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java Sun Dec 5 12:40:48 2010 @@ -38,6 +38,7 @@ public class TTestImpl implements TTest /** Distribution used to compute inference statistics. * @deprecated in 2.2 (to be removed in 3.0). */ + @Deprecated private TDistribution distribution; /** @@ -54,6 +55,7 @@ public class TTestImpl implements TTest * @since 1.2 * @deprecated in 2.2 (to be removed in 3.0). */ + @Deprecated public TTestImpl(TDistribution t) { super(); setDistribution(t); @@ -1020,6 +1022,7 @@ public class TTestImpl implements TTest * @since 1.2 * @deprecated in 2.2 (to be removed in 3.0). */ + @Deprecated public void setDistribution(TDistribution value) { distribution = value; } Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java Sun Dec 5 12:40:48 2010 @@ -104,6 +104,7 @@ public class SimpleRegression implements * @deprecated in 2.2 (to be removed in 3.0). Please use the {...@link * #SimpleRegression(int) other constructor} instead. */ + @Deprecated public SimpleRegression(TDistribution t) { super(); setDistribution(t); @@ -626,6 +627,7 @@ public class SimpleRegression implements * @since 1.2 * @deprecated in 2.2 (to be removed in 3.0). */ + @Deprecated public void setDistribution(TDistribution value) { distribution = value; Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MathUtils.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MathUtils.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MathUtils.java (original) +++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MathUtils.java Sun Dec 5 12:40:48 2010 @@ -419,6 +419,7 @@ public final class MathUtils { * useful (see e.g. {...@link #equalsIncludingNaN(double,double) * equalsIncludingNaN}. */ + @Deprecated public static boolean equals(double x, double y) { return (Double.isNaN(x) && Double.isNaN(y)) || x == y; } @@ -531,6 +532,7 @@ public final class MathUtils { * useful (see e.g. {...@link #equalsIncludingNaN(double[],double[]) * equalsIncludingNaN}. */ + @Deprecated public static boolean equals(double[] x, double[] y) { if ((x == null) || (y == null)) { return !((x == null) ^ (y == null)); @@ -1914,6 +1916,7 @@ public final class MathUtils { * @deprecated as of 2.2 (please use the new {...@link #checkOrder(double[],OrderDirection,boolean) * checkOrder} method). To be removed in 3.0. */ + @Deprecated public static void checkOrder(double[] val, int dir, boolean strict) { if (dir > 0) { checkOrder(val, OrderDirection.INCREASING, strict); Modified: commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/FunctionEvaluationExceptionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/FunctionEvaluationExceptionTest.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/FunctionEvaluationExceptionTest.java (original) +++ commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/FunctionEvaluationExceptionTest.java Sun Dec 5 12:40:48 2010 @@ -27,6 +27,7 @@ import junit.framework.TestCase; * @version $Revision$ $Date$ * @deprecated in 2.2 (to be removed in 3.0) */ +...@deprecated public class FunctionEvaluationExceptionTest extends TestCase { public void testConstructor(){ Modified: commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolatorTest.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolatorTest.java (original) +++ commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolatorTest.java Sun Dec 5 12:40:48 2010 @@ -28,6 +28,7 @@ import org.junit.Test; * @version $Revision$ $Date$ * @deprecated To be removed in math 3.0 (when the class for which it is a test will also be removed). */ +...@deprecated public final class SmoothingBicubicSplineInterpolatorTest { /** * Test preconditions. Modified: commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/util/MathUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/util/MathUtilsTest.java?rev=1042336&r1=1042335&r2=1042336&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/util/MathUtilsTest.java (original) +++ commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/util/MathUtilsTest.java Sun Dec 5 12:40:48 2010 @@ -439,6 +439,7 @@ public final class MathUtilsTest extends * @deprecated To be removed in release 3.0 (replaced by {...@link * #testArrayEqualsIncludingNaN()}. */ + @Deprecated public void testArrayEquals() { assertFalse(MathUtils.equals(new double[] { 1d }, null)); assertFalse(MathUtils.equals(null, new double[] { 1d }));