Cleanup data translation

diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java
index 2719c493809d87a84a12d2404df0bb76a42341f2..0c6a69f9c8d3773cfa98bff456d680f79018901d 100644 (file)
--- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java
+++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java
@@ -3,7 +3,6 @@ package com.billkuker.rocketry.motorsim.visual.openRocket;
 import java.util.List;\r
 import java.util.Vector;\r
 \r
-import javax.measure.quantity.Duration;\r
 import javax.measure.quantity.Mass;\r
 import javax.measure.unit.SI;\r
 \r
@@ -298,7 +297,7 @@ public class OneMotorDatabase implements MotorDatabase {
                thrust = new double[burn.getData().size()];\r
 \r
                cg[0] = new Coordinate();\r
-               \r
+\r
                double lastWeight = b\r
                                .getMotor()\r
                                .getGrain()\r
@@ -306,29 +305,25 @@ public class OneMotorDatabase implements MotorDatabase {
                                .times(b.getMotor().getFuel().getIdealDensity()\r
                                                .times(b.getMotor().getFuel().getDensityRatio()))\r
                                .to(Mass.UNIT).doubleValue(SI.KILOGRAM);\r
-               \r
+\r
                int i = 0;\r
+\r
                double len = ((ICylindricalChamber) burn.getMotor().getChamber())\r
                                .getLength().doubleValue(SI.METER);\r
-               \r
+\r
                for (Interval d : burn.getData().values()) {\r
                        lastWeight = lastWeight - d.fuelBurnt.doubleValue(SI.KILOGRAM);\r
-                       cg[i] = new Coordinate(len/2.0,0,0,lastWeight);\r
+                       cg[i] = new Coordinate(len / 2.0, 0, 0, lastWeight);\r
                        System.err.println(lastWeight);\r
-                       i++;\r
-               }\r
 \r
-               i = 0;\r
-               for (Amount<Duration> t : burn.getData().keySet()) {\r
-                       time[i++] = t.doubleValue(SI.SECOND);\r
-               }\r
-\r
-               i = 0;\r
-               for (Interval d : burn.getData().values()) {\r
                        double t = d.thrust.doubleValue(SI.NEWTON);\r
                        t = Math.max(t, 0.0001);\r
-                       thrust[i++] = t;\r
+                       thrust[i] = t;\r
+\r
+                       time[i] = d.time.doubleValue(SI.SECOND);\r
+                       i++;\r
                }\r
+\r
                thrust[0] = 0;\r
                thrust[thrust.length - 1] = 0;\r
        }\r