SafetyMutex and rocket optimization updates

[debian/openrocket] / src / net / sf / openrocket / utils / TestFunctionOptimizerLoop.java

diff --git a/src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java b/src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java
index b60bb3d83eaae9ccb3fe1e644d806054fb28e57b..e09a0ee85f21ff52966a27f27e3b6236293e1446 100644 (file)
--- a/src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java
+++ b/src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java
@@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit;
 import net.sf.openrocket.optimization.general.Function;
 import net.sf.openrocket.optimization.general.FunctionOptimizer;
 import net.sf.openrocket.optimization.general.OptimizationController;
+import net.sf.openrocket.optimization.general.OptimizationException;
 import net.sf.openrocket.optimization.general.ParallelExecutorCache;
 import net.sf.openrocket.optimization.general.Point;
 import net.sf.openrocket.optimization.general.multidim.MultidirectionalSearchOptimizer;
@@ -26,7 +27,7 @@ public class TestFunctionOptimizerLoop {
        
        
 
-       private void go(final FunctionOptimizer optimizer, final Point optimum, final int maxSteps, ExecutorService executor) {
+       private void go(final FunctionOptimizer optimizer, final Point optimum, final int maxSteps, ExecutorService executor) throws OptimizationException {
                
                Function function = new Function() {
                        @Override
@@ -34,15 +35,6 @@ public class TestFunctionOptimizerLoop {
                                evaluations++;
                                return p.sub(optimum).length2();
                        }
-                       
-                       @Override
-                       public double preComputed(Point p) {
-                               for (double d : p.asArray()) {
-                                       if (d < 0 || d > 1)
-                                               return Double.MAX_VALUE;
-                               }
-                               return Double.NaN;
-                       }
                };
                
                OptimizationController control = new OptimizationController() {
@@ -67,7 +59,7 @@ public class TestFunctionOptimizerLoop {
        }
        
        
-       public static void main(String[] args) {
+       public static void main(String[] args) throws OptimizationException {
                
                System.err.println("PRECISION = " + PRECISION);