Author: erans
Date: Wed Aug 17 14:54:39 2011
New Revision: 1158755
URL: http://svn.apache.org/viewvc?rev=1158755&view=rev
Log:
MATH-621
Layout.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java?rev=1158755&r1=1158754&r2=1158755&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
Wed Aug 17 14:54:39 2011
@@ -1470,7 +1470,7 @@ public class BOBYQAOptimizer
int iflag = 0;
double cauchy = Double.NaN;
double csave = ZERO;
- L100: for(;;) {
+ while (true) {
double wfixsq = ZERO;
double ggfree = ZERO;
for (int i = 0; i < n; i++) {
@@ -1518,7 +1518,8 @@ public class BOBYQAOptimizer
ggfree > ZERO)) {
break L120;
}
- }} // end L120
+ }
+ } // end L120
// Set the remaining free components of W and all components of
XALT,
// except that W may be scaled later.
@@ -1586,8 +1587,9 @@ public class BOBYQAOptimizer
csave = cauchy;
iflag = 1;
} else {
- break L100;
- }} // end L100
+ break;
+ }
+ }
if (csave > cauchy) {
for (int i = 0; i < n; i++) {
xalt.setEntry(i, work2.getEntry(i));