SafetyMutex and rocket optimization updates

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

diff --git a/src/net/sf/openrocket/utils/TestFunctionOptimizer.java b/src/net/sf/openrocket/utils/TestFunctionOptimizer.java
index a57ea78a71125577eac7075514575acbc9be0455..e5f9da71ae7287fed84935ed6be85c52c0a56deb 100644 (file)
--- a/src/net/sf/openrocket/utils/TestFunctionOptimizer.java
+++ b/src/net/sf/openrocket/utils/TestFunctionOptimizer.java
@@ -3,6 +3,7 @@ package net.sf.openrocket.utils;
 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.ParallelFunctionCache;
 import net.sf.openrocket.optimization.general.Point;
@@ -22,7 +23,7 @@ public class TestFunctionOptimizer {
        
 
        private void go(final ParallelFunctionCache functionCache,
-                       final FunctionOptimizer optimizer, final Point optimum, final int maxSteps) {
+                       final FunctionOptimizer optimizer, final Point optimum, final int maxSteps) throws OptimizationException {
                
                Function function = new Function() {
                        @Override
@@ -35,15 +36,6 @@ public class TestFunctionOptimizer {
                                        return Double.NaN;
                                }
                        }
-                       
-                       @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() {
@@ -83,7 +75,7 @@ public class TestFunctionOptimizer {
        }
        
        
-       public static void main(String[] args) throws InterruptedException {
+       public static void main(String[] args) throws InterruptedException, OptimizationException {
                
                System.err.println("Number of processors: " + Runtime.getRuntime().availableProcessors());