From: Bill Kuker Date: Thu, 2 Jul 2009 15:29:01 +0000 (+0000) Subject: Removed old discreet reg step grain interface X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8956d7ce1f9f0f7075baa0c4849e6c14214e8622;p=sw%2Fmotorsim Removed old discreet reg step grain interface --- diff --git a/log4j.properties b/log4j.properties index d08b793..23a7afe 100644 --- a/log4j.properties +++ b/log4j.properties @@ -1,4 +1,4 @@ -log4j.rootCategory=DEBUG, O +log4j.rootCategory=INFO, O # Stdout log4j.appender.O=org.apache.log4j.ConsoleAppender diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java index 49d9ef2..5495857 100644 --- 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..."); long start = new Date().getTime(); - Amount regStep = Amount.valueOf(0.1, SI.MILLIMETER); + Amount regStep = Amount.valueOf(0.01, SI.MILLIMETER); - //if ( motor.getGrain() instanceof Grain.DiscreteRegression ) - //regStep = ((Grain.DiscreteRegression)motor.getGrain()).optimalRegressionStep(); - Interval initial = new Interval(); initial.time = Amount.valueOf(0, SI.SECOND); initial.dt = Amount.valueOf(0, SI.SECOND); diff --git a/src/com/billkuker/rocketry/motorsim/Grain.java b/src/com/billkuker/rocketry/motorsim/Grain.java index e99505c..064b3cd 100644 --- 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 regression); public java.awt.geom.Area getSideView(Amount regression); - public interface DiscreteRegression{ - public Amount optimalRegressionStep(); - } - public interface Composite { public List getGrains(); }