bug fixes and rocket optimization

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

diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java b/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java
index 6df312410938baec97b6e5a2af6921c57c7ec4bf..f2cb67f77b0a43d52579fc8337cfd4a675aca3d4 100644 (file)
--- a/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java
+++ b/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java
@@ -18,6 +18,9 @@ public abstract class GenericModifier<T> extends AbstractSimulationModifier {
        
        private final double multiplier;
        
+       private final Class<? extends T> modifiedClass;
+       private final String methodName;
+       
        private final Method getter;
        private final Method setter;
        
@@ -34,10 +37,13 @@ public abstract class GenericModifier<T> extends AbstractSimulationModifier {
         * @param methodName            the base name of the getter/setter methods (without "get"/"set")
         */
        public GenericModifier(String modifierName, Object relatedObject, UnitGroup unitGroup, double multiplier,
-                       Class<T> modifiedClass, String methodName) {
+                       Class<? extends T> modifiedClass, String methodName) {
                super(modifierName, relatedObject, unitGroup);
                this.multiplier = multiplier;
                
+               this.modifiedClass = modifiedClass;
+               this.methodName = methodName;
+               
                if (MathUtil.equals(multiplier, 0)) {
                        throw new IllegalArgumentException("multiplier is zero");
                }
@@ -56,7 +62,7 @@ public abstract class GenericModifier<T> extends AbstractSimulationModifier {
        
 
        @Override
-       public double getCurrentValue(Simulation simulation) throws OptimizationException {
+       public double getCurrentSIValue(Simulation simulation) throws OptimizationException {
                T modifiable = getModifiedObject(simulation);
                if (modifiable == null) {
                        throw new OptimizationException("BUG: getModifiedObject() returned null");
@@ -72,6 +78,7 @@ public abstract class GenericModifier<T> extends AbstractSimulationModifier {
                        throw new OptimizationException("BUG: getModifiedObject() returned null");
                }
                double siValue = toBaseValue(scaledValue) / multiplier;
+               System.out.println("Setting setter=" + setter + " modifiable=" + modifiable + " siValue=" + siValue + "scaledValue=" + scaledValue);
                setter.invoke(modifiable, siValue);
        }
        
@@ -85,4 +92,11 @@ public abstract class GenericModifier<T> extends AbstractSimulationModifier {
         */
        protected abstract T getModifiedObject(Simulation simulation) throws OptimizationException;
        
+       
+
+       @Override
+       public String toString() {
+               return "GenericModifier[modifiedClass=" + modifiedClass.getCanonicalName() + ", methodName=" + methodName + ", multiplier=" + multiplier + "]";
+       }
+       
 }