CheckStyle.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1391927 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gilles Sadowski 2012-09-30 00:03:30 +00:00
parent bfbb156dfb
commit 1ac0c79080
10 changed files with 21 additions and 13 deletions

View File

@ -52,6 +52,13 @@ If the output is not quite correct, check for invisible trailing spaces!
<body>
<release version="3.1" date="TBD" description="
">
<action dev="erans" type="fix" issue="MATH-865,MATH-867,MATH-868" due-to="Nikolaus Hansen, Frank Hess">
Numerical accuracy problems arose in "CMAESOptimizer" (in package
"o.a.c.m.optimization.direct") when large finite boundaries were
specified, because the interval of allowed values was mapped to
[0, 1]. This mapping was not necessary and its removal allows
finite and infinite boundaries to be used together.
</action>
<action dev="luc" type="fix" >
Fixed some issues in nth root derivatives at 0.
</action>
@ -61,10 +68,6 @@ If the output is not quite correct, check for invisible trailing spaces!
<action dev="erans" type="add" issue="MATH-860">
Added matrix "block inversion" (in "o.a.c.m.linear.MatrixUtils").
</action>
<action dev="erans" type="fix" issue="MATH-865">
"CMAESOptimizer": Raise an exception when the variables normalization
would fail due to overflow.
</action>
<action dev="erans" type="fix" issue="MATH-864" due-to="Frank Hess">
"CMAESOptimizer": Solution was not constrained to lie within the
provided boundaries.

View File

@ -113,6 +113,7 @@ public class Logistic implements UnivariateDifferentiableFunction, Differentiabl
* @throws NullArgumentException if {@code param} is {@code null}.
* @throws DimensionMismatchException if the size of {@code param} is
* not 6.
* @throws NotStrictlyPositiveException if {@code param[5] <= 0}.
*/
public double value(double x, double ... param)
throws NullArgumentException,
@ -137,6 +138,7 @@ public class Logistic implements UnivariateDifferentiableFunction, Differentiabl
* @throws NullArgumentException if {@code param} is {@code null}.
* @throws DimensionMismatchException if the size of {@code param} is
* not 6.
* @throws NotStrictlyPositiveException if {@code param[5] <= 0}.
*/
public double[] gradient(double x, double ... param)
throws NullArgumentException,
@ -176,6 +178,7 @@ public class Logistic implements UnivariateDifferentiableFunction, Differentiabl
* @throws NullArgumentException if {@code param} is {@code null}.
* @throws DimensionMismatchException if the size of {@code param} is
* not 6.
* @throws NotStrictlyPositiveException if {@code param[5] <= 0}.
*/
private void validateParameters(double[] param)
throws NullArgumentException,

View File

@ -153,6 +153,7 @@ public class Logit implements UnivariateDifferentiableFunction, DifferentiableUn
* @param lo Lower bound.
* @param hi Higher bound.
* @return the value of the logit function at {@code x}.
* @throws OutOfRangeException if {@code x < lo} or {@code x > hi}.
*/
private static double value(double x,
double lo,
@ -206,9 +207,7 @@ public class Logit implements UnivariateDifferentiableFunction, DifferentiableUn
xH *= i * invH;
}
}
return t.compose(f);
}
}

View File

@ -73,6 +73,7 @@ public class Sigmoid implements UnivariateDifferentiableFunction, Differentiable
return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
}
/** {@inheritDoc} */
public double value(double x) {
return value(x, lo, hi);
}

View File

@ -298,6 +298,9 @@ public abstract class BaseAbstractUnivariateSolver<FUNC extends UnivariateFuncti
* It is provided for subclasses that do not exclusively use
* {@code computeObjectiveValue} to solve the function.
* See e.g. {@link AbstractUnivariateDifferentiableSolver}.
*
* @throws TooManyEvaluationsException when the allowed number of function
* evaluations has been exhausted.
*/
protected void incrementEvaluationCount()
throws TooManyEvaluationsException {

View File

@ -60,7 +60,7 @@ public class BisectionSolver extends AbstractUnivariateSolver {
* {@inheritDoc}
*/
@Override
protected double doSolve()
protected double doSolve()
throws TooManyEvaluationsException {
double min = getMin();
double max = getMax();

View File

@ -124,6 +124,8 @@ public class MullerSolver extends AbstractUnivariateSolver {
* @param fMin function value at the lower bound.
* @param fMax function value at the upper bound.
* @return the point at which the function value is zero.
* @throws TooManyEvaluationsException if the allowed number of calls to
* the function to be solved has been exhausted.
*/
private double solve(double min, double max,
double fMin, double fMax)

View File

@ -248,7 +248,7 @@ public class UnivariateSolverUtils {
public static double[] bracket(UnivariateFunction function,
double initial,
double lowerBound, double upperBound,
int maximumIterations)
int maximumIterations)
throws NullArgumentException,
NotStrictlyPositiveException,
NoBracketingException {

View File

@ -23,12 +23,9 @@ import java.util.List;
import org.apache.commons.math3.analysis.MultivariateFunction;
import org.apache.commons.math3.exception.DimensionMismatchException;
import org.apache.commons.math3.exception.MathUnsupportedOperationException;
import org.apache.commons.math3.exception.NotPositiveException;
import org.apache.commons.math3.exception.NumberIsTooLargeException;
import org.apache.commons.math3.exception.OutOfRangeException;
import org.apache.commons.math3.exception.TooManyEvaluationsException;
import org.apache.commons.math3.exception.util.LocalizedFormats;
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.EigenDecomposition;
import org.apache.commons.math3.linear.MatrixUtils;

View File

@ -330,7 +330,7 @@ public abstract class AbstractLeastSquaresOptimizer
*
* @param f Objective function.
* @param target Target value for the objective functions at optimum.
* @param weight Weights for the least squares cost computation.
* @param weights Weights for the least squares cost computation.
* @param startPoint Start point for optimization.
* @return the point/value pair giving the optimal value for objective
* function.