Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor checkstyle fixes in optimization.[direct|linear]. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1239805 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2012-02-02 20:19:54 +00:00
parent c9369dc298
commit ab3935c4c9
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
View File

@ -22,7 +22,6 @@ import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.function.Logit; import org.apache.commons.math.analysis.function.Logit;
import org.apache.commons.math.analysis.function.Sigmoid; import org.apache.commons.math.analysis.function.Sigmoid;
import org.apache.commons.math.exception.DimensionMismatchException; import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.MathIllegalArgumentException;
import org.apache.commons.math.exception.NumberIsTooSmallException; import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.util.FastMath; import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.util.MathUtils; import org.apache.commons.math.util.MathUtils;
@ -92,7 +91,7 @@ public class MultivariateFunctionMappingAdapter implements MultivariateFunction
* @param upper upper bounds for each element of the input parameters array * @param upper upper bounds for each element of the input parameters array
* (some elements may be set to {@code Double.POSITIVE_INFINITY} for * (some elements may be set to {@code Double.POSITIVE_INFINITY} for
* unbounded values) * unbounded values)
* @exception MathIllegalArgumentException if lower and upper bounds are not * @exception DimensionMismatchException if lower and upper bounds are not
* consistent, either according to dimension or to values * consistent, either according to dimension or to values
*/ */
public MultivariateFunctionMappingAdapter(final MultivariateFunction bounded, public MultivariateFunctionMappingAdapter(final MultivariateFunction bounded,
@ -151,8 +150,7 @@ public class MultivariateFunctionMappingAdapter implements MultivariateFunction
} }
/** /** Map an array from bounded to unbounded.
* Map an array from bounded to unbounded.
* @param point bounded value * @param point bounded value
* @return unbounded value * @return unbounded value
*/ */
@ -174,6 +172,8 @@ public class MultivariateFunctionMappingAdapter implements MultivariateFunction
* set up at construction and calls the underlying function using * set up at construction and calls the underlying function using
* the bounded point. * the bounded point.
* </p> * </p>
* @param point unbounded value
* @return underlying function value
* @see #unboundedToBounded(double[]) * @see #unboundedToBounded(double[])
*/ */
public double value(double[] point) { public double value(double[] point) {
@ -181,19 +181,19 @@ public class MultivariateFunctionMappingAdapter implements MultivariateFunction
} }
/** Mapping interface. */ /** Mapping interface. */
private static interface Mapper { private interface Mapper {
/** Map a value from unbounded to bounded. /** Map a value from unbounded to bounded.
* @param y unbounded value * @param y unbounded value
* @return bounded value * @return bounded value
*/ */
public double unboundedToBounded(double y); double unboundedToBounded(double y);
/** Map a value from bounded to unbounded. /** Map a value from bounded to unbounded.
* @param x bounded value * @param x bounded value
* @return unbounded value * @return unbounded value
*/ */
public double boundedToUnbounded(double x); double boundedToUnbounded(double x);
} }

4
src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionPenaltyAdapter.java
View File

@ -19,7 +19,6 @@ package org.apache.commons.math.optimization.direct;
import org.apache.commons.math.analysis.MultivariateFunction; import org.apache.commons.math.analysis.MultivariateFunction;
import org.apache.commons.math.exception.DimensionMismatchException; import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.MathIllegalArgumentException;
import org.apache.commons.math.exception.NumberIsTooSmallException; import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.util.FastMath; import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.util.MathUtils; import org.apache.commons.math.util.MathUtils;
@ -117,7 +116,7 @@ public class MultivariateFunctionPenaltyAdapter implements MultivariateFunction
* unbounded values) * unbounded values)
* @param offset base offset of the penalty function * @param offset base offset of the penalty function
* @param scale scale of the penalty function * @param scale scale of the penalty function
* @exception MathIllegalArgumentException if lower bounds, upper bounds and * @exception DimensionMismatchException if lower bounds, upper bounds and
* scales are not consistent, either according to dimension or to bounadary * scales are not consistent, either according to dimension or to bounadary
* values * values
*/ */
@ -157,6 +156,7 @@ public class MultivariateFunctionPenaltyAdapter implements MultivariateFunction
* a replacement value using the offset and scale if bounds are * a replacement value using the offset and scale if bounds are
* violated, without calling the function at all. * violated, without calling the function at all.
* </p> * </p>
* @param point unbounded point
* @return either underlying function value or penalty function value * @return either underlying function value or penalty function value
*/ */
public double value(double[] point) { public double value(double[] point) {