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

MATH-621 

Removed seemingly unnecessary code: labelled block ("L120"), and conditional
that always evaluates to true (for the current set of unit tests).


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1186574 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gilles Sadowski 2011-10-20 00:06:54 +00:00
parent e0f684748b
commit 246167dc96
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
View File

@ -1460,38 +1460,32 @@ public class BOBYQAOptimizer
} }
// Investigate whether more components of W can be fixed. // Investigate whether more components of W can be fixed.
L120: { final double tmp1 = adelt * adelt - wfixsq;
final double tmp = adelt * adelt - wfixsq; if (tmp1 > ZERO) {
if (tmp > ZERO) { final double wsqsav = wfixsq;
final double wsqsav = wfixsq; step = Math.sqrt(tmp1 / ggfree);
step = Math.sqrt(tmp / ggfree); ggfree = ZERO;
ggfree = ZERO; for (int i = 0; i < n; i++) {
for (int i = 0; i < n; i++) { if (work1.getEntry(i) == bigstp) {
if (work1.getEntry(i) == bigstp) { final double tmp2 = xopt.getEntry(i) - step * glag.getEntry(i);
final double tmp2 = xopt.getEntry(i) - step * glag.getEntry(i); if (tmp2 <= sl.getEntry(i)) {
if (tmp2 <= sl.getEntry(i)) { work1.setEntry(i, sl.getEntry(i) - xopt.getEntry(i));
work1.setEntry(i, sl.getEntry(i) - xopt.getEntry(i)); // Computing 2nd power
// Computing 2nd power final double d1 = work1.getEntry(i);
final double d1 = work1.getEntry(i); wfixsq += d1 * d1;
wfixsq += d1 * d1; } else if (tmp2 >= su.getEntry(i)) {
} else if (tmp2 >= su.getEntry(i)) { work1.setEntry(i, su.getEntry(i) - xopt.getEntry(i));
work1.setEntry(i, su.getEntry(i) - xopt.getEntry(i)); // Computing 2nd power
// Computing 2nd power final double d1 = work1.getEntry(i);
final double d1 = work1.getEntry(i); wfixsq += d1 * d1;
wfixsq += d1 * d1; } else {
} else { // Computing 2nd power
// Computing 2nd power final double d1 = glag.getEntry(i);
final double d1 = glag.getEntry(i); ggfree += d1 * d1;
ggfree += d1 * d1;
}
} }
} }
if (!(wfixsq > wsqsav &&
ggfree > ZERO)) {
break L120;
}
} }
} // end L120 }
// Set the remaining free components of W and all components of XALT, // Set the remaining free components of W and all components of XALT,
// except that W may be scaled later. // except that W may be scaled later.