Removed old discreet reg step grain interface

diff --git a/log4j.properties b/log4j.properties
index d08b793f45594e9170c03ee81bb44b4ee4faed0d..23a7afea3e30ad02f08cad14b14df7f3cf6fc0d2 100644 (file)
--- a/log4j.properties
+++ b/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootCategory=DEBUG, O\r
+log4j.rootCategory=INFO, O\r
 \r
 # Stdout\r
 log4j.appender.O=org.apache.log4j.ConsoleAppender\r

diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java
index 49d9ef20f0071901f032586fedd0eb1be46c9e96..54958571206bfcb857d2838487175e9b375c16b0 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Burn.java
+++ b/src/com/billkuker/rocketry/motorsim/Burn.java
@@ -68,11 +68,8 @@ public class Burn {
                log.info("Starting burn...");\r
                long start = new Date().getTime();\r
                \r
-               Amount<Length> regStep = Amount.valueOf(0.1, SI.MILLIMETER);\r
+               Amount<Length> regStep = Amount.valueOf(0.01, SI.MILLIMETER);\r
 \r
-               //if ( motor.getGrain() instanceof Grain.DiscreteRegression )\r
-                       //regStep = ((Grain.DiscreteRegression)motor.getGrain()).optimalRegressionStep();\r
-               \r
                Interval initial = new Interval();\r
                initial.time = Amount.valueOf(0, SI.SECOND);\r
                initial.dt = Amount.valueOf(0, SI.SECOND);\r

diff --git a/src/com/billkuker/rocketry/motorsim/Grain.java b/src/com/billkuker/rocketry/motorsim/Grain.java
index e99505c2dd1c15e4c5883ea65304de5268047752..064b3cd7be6254c52d0059941b31eec64e3579c8 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Grain.java
+++ b/src/com/billkuker/rocketry/motorsim/Grain.java
@@ -14,10 +14,6 @@ public interface Grain {
        public java.awt.geom.Area getCrossSection(Amount<Length> regression);\r
        public java.awt.geom.Area getSideView(Amount<Length> regression);\r
        \r
-       public interface DiscreteRegression{\r
-               public Amount<Length> optimalRegressionStep();\r
-       }\r
-       \r
        public interface Composite {\r
                public List<Grain> getGrains();\r
        }\r