major optimization updates

[debian/openrocket] / src / net / sf / openrocket / optimization / rocketoptimization / SimulationDomain.java

diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java b/src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java
index b03be658f63d6b2eceae9d65f82868cbb16ecef1..d2a204ec5afafb4092b6d2be7c20a15f328eb748 100644 (file)
--- a/src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java
+++ b/src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java
@@ -1,6 +1,8 @@
 package net.sf.openrocket.optimization.rocketoptimization;
 
 import net.sf.openrocket.document.Simulation;
+import net.sf.openrocket.unit.Value;
+import net.sf.openrocket.util.Pair;
 
 /**
  * An interface defining a function domain which limits allowed function values.
@@ -17,9 +19,12 @@ public interface SimulationDomain {
         * is NaN, the simulation is outside of the domain.
         * 
         * @param simulation    the simulation to check.
-        * @return                              a negative value or zero if the simulation is in the domain;
-        *                                              a positive value or NaN if not.
+        * @return                              A pair indicating the status.  The first element is the reference value,
+        *                                              a negative value or zero if the simulation is in the domain,
+        *                                              a positive value or NaN if not.  The second is the value
+        *                                              indication of the domain (may be null).
         */
-       public double getDistanceToDomain(Simulation simulation);
+       public Pair<Double, Value> getDistanceToDomain(Simulation simulation);
        
+
 }