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

Fixed ignored scale in penalty function adapter for direct optimizers. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1208041 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luc Maisonobe 2011-11-29 19:35:40 +00:00
parent cee29030d0
commit d8e892a21f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,11 +152,12 @@ public class MultivariateFunctionPenaltyAdapter implements MultivariateFunction
/** Compute the underlying function value from an unbounded point.
* <p>
* This method simply bounds the unbounded point using the mappings
* set up at construction and calls the underlying function using
* the bounded point.
* This method simply returns the value of the underlying function
* if the unbounded point already fulfills the bounds, and compute
* a replacement value using the offset and scale if bounds are
* violated, without calling the function at all.
* </p>
* @see #unboundedToBounded(double[])
* @return either underlying function value or penalty function value
*/
public double value(double[] point) {
@ -167,9 +168,9 @@ public class MultivariateFunctionPenaltyAdapter implements MultivariateFunction
for (int j = i; j < scale.length; ++j) {
final double overshoot;
if (point[j] < lower[j]) {
overshoot = lower[j] - point[j];
overshoot = scale[j] * (lower[j] - point[j]);
} else if (point[j] > upper[j]) {
overshoot = point[j] - upper[j];
overshoot = scale[j] * (point[j] - upper[j]);
} else {
overshoot = 0;
}