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/02/16 14:44:43 UTC
svn commit: r1244975 - in /commons/proper/math/trunk/src:
main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java
test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
Author: erans
Date: Thu Feb 16 13:44:43 2012
New Revision: 1244975
URL: http://svn.apache.org/viewvc?rev=1244975&view=rev
Log:
MATH-712
In prevision of the 3.0 release: Removed "throw" clauses and "print"
statements used for debugging.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java?rev=1244975&r1=1244974&r2=1244975&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java Thu Feb 16 13:44:43 2012
@@ -466,7 +466,7 @@ public class BOBYQAOptimizer
gradientAtTrustRegionCenter.setEntry(i, gradientAtTrustRegionCenter.getEntry(i) + temp * interpolationPoints.getEntry(k, i));
}
}
- throw new PathIsExploredException(); // XXX
+ // throw new PathIsExploredException(); // XXX
}
}
@@ -538,7 +538,7 @@ public class BOBYQAOptimizer
if (bdtest < bdtol) {
state = 650; break;
}
- throw new PathIsExploredException(); // XXX
+ // throw new PathIsExploredException(); // XXX
}
}
state = 680; break;
@@ -1634,7 +1634,7 @@ public class BOBYQAOptimizer
stepa = initialTrustRegionRadius;
if (upperDifference.getEntry(nfmm) == ZERO) {
stepa = -stepa;
- throw new PathIsExploredException(); // XXX
+ // throw new PathIsExploredException(); // XXX
}
interpolationPoints.setEntry(nfm, nfmm, stepa);
} else if (nfm > n) {
@@ -1642,11 +1642,11 @@ public class BOBYQAOptimizer
stepb = -initialTrustRegionRadius;
if (lowerDifference.getEntry(nfxm) == ZERO) {
stepb = Math.min(TWO * initialTrustRegionRadius, upperDifference.getEntry(nfxm));
- throw new PathIsExploredException(); // XXX
+ // throw new PathIsExploredException(); // XXX
}
if (upperDifference.getEntry(nfxm) == ZERO) {
stepb = Math.max(-TWO * initialTrustRegionRadius, lowerDifference.getEntry(nfxm));
- throw new PathIsExploredException(); // XXX
+ // throw new PathIsExploredException(); // XXX
}
interpolationPoints.setEntry(nfm, nfxm, stepb);
}
@@ -1708,7 +1708,7 @@ public class BOBYQAOptimizer
bMatrix.setEntry(0, nfmm, -oneOverStepA);
bMatrix.setEntry(nfm, nfmm, oneOverStepA);
bMatrix.setEntry(npt + nfmm, nfmm, -HALF * rhosq);
- throw new PathIsExploredException(); // XXX
+ // throw new PathIsExploredException(); // XXX
}
} else if (numEval >= n + 2) {
final int ih = nfx * (nfx + 1) / 2 - 1;
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java?rev=1244975&r1=1244974&r2=1244975&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java Thu Feb 16 13:44:43 2012
@@ -308,7 +308,7 @@ public class BOBYQAOptimizerTest {
PointValuePair expected,
String assertMsg) {
- System.out.println(func.getClass().getName() + " BEGIN"); // XXX
+// System.out.println(func.getClass().getName() + " BEGIN"); // XXX
int dim = startPoint.length;
// MultivariateOptimizer optim =
@@ -329,7 +329,7 @@ public class BOBYQAOptimizerTest {
result.getPoint()[i], pointTol);
}
- System.out.println(func.getClass().getName() + " END"); // XXX
+// System.out.println(func.getClass().getName() + " END"); // XXX
}
private static double[] point(int n, double value) {