commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject svn commit: r1037327 [1/7] - in /commons/proper/math/branches/MATH_2_X/src: main/java/org/apache/commons/math/ main/java/org/apache/commons/math/analysis/ main/java/org/apache/commons/math/analysis/integration/ main/java/org/apache/commons/math/analysi...
Date Sat, 20 Nov 2010 20:57:42 GMT
Author: luc
Date: Sat Nov 20 20:57:37 2010
New Revision: 1037327

URL: http://svn.apache.org/viewvc?rev=1037327&view=rev
Log:
replaced all uses of the deprecated FunctionEvaluationException, DerivativeException and MatrixVisitorException
The exceptions have been temporarily declared as extending MathUserException (which is an unchecked exception) and the methods that formerly throwed them now throw MathUserException.
This changed seems to be a smooth way for users to update their code when they want, as it is binary compatible with the previous code and generate deprecation warnings if user functions do use these exceptions

Modified:
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ArgumentOutsideDomainException.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/analysis/BinaryFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BivariateRealFunction.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/MultivariateMatrixFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateRealFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/TrivariateRealFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.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/BrentSolver.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.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/analysis/solvers/UnivariateRealSolverUtils.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/AbstractRealMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixChangingVisitor.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixPreservingVisitor.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/DefaultRealMatrixChangingVisitor.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/DefaultRealMatrixPreservingVisitor.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/FieldMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/FieldMatrixChangingVisitor.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/FieldMatrixPreservingVisitor.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/RealMatrix.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealMatrixChangingVisitor.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealMatrixImpl.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/linear/RealMatrixPreservingVisitor.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/AbstractIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.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/ode/FirstOrderConverter.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/FirstOrderIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/SecondOrderDifferentialEquations.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/SecondOrderIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/events/CombinedEventsManager.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/events/EventState.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/jacobians/FirstOrderIntegratorWithJacobians.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/jacobians/ODEWithJacobians.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/jacobians/StepHandlerWithJacobians.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/jacobians/StepInterpolatorWithJacobians.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/sampling/StepHandler.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/sampling/StepInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ode/sampling/StepNormalizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorialOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/MultiStartUnivariateRealOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/UnivariateRealOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/MultiDirectional.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/NelderMead.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/GaussianDerivativeFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/ParametricGaussianFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/ParametricRealFunction.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/fitting/PolynomialFitter.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.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/general/BaseAbstractScalarOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/Preconditioner.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/optimization/univariate/BracketFinder.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/transform/RealTransformer.java
    commons/proper/math/branches/MATH_2_X/src/site/xdoc/userguide/ode.xml
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ArgumentOutsideDomainExceptionTest.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/BinaryFunctionTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/ComposableFunctionTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/Expm1Function.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/SinFunction.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/QRDecompositionImplTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/RealMatrixImplTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/FirstOrderConverterTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/TestProblemHandler.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/events/EventStateTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/jacobians/FirstOrderIntegratorWithJacobiansTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolatorTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/MultiDirectionalTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/NelderMeadTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/fitting/GaussianFitterTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/fitting/ParametricGaussianFunctionTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/univariate/BracketFinderTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/univariate/BrentOptimizerTest.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegressionTest.java

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ArgumentOutsideDomainException.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ArgumentOutsideDomainException.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ArgumentOutsideDomainException.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/ArgumentOutsideDomainException.java Sat Nov 20 20:57:37 2010
@@ -17,13 +17,16 @@
 
 package org.apache.commons.math;
 
+import org.apache.commons.math.exception.MathIllegalNumberException;
+import org.apache.commons.math.exception.util.LocalizedFormats;
+
 /**
  * Error thrown when a method is called with an out of bounds argument.
  *
  * @since 1.2
  * @version $Revision$ $Date$
  */
