You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2012/09/30 02:03:31 UTC
svn commit: r1391927 - in /commons/proper/math/trunk/src: changes/
main/java/org/apache/commons/math3/analysis/function/
main/java/org/apache/commons/math3/analysis/solvers/
main/java/org/apache/commons/math3/optimization/direct/
main/java/org/apache/c...
Author: erans
Date: Sun Sep 30 00:03:30 2012
New Revision: 1391927
URL: http://svn.apache.org/viewvc?rev=1391927&view=rev
Log:
CheckStyle.
Modified:
commons/proper/math/trunk/src/changes/changes.xml
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logit.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java
Modified: commons/proper/math/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/changes/changes.xml?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/changes/changes.xml (original)
+++ commons/proper/math/trunk/src/changes/changes.xml Sun Sep 30 00:03:30 2012
@@ -52,6 +52,13 @@ If the output is not quite correct, chec
<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, chec
<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.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java Sun Sep 30 00:03:30 2012
@@ -113,6 +113,7 @@ public class Logistic implements Univari
* @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 Univari
* @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 Univari
* @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,
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logit.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logit.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logit.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Logit.java Sun Sep 30 00:03:30 2012
@@ -153,6 +153,7 @@ public class Logit implements Univariate
* @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 Univariate
xH *= i * invH;
}
}
-
- return t.compose(f);
+ return t.compose(f);
}
-
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java Sun Sep 30 00:03:30 2012
@@ -73,6 +73,7 @@ public class Sigmoid implements Univaria
return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
}
+ /** {@inheritDoc} */
public double value(double x) {
return value(x, lo, hi);
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java Sun Sep 30 00:03:30 2012
@@ -298,6 +298,9 @@ public abstract class BaseAbstractUnivar
* 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 {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java Sun Sep 30 00:03:30 2012
@@ -60,7 +60,7 @@ public class BisectionSolver extends Abs
* {@inheritDoc}
*/
@Override
- protected double doSolve()
+ protected double doSolve()
throws TooManyEvaluationsException {
double min = getMin();
double max = getMax();
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java Sun Sep 30 00:03:30 2012
@@ -124,6 +124,8 @@ public class MullerSolver extends Abstra
* @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)
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java Sun Sep 30 00:03:30 2012
@@ -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 {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java Sun Sep 30 00:03:30 2012
@@ -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;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java?rev=1391927&r1=1391926&r2=1391927&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java Sun Sep 30 00:03:30 2012
@@ -330,7 +330,7 @@ public abstract class AbstractLeastSquar
*
* @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.