bug fixes and rocket optimization

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

diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java b/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java
index 04ba7bce14fbda984aea35b85c095381f5103a6e..5d24e44675c763427690c1ba92235b7c4631f7e7 100644 (file)
--- a/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java
+++ b/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java
@@ -14,7 +14,7 @@ import net.sf.openrocket.util.MathUtil;
 
 /**
  * An abstract implementation of the SimulationModifier interface.  An implementation
- * needs only to implement the {@link #getCurrentValue(Simulation)} and
+ * needs only to implement the {@link #getCurrentSIValue(Simulation)} and
  * {@link #modify(net.sf.openrocket.document.Simulation, double)} methods.
  * 
  * @author Sampo Niskanen <sampo.niskanen@iki.fi>
@@ -57,7 +57,7 @@ public abstract class AbstractSimulationModifier implements SimulationModifier {
        
        @Override
        public double getCurrentScaledValue(Simulation simulation) throws OptimizationException {
-               double value = getCurrentValue(simulation);
+               double value = getCurrentSIValue(simulation);
                return toScaledValue(value);
        }
        
@@ -91,6 +91,7 @@ public abstract class AbstractSimulationModifier implements SimulationModifier {
         * @return                      the value in SI units
         */
        protected double toBaseValue(double value) {
+               System.out.println("value=" + value + " minValue=" + minValue + " maxValue=" + maxValue);
                return MathUtil.map(value, 0.0, 1.0, minValue, maxValue);
        }