-public class ArgumentOutsideDomainException extends FunctionEvaluationException {
+public class ArgumentOutsideDomainException extends MathIllegalNumberException {
 
     /** Serializable version identifier. */
     private static final long serialVersionUID = -4965972841162580234L;
@@ -36,8 +39,7 @@ public class ArgumentOutsideDomainExcept
      * @param upper upper bound of the domain
      */
     public ArgumentOutsideDomainException(double argument, double lower, double upper) {
-        super(argument,
-              "Argument {0} outside domain [{1} ; {2}]", argument, lower, upper);
+        super(LocalizedFormats.ARGUMENT_OUTSIDE_DOMAIN, argument, lower, upper);
     }
 
 }

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=1037327&r1=1037326&r2=1037327&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 Sat Nov 20 20:57:37 2010
@@ -16,6 +16,7 @@
  */
 package org.apache.commons.math;
 
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.DummyLocalizable;
 import org.apache.commons.math.exception.util.Localizable;
 import org.apache.commons.math.exception.util.LocalizedFormats;
@@ -31,7 +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.
  */
-public class FunctionEvaluationException extends MathException  {
+public class FunctionEvaluationException extends MathUserException  {
 
     /** Serializable version identifier. */
     private static final long serialVersionUID = 1384427981840836868L;

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=1037327&r1=1037326&r2=1037327&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 Sat Nov 20 20:57:37 2010
@@ -17,7 +17,7 @@
 
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.util.FastMath;
 
 
@@ -85,7 +85,7 @@ public abstract class BinaryFunction imp
     };
 
     /** {@inheritDoc} */
-    public abstract double value(double x, double y) throws FunctionEvaluationException;
+    public abstract double value(double x, double y) throws MathUserException;
 
     /** Get a composable function by fixing the first argument of the instance.
      * @param fixedX fixed value of the first argument
@@ -95,7 +95,7 @@ public abstract class BinaryFunction imp
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return BinaryFunction.this.value(fixedX, x);
             }
         };
@@ -109,7 +109,7 @@ public abstract class BinaryFunction imp
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return BinaryFunction.this.value(x, fixedY);
             }
         };

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BivariateRealFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BivariateRealFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BivariateRealFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/BivariateRealFunction.java Sat Nov 20 20:57:37 2010
@@ -17,7 +17,7 @@
 
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a bivariate real function.
@@ -32,9 +32,9 @@ public interface BivariateRealFunction {
      * @param x Abscissa for which the function value should be computed.
      * @param y Ordinate for which the function value should be computed.
      * @return the value.
-     * @throws FunctionEvaluationException if the function evaluation fails.
+     * @throws MathUserException if the function evaluation fails.
      */
     double value(double x, double y)
-        throws FunctionEvaluationException;
+        throws MathUserException;
 
 }

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=1037327&r1=1037326&r2=1037327&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 Sat Nov 20 20:57:37 2010
@@ -17,7 +17,7 @@
 
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.util.FastMath;
 
 
@@ -284,7 +284,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return ComposableFunction.this.value(f.value(x));
             }
         };
@@ -303,7 +303,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return f.value(ComposableFunction.this.value(x));
             }
         };
@@ -324,7 +324,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return combiner.value(ComposableFunction.this.value(x), f.value(x));
             }
         };
@@ -339,7 +339,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return ComposableFunction.this.value(x) + f.value(x);
             }
         };
@@ -354,7 +354,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return ComposableFunction.this.value(x) + a;
             }
         };
@@ -369,7 +369,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return ComposableFunction.this.value(x) - f.value(x);
             }
         };
@@ -384,7 +384,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return ComposableFunction.this.value(x) * f.value(x);
             }
         };
@@ -399,7 +399,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return ComposableFunction.this.value(x) * scaleFactor;
             }
         };
