From: Bill Kuker <bkuker@billkuker.com>
Date: Fri, 17 Apr 2009 13:04:16 +0000 (+0000)
Subject: Added motor rating, Impulse quantity
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5ef020575eaf3494a5ca2aec7bab64d058682d6a;p=sw%2Fmotorsim

Added motor rating, Impulse quantity
---

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index 0300923..e52c049 100644
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -6,11 +6,16 @@ import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
 public class RocketScience {
+	public static Unit<Impulse> NEWTON_SECOND = new ProductUnit<Impulse>(SI.NEWTON.times(SI.SECOND));
 
 	public interface MolarWeight extends Quantity {
 		public static final Unit<MolarWeight> UNIT = new ProductUnit<MolarWeight>(
 				SI.KILOGRAM.divide(SI.MOLE));
 	}
 	
+	public interface Impulse extends Quantity {
+		public static Unit<Impulse> UNIT = NEWTON_SECOND;
+	}
+
 
 }
diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 0e8eeb1..1bf938c 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -1,6 +1,8 @@
 package com.billkuker.rocketry.motorsim.visual;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridLayout;
 import java.text.NumberFormat;
 
 import javax.measure.quantity.Duration;
@@ -10,6 +12,7 @@ import javax.measure.quantity.Velocity;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JSplitPane;
@@ -20,6 +23,8 @@ import javax.swing.event.ChangeListener;
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.Burn;
+import com.billkuker.rocketry.motorsim.RocketScience;
+import com.billkuker.rocketry.motorsim.Burn.Interval;
 
 public class BurnPanel extends JPanel {
 	private static final long serialVersionUID = 1L;
@@ -73,6 +78,9 @@ public class BurnPanel extends JPanel {
 			grains.setResizeWeight(.5);
 			
 			JSplitPane main = new JSplitPane(JSplitPane.VERTICAL_SPLIT, grains, tp);
+			Dimension minimumSize = new Dimension(800, 200);
+			grains.setMinimumSize(minimumSize);
+			tp.setMinimumSize(minimumSize);
 			main.setDividerLocation(.5);
 			main.setResizeWeight(.5);
 			
@@ -80,6 +88,48 @@ public class BurnPanel extends JPanel {
 			
 			add( new SL(), BorderLayout.SOUTH);
 			
+			
+
+				Amount<RocketScience.Impulse> ns = Amount.valueOf(0, RocketScience.NEWTON_SECOND);
+				Amount<Force> averageThrust = Amount.valueOf(0, SI.NEWTON);
+				Amount<Force> maxThrust = Amount.valueOf(0, SI.NEWTON);
+				Amount<Pressure> maxPressure = Amount.valueOf(0, SI.MEGA(SI.PASCAL));
+				int thrustCount = 0;
+				
+				for( Interval i: burn.getData().values() ){
+					ns = ns.plus(i.dt.times(i.thrust));
+					if ( i.thrust.isGreaterThan(Amount.valueOf(0.01, SI.NEWTON))){
+						thrustCount++;
+						averageThrust = averageThrust.plus(i.thrust);
+					}
+					if ( i.thrust.isGreaterThan(maxThrust))
+						maxThrust = i.thrust;
+					if ( i.chamberPressure.isGreaterThan(maxPressure))
+						maxPressure = i.chamberPressure;
+				}
+				averageThrust = averageThrust.divide(thrustCount);
+
+				int cn = (int)(Math.log(ns.doubleValue(RocketScience.NEWTON_SECOND)/1.25) / Math.log(2));
+				char cl = (char)((int)'A' + cn);
+
+			
+			JPanel text = new JPanel(new GridLayout(2,5));
+
+			text.add(new JLabel("Rating"));
+			text.add(new JLabel("Total Impulse"));
+			text.add(new JLabel("Max Thrust"));
+			text.add(new JLabel("Average Thust"));
+			text.add(new JLabel("Max Pressure"));
+			
+			text.add(new JLabel(new String(new char[]{cl}) + "-" +Math.round(averageThrust.doubleValue(SI.NEWTON))));
+			text.add(new JLabel(approx(ns)));
+			text.add(new JLabel(approx(maxThrust)));
+			text.add(new JLabel(approx(averageThrust)));
+			text.add(new JLabel(approx(maxPressure)));
+			
+			add(text, BorderLayout.NORTH);
+			
+			
 		} catch (NoSuchMethodException e){
 			throw new Error(e);
 		}
@@ -87,9 +137,15 @@ public class BurnPanel extends JPanel {
 
 	}
 	
+	private String approx(Amount a){
+		double d = a.doubleValue(a.getUnit());
+		long i = Math.round(d);
+		return i + " " + a.getUnit().toString();
+	}
+	
 	private class SL extends JSlider implements ChangeListener{
 		private static final long serialVersionUID = 1L;
-		private static final int STEPS = 300;
+		private static final int STEPS = 80;
 		public SL(){
 			addChangeListener(this);
 			setMinimum(0);