@@ -413,7 +413,7 @@ public abstract class ComposableFunction
         return new ComposableFunction() {
             @Override
             /** {@inheritDoc} */
-            public double value(double x) throws FunctionEvaluationException {
+            public double value(double x) throws MathUserException {
                 return ComposableFunction.this.value(x) / f.value(x);
             }
         };
@@ -441,7 +441,7 @@ public abstract class ComposableFunction
         return new MultivariateRealFunction() {
             /** {@inheritDoc} */
             public double value(double[] point)
-                throws FunctionEvaluationException, IllegalArgumentException {
+                throws MathUserException, IllegalArgumentException {
                 double result = initialValue;
                 for (final double entry : point) {
                     result = combiner.value(result, ComposableFunction.this.value(entry));
@@ -501,6 +501,6 @@ public abstract class ComposableFunction
     }
 
     /** {@inheritDoc} */
-    public abstract double value(double x) throws FunctionEvaluationException;
+    public abstract double value(double x) throws MathUserException;
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateMatrixFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateMatrixFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateMatrixFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateMatrixFunction.java Sat Nov 20 20:57:37 2010
@@ -18,7 +18,7 @@
 package org.apache.commons.math.analysis;
 
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a multivariate matrix function.
@@ -31,10 +31,10 @@ public interface MultivariateMatrixFunct
      * Compute the value for the function at the given point.
      * @param point point at which the function must be evaluated
      * @return function value for the given point
-     * @exception FunctionEvaluationException if the function evaluation fails
+     * @exception MathUserException if the function evaluation fails
      * @exception IllegalArgumentException if points dimension is wrong
      */
     double[][] value(double[] point)
-        throws FunctionEvaluationException, IllegalArgumentException;
+        throws MathUserException, IllegalArgumentException;
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateRealFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateRealFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateRealFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateRealFunction.java Sat Nov 20 20:57:37 2010
@@ -17,7 +17,7 @@
 
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a multivariate real function.
@@ -30,10 +30,10 @@ public interface MultivariateRealFunctio
      * Compute the value for the function at the given point.
      * @param point point at which the function must be evaluated
      * @return function value for the given point
-     * @exception FunctionEvaluationException if the function evaluation fails
+     * @exception MathUserException if the function evaluation fails
      * @exception IllegalArgumentException if points dimension is wrong
      */
     double value(double[] point)
-        throws FunctionEvaluationException, IllegalArgumentException;
+        throws MathUserException, IllegalArgumentException;
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java Sat Nov 20 20:57:37 2010
@@ -17,7 +17,7 @@
 
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a multivariate vectorial function.
@@ -30,10 +30,10 @@ public interface MultivariateVectorialFu
      * Compute the value for the function at the given point.
      * @param point point at which the function must be evaluated
      * @return function value for the given point
-     * @exception FunctionEvaluationException if the function evaluation fails
+     * @exception MathUserException if the function evaluation fails
      * @exception IllegalArgumentException if points dimension is wrong
      */
     double[] value(double[] point)
-        throws FunctionEvaluationException, IllegalArgumentException;
+        throws MathUserException, IllegalArgumentException;
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/TrivariateRealFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/TrivariateRealFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/TrivariateRealFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/TrivariateRealFunction.java Sat Nov 20 20:57:37 2010
@@ -17,7 +17,7 @@
 
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a trivariate real function.
@@ -33,8 +33,8 @@ public interface TrivariateRealFunction 
      * @param y y-coordinate for which the function value should be computed.
      * @param z z-coordinate for which the function value should be computed.
      * @return the value.
-     * @throws FunctionEvaluationException if the function evaluation fails.
+     * @throws MathUserException if the function evaluation fails.
      */
     double value(double x, double y, double z)
-        throws FunctionEvaluationException;
+        throws MathUserException;
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java Sat Nov 20 20:57:37 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a univariate matrix function.
@@ -30,8 +30,8 @@ public interface UnivariateMatrixFunctio
      * Compute the value for the function.
      * @param x the point for which the function value should be computed
      * @return the value
-     * @throws FunctionEvaluationException if the function evaluation fails
+     * @throws MathUserException if the function evaluation fails
      */
-    double[][] value(double x) throws FunctionEvaluationException;
+    double[][] value(double x) throws MathUserException;
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java Sat Nov 20 20:57:37 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a univariate real function.
@@ -29,8 +29,8 @@ public interface UnivariateRealFunction 
      * Compute the value for the function.
      * @param x the point for which the function value should be computed
      * @return the value
-     * @throws FunctionEvaluationException if the function evaluation fails
+     * @throws MathUserException if the function evaluation fails
      */
-    double value(double x) throws FunctionEvaluationException;
+    double value(double x) throws MathUserException;
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java Sat Nov 20 20:57:37 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.math.analysis;
 
-import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * An interface representing a univariate vectorial function.
@@ -30,8 +30,8 @@ public interface UnivariateVectorialFunc
      * Compute the value for the function.
      * @param x the point for which the function value should be computed
      * @return the value
-     * @throws FunctionEvaluationException if the function evaluation fails
+     * @throws MathUserException if the function evaluation fails
      */
-    double[] value(double x) throws FunctionEvaluationException;
+    double[] value(double x) throws MathUserException;
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java Sat Nov 20 20:57:37 2010
@@ -17,10 +17,10 @@
 package org.apache.commons.math.analysis.integration;
 
 import org.apache.commons.math.ConvergenceException;
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -156,14 +156,13 @@ public class LegendreGaussIntegrator ext
     /** {@inheritDoc} */
     @Deprecated
     public double integrate(final double min, final double max)
-        throws ConvergenceException,  FunctionEvaluationException, IllegalArgumentException {
+        throws ConvergenceException,  MathUserException, IllegalArgumentException {
         return integrate(f, min, max);
     }
 
     /** {@inheritDoc} */
-    public double integrate(final UnivariateRealFunction f,
-            final double min, final double max)
-        throws ConvergenceException,  FunctionEvaluationException, IllegalArgumentException {
+    public double integrate(final UnivariateRealFunction f, final double min, final double max)
+        throws ConvergenceException,  MathUserException, IllegalArgumentException {
 
         clearResult();
         verifyInterval(min, max);
@@ -208,12 +207,12 @@ public class LegendreGaussIntegrator ext
      * @param max the upper bound for the interval
      * @param n number of steps
      * @return the value of n-th stage integral
-     * @throws FunctionEvaluationException if an error occurs evaluating the
+     * @throws MathUserException if an error occurs evaluating the
      * function
      */
     private double stage(final UnivariateRealFunction f,
                          final double min, final double max, final int n)
-        throws FunctionEvaluationException {
+        throws MathUserException {
 
         // set up the step for the current stage
         final double step     = (max - min) / n;

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java Sat Nov 20 20:57:37 2010
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.math.analysis.integration;
 
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -60,14 +60,13 @@ public class RombergIntegrator extends U
     /** {@inheritDoc} */
     @Deprecated
     public double integrate(final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException, IllegalArgumentException {
+        throws MaxIterationsExceededException, MathUserException, IllegalArgumentException {
         return integrate(f, min, max);
     }
 
     /** {@inheritDoc} */
-    public double integrate(final UnivariateRealFunction f,
-                            final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException, IllegalArgumentException {
+    public double integrate(final UnivariateRealFunction f, final double min, final double max)
+        throws MaxIterationsExceededException, MathUserException, IllegalArgumentException {
 
         final int m = maximalIterationCount + 1;
         double previousRow[] = new double[m];

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java Sat Nov 20 20:57:37 2010
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.math.analysis.integration;
 
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -59,14 +59,13 @@ public class SimpsonIntegrator extends U
     /** {@inheritDoc} */
     @Deprecated
     public double integrate(final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException, IllegalArgumentException {
+        throws MaxIterationsExceededException, MathUserException, IllegalArgumentException {
         return integrate(f, min, max);
     }
 
     /** {@inheritDoc} */
-    public double integrate(final UnivariateRealFunction f,
-                            final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException, IllegalArgumentException {
+    public double integrate(final UnivariateRealFunction f, final double min, final double max)
+        throws MaxIterationsExceededException, MathUserException, IllegalArgumentException {
 
         clearResult();
         verifyInterval(min, max);

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java Sat Nov 20 20:57:37 2010
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.math.analysis.integration;
 
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -72,12 +72,11 @@ public class TrapezoidIntegrator extends
      * @param max the upper bound for the interval
      * @param n the stage of 1/2 refinement, n = 0 is no refinement
      * @return the value of n-th stage integral
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      */
     double stage(final UnivariateRealFunction f,
                  final double min, final double max, final int n)
-        throws FunctionEvaluationException {
+        throws MathUserException {
 
         if (n == 0) {
             s = 0.5 * (max - min) * (f.value(min) + f.value(max));
@@ -100,14 +99,13 @@ public class TrapezoidIntegrator extends
     /** {@inheritDoc} */
     @Deprecated
     public double integrate(final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException, IllegalArgumentException {
+        throws MaxIterationsExceededException, MathUserException, IllegalArgumentException {
         return integrate(f, min, max);
     }
 
     /** {@inheritDoc} */
-    public double integrate(final UnivariateRealFunction f,
-                            final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException, IllegalArgumentException {
+    public double integrate(final UnivariateRealFunction f, final double min, final double max)
+        throws MaxIterationsExceededException, MathUserException, IllegalArgumentException {
 
         clearResult();
         verifyInterval(min, max);

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java Sat Nov 20 20:57:37 2010
@@ -18,8 +18,8 @@ package org.apache.commons.math.analysis
 
 import org.apache.commons.math.ConvergenceException;
 import org.apache.commons.math.ConvergingAlgorithm;
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 
 /**
  * Interface for univariate real integration algorithms.
@@ -67,7 +67,7 @@ public interface UnivariateRealIntegrato
      * @return the value of integral
      * @throws ConvergenceException if the maximum iteration count is exceeded
      * or the integrator detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
+     * @throws MathUserException if an error occurs evaluating the
      * function
      * @throws IllegalArgumentException if min > max or the endpoints do not
      * satisfy the requirements specified by the integrator
@@ -75,8 +75,8 @@ public interface UnivariateRealIntegrato
      * since 2.0
      */
     @Deprecated
-    double integrate(double min, double max) throws ConvergenceException,
-        FunctionEvaluationException, IllegalArgumentException;
+    double integrate(double min, double max)
+        throws ConvergenceException, MathUserException, IllegalArgumentException;
 
     /**
      * Integrate the function in the given interval.
@@ -87,13 +87,12 @@ public interface UnivariateRealIntegrato
      * @return the value of integral
      * @throws ConvergenceException if the maximum iteration count is exceeded
      * or the integrator detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if min > max or the endpoints do not
      * satisfy the requirements specified by the integrator
      */
-    double integrate(UnivariateRealFunction f, double min, double max) throws ConvergenceException,
-        FunctionEvaluationException, IllegalArgumentException;
+    double integrate(UnivariateRealFunction f, double min, double max)
+        throws ConvergenceException, MathUserException, IllegalArgumentException;
 
     /**
      * Get the result of the last run of the integrator.

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java Sat Nov 20 20:57:37 2010
@@ -17,7 +17,6 @@
 package org.apache.commons.math.analysis.interpolation;
 
 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.OutOfRangeException;
@@ -241,12 +240,7 @@ public class BicubicSplineInterpolatingF
         final double yN = (y - yval[j]) / (yval[j + 1] - yval[j]);
 
         double result = Double.NaN;
-        try { // Workaround to avoid carrying around "try" blocks for an
-              // exception that will never happen
-            result = partialDerivatives[which][i][j].value(xN, yN);
-        } catch (FunctionEvaluationException e) {
-            // Will never happen
-        }
+        result = partialDerivatives[which][i][j].value(xN, yN);
 
         return result;
     }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java Sat Nov 20 20:57:37 2010
@@ -17,9 +17,9 @@
 package org.apache.commons.math.analysis.polynomials;
 
 import org.apache.commons.math.DuplicateSampleAbscissaException;
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -80,19 +80,12 @@ public class PolynomialFunctionLagrangeF
         coefficientsComputed = false;
     }
 
-    /**
-     * Calculate the function value at the given point.
-     *
-     * @param z the point at which the function value is to be computed
-     * @return the function value
-     * @throws FunctionEvaluationException if a runtime error occurs
-     * @see UnivariateRealFunction#value(double)
-     */
-    public double value(double z) throws FunctionEvaluationException {
+    /** {@inheritDoc} */
+    public double value(double z) throws MathUserException {
         try {
             return evaluate(x, y, z);
         } catch (DuplicateSampleAbscissaException e) {
-            throw new FunctionEvaluationException(e, z, e.getLocalizablePattern(), e.getArguments());
+            throw new MathUserException(e, e.getSpecificPattern(), e.getGeneralPattern(), e.getArguments());
         }
     }
 

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java Sat Nov 20 20:57:37 2010
@@ -16,9 +16,9 @@
  */
 package org.apache.commons.math.analysis.polynomials;
 
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 
 /**
@@ -86,10 +86,10 @@ public class PolynomialFunctionNewtonFor
      *
      * @param z the point at which the function value is to be computed
      * @return the function value
-     * @throws FunctionEvaluationException if a runtime error occurs
+     * @throws MathUserException if a runtime error occurs
      * @see UnivariateRealFunction#value(double)
      */
-    public double value(double z) throws FunctionEvaluationException {
+    public double value(double z) throws MathUserException {
        return evaluate(a, c, z);
     }
 
@@ -153,11 +153,11 @@ public class PolynomialFunctionNewtonFor
      * @param c the centers
      * @param z the point at which the function value is to be computed
      * @return the function value
-     * @throws FunctionEvaluationException if a runtime error occurs
+     * @throws MathUserException if a runtime error occurs
      * @throws IllegalArgumentException if inputs are not valid
      */
-    public static double evaluate(double a[], double c[], double z) throws
-        FunctionEvaluationException, IllegalArgumentException {
+    public static double evaluate(double a[], double c[], double z)
+        throws MathUserException, IllegalArgumentException {
 
         verifyInputArray(a, c);
 

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java Sat Nov 20 20:57:37 2010
@@ -120,10 +120,6 @@ public class PolynomialSplineFunction
 
     /**
      * Compute the value for the function.
-     * <p>
-     * Throws FunctionEvaluationException if v is outside of the domain of the
-     * function.  The domain is [smallest knot, largest knot].</p>
-     * <p>
      * See {@link PolynomialSplineFunction} for details on the algorithm for
      * computing the value of the function.</p>
      *

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=1037327&r1=1037326&r2=1037327&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 Sat Nov 20 20:57:37 2010
@@ -16,9 +16,9 @@
  */
 package org.apache.commons.math.analysis.solvers;
 
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.util.FastMath;
 
 /**
@@ -56,26 +56,26 @@ public class BisectionSolver extends Uni
     /** {@inheritDoc} */
     @Deprecated
     public double solve(double min, double max, double initial)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
         return solve(f, min, max);
     }
 
     /** {@inheritDoc} */
     @Deprecated
     public double solve(double min, double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
         return solve(f, min, max);
     }
 
     /** {@inheritDoc} */
     public double solve(final UnivariateRealFunction f, double min, double max, double initial)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
         return solve(f, min, max);
     }
 
     /** {@inheritDoc} */
     public double solve(final UnivariateRealFunction f, double min, double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
 
         clearResult();
         verifyInterval(min,max);

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java Sat Nov 20 20:57:37 2010
@@ -17,10 +17,10 @@
 package org.apache.commons.math.analysis.solvers;
 
 
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -93,14 +93,14 @@ public class BrentSolver extends Univari
     /** {@inheritDoc} */
     @Deprecated
     public double solve(double min, double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
         return solve(f, min, max);
     }
 
     /** {@inheritDoc} */
     @Deprecated
     public double solve(double min, double max, double initial)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
         return solve(f, min, max, initial);
     }
 
@@ -117,16 +117,14 @@ public class BrentSolver extends Univari
      * @param initial the start value to use (must be set to min if no
      * initial point is known).
      * @return the value where the function is zero
-     * @throws MaxIterationsExceededException the maximum iteration count
-     * is exceeded
-     * @throws FunctionEvaluationException if an error occurs evaluating
-     *  the function
+     * @throws MaxIterationsExceededException the maximum iteration count is exceeded
+     * @throws MathUserException if an error occurs evaluating  the function
      * @throws IllegalArgumentException if initial is not between min and max
      * (even if it <em>is</em> a root)
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max, final double initial)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
 
         clearResult();
         if ((initial < min) || (initial > max)) {
@@ -183,15 +181,13 @@ public class BrentSolver extends Univari
      * @param max the upper bound for the interval.
      * @return the value where the function is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if min is not less than max or the
      * signs of the values of the function at the endpoints are not opposites
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max)
-        throws MaxIterationsExceededException,
-        FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
 
         clearResult();
         verifyInterval(min, max);
@@ -243,16 +239,14 @@ public class BrentSolver extends Univari
      * known, this will force starting with linear interpolation)
      * @param y2 function value at the bracket point.
      * @return the value where the function is zero
-     * @throws MaxIterationsExceededException if the maximum iteration count
-     * is exceeded
-     * @throws FunctionEvaluationException if an error occurs evaluating
-     * the function
+     * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
+     * @throws MathUserException if an error occurs evaluating the function
      */
     private double solve(final UnivariateRealFunction f,
                          double x0, double y0,
                          double x1, double y1,
                          double x2, double y2)
-    throws MaxIterationsExceededException, FunctionEvaluationException {
+    throws MaxIterationsExceededException, MathUserException {
 
         double delta = x1 - x0;
         double oldDelta = delta;

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java Sat Nov 20 20:57:37 2010
@@ -17,12 +17,12 @@
 package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.ConvergenceException;
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
 import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
 import org.apache.commons.math.complex.Complex;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -57,8 +57,7 @@ public class LaguerreSolver extends Univ
      * method.
      */
     @Deprecated
-    public LaguerreSolver(UnivariateRealFunction f) throws
-        IllegalArgumentException {
+    public LaguerreSolver(UnivariateRealFunction f) throws IllegalArgumentException {
         super(f, 100, 1E-6);
         if (f instanceof PolynomialFunction) {
             p = (PolynomialFunction) f;
@@ -89,14 +88,14 @@ public class LaguerreSolver extends Univ
     /** {@inheritDoc} */
     @Deprecated
     public double solve(final double min, final double max)
-        throws ConvergenceException, FunctionEvaluationException {
+        throws ConvergenceException, MathUserException {
         return solve(p, min, max);
     }
 
     /** {@inheritDoc} */
     @Deprecated
     public double solve(final double min, final double max, final double initial)
-        throws ConvergenceException, FunctionEvaluationException {
+        throws ConvergenceException, MathUserException {
         return solve(p, min, max, initial);
     }
 
@@ -112,13 +111,12 @@ public class LaguerreSolver extends Univ
      * @return the point at which the function value is zero
      * @throws ConvergenceException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max, final double initial)
-        throws ConvergenceException, FunctionEvaluationException {
+        throws ConvergenceException, MathUserException {
 
         // check for zeros before verifying bracketing
         if (f.value(min) == 0.0) {
@@ -156,13 +154,12 @@ public class LaguerreSolver extends Univ
      * @return the point at which the function value is zero
      * @throws ConvergenceException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max)
-        throws ConvergenceException, FunctionEvaluationException {
+        throws ConvergenceException, MathUserException {
 
         // check function type
         if (!(f instanceof PolynomialFunction)) {
@@ -224,12 +221,11 @@ public class LaguerreSolver extends Univ
      * @return the point at which the function value is zero
      * @throws ConvergenceException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public Complex[] solveAll(double coefficients[], double initial) throws
-        ConvergenceException, FunctionEvaluationException {
+        ConvergenceException, MathUserException {
 
         Complex c[] = new Complex[coefficients.length];
         Complex z = new Complex(initial, 0.0);
@@ -248,12 +244,11 @@ public class LaguerreSolver extends Univ
      * @return the point at which the function value is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public Complex[] solveAll(Complex coefficients[], Complex initial) throws
-        MaxIterationsExceededException, FunctionEvaluationException {
+        MaxIterationsExceededException, MathUserException {
 
         int n = coefficients.length - 1;
         int iterationCount = 0;
@@ -297,12 +292,11 @@ public class LaguerreSolver extends Univ
      * @return the point at which the function value is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public Complex solve(Complex coefficients[], Complex initial) throws
-        MaxIterationsExceededException, FunctionEvaluationException {
+        MaxIterationsExceededException, MathUserException {
 
         int n = coefficients.length - 1;
         if (n < 1) {

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java Sat Nov 20 20:57:37 2010
@@ -17,9 +17,9 @@
 package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.ConvergenceException;
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.util.FastMath;
 import org.apache.commons.math.util.MathUtils;
 
@@ -62,14 +62,14 @@ public class MullerSolver extends Univar
     /** {@inheritDoc} */
     @Deprecated
     public double solve(final double min, final double max)
-        throws ConvergenceException, FunctionEvaluationException {
+        throws ConvergenceException, MathUserException {
         return solve(f, min, max);
     }
 
     /** {@inheritDoc} */
     @Deprecated
     public double solve(final double min, final double max, final double initial)
-        throws ConvergenceException, FunctionEvaluationException {
+        throws ConvergenceException, MathUserException {
         return solve(f, min, max, initial);
     }
 
@@ -85,13 +85,12 @@ public class MullerSolver extends Univar
      * @return the point at which the function value is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max, final double initial)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
 
         // check for zeros before verifying bracketing
         if (f.value(min) == 0.0) { return min; }
@@ -128,13 +127,12 @@ public class MullerSolver extends Univar
      * @return the point at which the function value is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
 
         // [x0, x2] is the bracketing interval in each iteration
         // x1 is the last approximation and an interpolation point in (x0, x2)
@@ -238,15 +236,14 @@ public class MullerSolver extends Univar
      * @return the point at which the function value is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      * @deprecated replaced by {@link #solve2(UnivariateRealFunction, double, double)}
      * since 2.0
      */
     @Deprecated
     public double solve2(final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
         return solve2(f, min, max);
     }
 
@@ -272,13 +269,12 @@ public class MullerSolver extends Univar
      * @return the point at which the function value is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
      * or the solver detects convergence problems otherwise
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function
+     * @throws MathUserException if an error occurs evaluating the function
      * @throws IllegalArgumentException if any parameters are invalid
      */
     public double solve2(final UnivariateRealFunction f,
                          final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
 
         // x2 is the last root approximation
         // x is the new approximation and new x2 for next round

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java?rev=1037327&r1=1037326&r2=1037327&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java (original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java Sat Nov 20 20:57:37 2010
@@ -17,11 +17,11 @@
 
 package org.apache.commons.math.analysis.solvers;
 
-import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.MaxIterationsExceededException;
 import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.MathUserException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 import org.apache.commons.math.util.FastMath;
 
@@ -58,15 +58,14 @@ public class NewtonSolver extends Univar
     /** {@inheritDoc} */
     @Deprecated
     public double solve(final double min, final double max)
-        throws MaxIterationsExceededException,
-        FunctionEvaluationException  {
+        throws MaxIterationsExceededException, MathUserException  {
         return solve(f, min, max);
     }
 
     /** {@inheritDoc} */
     @Deprecated
     public double solve(final double min, final double max, final double startValue)
-        throws MaxIterationsExceededException, FunctionEvaluationException  {
+        throws MaxIterationsExceededException, MathUserException  {
         return solve(f, min, max, startValue);
     }
 
@@ -78,13 +77,12 @@ public class NewtonSolver extends Univar
      * @param max the upper bound for the interval
      * @return the value where the function is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function or derivative
+     * @throws MathUserException if an error occurs evaluating the function or derivative
      * @throws IllegalArgumentException if min is not less than max
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max)
-        throws MaxIterationsExceededException, FunctionEvaluationException  {
+        throws MaxIterationsExceededException, MathUserException  {
         return solve(f, min, max, UnivariateRealSolverUtils.midpoint(min, max));
     }
 
@@ -97,14 +95,13 @@ public class NewtonSolver extends Univar
      * @param startValue the start value to use.
      * @return the value where the function is zero
      * @throws MaxIterationsExceededException if the maximum iteration count is exceeded
-     * @throws FunctionEvaluationException if an error occurs evaluating the
-     * function or derivative
+     * @throws MathUserException if an error occurs evaluating the function or derivative
      * @throws IllegalArgumentException if startValue is not between min and max or
      * if function is not a {@link DifferentiableUnivariateRealFunction} instance
      */
     public double solve(final UnivariateRealFunction f,
                         final double min, final double max, final double startValue)
-        throws MaxIterationsExceededException, FunctionEvaluationException {
+        throws MaxIterationsExceededException, MathUserException {
 
         try {
 



Mime
View raw message