Addign build file
authorBill Kuker <bkuker@billkuker.com>
Wed, 24 Nov 2010 18:22:49 +0000 (18:22 +0000)
committerBill Kuker <bkuker@billkuker.com>
Wed, 24 Nov 2010 18:22:49 +0000 (18:22 +0000)
Removed GUI references from core

15 files changed:
build.xml [new file with mode: 0644]
src/com/billkuker/rocketry/motorsim/GraphSimplifier.java
src/com/billkuker/rocketry/motorsim/fuel/KNDX.java
src/com/billkuker/rocketry/motorsim/fuel/KNER.java
src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
src/com/billkuker/rocketry/motorsim/grain/CSlot.java
src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
src/com/billkuker/rocketry/motorsim/grain/Finocyl.java
src/com/billkuker/rocketry/motorsim/grain/Moonburner.java
src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java
src/com/billkuker/rocketry/motorsim/grain/Star.java
src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java
src/com/billkuker/rocketry/motorsim/grain/util/RotatedShapeGrain.java
src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java

diff --git a/build.xml b/build.xml
new file mode 100644 (file)
index 0000000..78009ba
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0"?>
+
+<project name="MotorSim" basedir=".">
+       <property name="name" value="MotorSim" />
+
+       <property name="findbugs.root" value="C:\src\Libs\findbugs-1.3.9" />
+
+       <property name="core.src.dir" value="src" />
+       <property name="test.src.dir" value="test" />
+       <property name="gui.src.dir" value="test" />
+       
+       <property name="core.build.dir" value=".classes" />
+       <property name="test.build.dir" value=".tests" />
+       <property name="gui.build.dir" value=".tests" />
+       
+       <property name="dist.dir" value="dist" />
+       <property name="temp.dir" value=".temp" />
+
+       <path id="findbugs.classpath">
+               <fileset dir="${findbugs.root}/lib">
+                       <include name="*.jar" />
+               </fileset>
+       </path>
+
+       <path id="core.classpath">
+               <fileset dir="lib">
+                       <include name="*.jar" />
+               </fileset>
+       </path>
+       
+       <path id="gui.classpath">
+               <fileset dir="lib">
+                       <include name="*.jar" />
+               </fileset>
+               <fileset dir="dist">
+                       <include name="*.jar" />
+               </fileset>
+       </path>
+
+       <path id="test.classpath">
+               <path refid="core.classpath" />
+               <path refid="gui.classpath" />
+               <fileset dir="${dist.dir}">
+                       <include name="*.jar" />
+               </fileset>
+       </path>
+
+       <target name="clean" description="Clean output dirs (build, docs, dist)">
+               <delete dir="${core.build.dir}" />
+               <delete dir="${gui.build.dir}" />
+               <delete dir="${test.build.dir}" />
+               <delete dir="${dist.dir}" />
+               <delete dir="${temp.dir}" />
+               <delete file="${name}-findbugs.xml" />
+               <delete file="TEST-UnitTests.xml" />
+       </target>
+
+       <target name="core.build" description="Compile main source tree java files into class files.">
+               <mkdir dir="${core.build.dir}" />
+               <javac destdir="${core.build.dir}" source="1.5" target="1.5" debug="true" deprecation="false" optimize="false" failonerror="true">
+                       <src path="${core.src.dir}" />
+                       <classpath refid="core.classpath" />
+               </javac>
+       </target>
+       
+       <target name="gui.build" depends='core.jarfile' description="Compile main source tree java files into class files.">
+               <mkdir dir="${gui.build.dir}" />
+               <javac destdir="${gui.build.dir}" source="1.5" target="1.5" debug="true" deprecation="false" optimize="false" failonerror="true">
+                       <src path="${gui.src.dir}" />
+                       <classpath refid="gui.classpath" />
+               </javac>
+       </target>
+               
+       
+       <target name="core.jarfile" depends="core.build" description="Build the jar file">
+               <mkdir dir="${dist.dir}" />
+               <jar jarfile="${dist.dir}/${name}-API.jar" compress="true" basedir="${cure.build.dir}" />
+       </target>
+       
+       <target name="gui.jarfile" depends="gui.build" description="Build the jar file">
+               <mkdir dir="${dist.dir}" />
+               <jar jarfile="${dist.dir}/${name}-API.jar" compress="true" basedir="${cure.build.dir}" />
+       </target>
+
+<!--
+
+       <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+               <classpath>
+                       <fileset dir="ant/">
+                               <include name="*.jar" />
+                       </fileset>
+               </classpath>
+       </taskdef>
+
+       <target name="dist" depends="Fat-Jar">
+               <delete quiet='true'>
+                       <fileset dir="${dist.dir}/installers" includes="*"/>
+               </delete>
+               <mkdir dir="${dist.dir}" />
+               <mkdir dir="${dist.dir}/installers" />
+
+
+               <ant dir="RPM" target="dist" inheritAll='false' />
+               <ant target="One-Jar"/>
+               <trycatch>
+                       <try>
+                               <ant dir="MSI" target="dist" inheritAll='false' />
+                       </try>
+                       <catch><echo>Skipping MSI</echo></catch>
+               </trycatch>
+       </target>
+
+
+
+
+       <taskdef name="one-jar" classname="com.simontuffs.onejar.ant.OneJarTask">
+               <classpath>
+                       <fileset dir="ant">
+                               <include name="*.jar" />
+                       </fileset>
+               </classpath>
+       </taskdef>
+       <target name='One-Jar' depends='jarfile-main, jarfile-api'>\r
+               <property file=".classes/MarProbe.version.properties" />
+               <property name="destfilename" value="${name}-${version}.jar"/>
+               <one-jar destfile="${dist.dir}/installers/${destfilename}" manifest="manifest.mf">
+                       <main>
+                               <fileset dir="${src.dir}">
+                                       <include name="log4j.properties" />
+                                       <include name="martello.pem" />
+                                       <include name="MartelloKey.der" />
+                               </fileset>
+                       </main>
+                       <lib>
+                               <fileset dir="${dist.dir}">
+                                       <include name="${name}.jar" />
+                                       <include name="${name}-API.jar" />
+                               </fileset>
+                               <fileset dir="lib/build">
+                                       <include name="*.jar" />
+                               </fileset>
+                               <fileset dir="lib/runtime">
+                                       <include name="*.jar" />
+                               </fileset>
+                       </lib>
+                       <fileset dir="${build.dir}">
+                               <include name="com/martellotech/Diagnostic*.class" />
+                       </fileset>
+               </one-jar>
+       </target>
+
+
+       <target name="Fat-Jar" depends="jarfile-main, jarfile-api">
+               <delete dir="${temp.dir}" quiet="true" />
+               <unjar dest="${temp.dir}">
+                       <fileset dir="lib/build">
+                               <include name="**/*.jar" />
+                       </fileset>
+                       <fileset dir="lib/runtime">
+                               <include name="**/*.jar" />
+                       </fileset>
+               </unjar>
+               <unjar dest="${temp.dir}">
+                       <fileset dir="lib/build">
+                               <include name="**/Martello-*.jar" />
+                       </fileset>
+                       <fileset dir="lib/runtime">
+                               <include name="**/Martello-*.jar" />
+                       </fileset>
+               </unjar>
+               <unjar dest="${temp.dir}">
+                       <fileset dir="${dist.dir}">
+                                       <include name="${name}.jar" />
+                                       <include name="${name}-API.jar" />
+                       </fileset>
+               </unjar>
+               <delete dir='${temp.dir}/META-INF'/>
+               <jar jarfile="${dist.dir}/${name}-Fat.jar" basedir="${temp.dir}" includes="**/*.*" update="false" compress="true">
+                       <fileset dir="${src.dir}">
+                               <include name="log4j.properties" />
+                               <include name="martello.pem" />
+                               <include name="MartelloKey.der" />
+                       </fileset>
+               </jar>
+       </target>
+       
+       
+
+       <target name="findbugs" depends="jarfile-main, jarfile-api">
+
+               <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs.classpath" />
+
+               <findbugs home="${findbugs.root}" output="xml" outputFile="${name}-findbugs.xml">
+                       <auxClasspath refid="test-classpath" />
+                       <sourcePath path="${src.dir}" />
+                       <class location="${dist.dir}/${name}.jar" />
+               </findbugs>
+       </target>
+
+
+       <target name="test" depends="dist">
+               <mkdir dir="${test.build.dir}" />
+               <javac destdir="${test.build.dir}" source="1.5" target="1.5" debug="true" deprecation="false" optimize="false" failonerror="true">
+                       <src path="${test.src.dir}" />
+                       <classpath refid="test-classpath" />
+               </javac>
+               <copy todir="${test.build.dir}">
+                       <fileset dir="${test.src.dir}">
+                               <include name="**/*.xml" />
+                               <include name="**/*.properties" />
+                       </fileset>
+               </copy>
+               <mkdir dir="${dist.dir}" />
+               <jar jarfile="${dist.dir}/${name}-tests.jar" compress="true" basedir="${test.build.dir}" />
+               <junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="false" showoutput="yes">
+
+
+                       <classpath refid="test-classpath" />
+
+
+                       <formatter type="xml" />
+
+
+                       <test name="UnitTests" />
+               </junit>
+
+       </target>       -->
+
+</project>
index a0bd25f8f149ad3bab3f27e04f0862062caf41a7..4430d998ccb84d0d1212195a7eb6c0a6df0a1226 100644 (file)
@@ -11,18 +11,10 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Vector;
 
-import javax.measure.quantity.Area;
-import javax.measure.quantity.Length;
 import javax.measure.quantity.Quantity;
-import javax.measure.unit.SI;
-import javax.swing.JFrame;
-import javax.swing.JSplitPane;
 
 import org.jscience.physics.amount.Amount;
 
-import com.billkuker.rocketry.motorsim.grain.EndBurner;
-import com.billkuker.rocketry.motorsim.visual.Chart;
-
 public class GraphSimplifier<X extends Quantity, Y extends Quantity> {
        Method f;
        
@@ -123,48 +115,6 @@ public class GraphSimplifier<X extends Quantity, Y extends Quantity> {
                                break;
                }
                
-               
-
-       }
-
-       public static void main(String args[]) throws Exception {
-               /*
-               CoredCylindricalGrain g = new CoredCylindricalGrain();
-               g.setLength(Amount.valueOf(70, SI.MILLIMETER));
-               g.setOD(Amount.valueOf(30, SI.MILLIMETER));
-               g.setID(Amount.valueOf(10, SI.MILLIMETER));
-               */
-               EndBurner g = new EndBurner();
-               g.setLength(Amount.valueOf(70, SI.MILLIMETER));
-               g.setOD(Amount.valueOf(30, SI.MILLIMETER));
-               g.setPuntDepth(Amount.valueOf(10, SI.MILLIMETER));
-               g.setPuntDiameter(Amount.valueOf(10, SI.MILLIMETER));
-               
-               JFrame f = new JFrame();
-               f.setSize(1024, 768);
-               f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-               JSplitPane jsp = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-               f.add(jsp);
-
-               Chart<Length, Area> c = new Chart<Length, Area>(SI.MILLIMETER,
-                               SI.MILLIMETER.pow(2).asType(Area.class), g, "surfaceArea");
-               c.setDomain(c.new IntervalDomain(Amount.valueOf(0, SI.CENTIMETER), g
-                               .webThickness()));
-               jsp.setTopComponent(c);
-
-               GraphSimplifier<Length, Area> gs = new GraphSimplifier(g,
-                               "surfaceArea", c.new IntervalDomain(Amount.valueOf(0,
-                                               SI.CENTIMETER), g.webThickness()).iterator());
-
-               Chart<Length, Area> d = new Chart<Length, Area>(SI.MILLIMETER,
-                               SI.MILLIMETER.pow(2).asType(Area.class), gs, "value");
-               d.setDomain(gs.getDomain());
-               jsp.setBottomComponent(d);
-               
-
-               
-               f.setVisible(true);
-               jsp.setDividerLocation(.5);
-               jsp.revalidate();
        }
+       
 }
index cf1bc0a4fa335307e780790cbc2d9ea029cec4ff..a09567702fddb5156600d128e0c3eeb81e418364 100644 (file)
@@ -1,15 +1,12 @@
 package com.billkuker.rocketry.motorsim.fuel;\r
 \r
-import javax.measure.quantity.Pressure;\r
 import javax.measure.quantity.Temperature;\r
-import javax.measure.quantity.Velocity;\r
 import javax.measure.quantity.VolumetricDensity;\r
 import javax.measure.unit.SI;\r
 \r
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;\r
-import com.billkuker.rocketry.motorsim.visual.Chart;\r
 \r
 public class KNDX extends PiecewiseSaintRobertFuel {\r
 \r
@@ -47,24 +44,6 @@ public class KNDX extends PiecewiseSaintRobertFuel {
                        }\r
                };\r
        }\r
-       \r
-       public static void main( String args[]) throws Exception{\r
-               KNDX f = new KNDX();\r
-               \r
-               Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(\r
-                               SI.MEGA(SI.PASCAL),\r
-                               SI.METERS_PER_SECOND,\r
-                               f,\r
-                               "burnRate");\r
-               burnRate.setDomain(\r
-                               burnRate.new IntervalDomain(\r
-                                               Amount.valueOf(0, SI.MEGA(SI.PASCAL)),\r
-                                               Amount.valueOf(11, SI.MEGA(SI.PASCAL)),\r
-                                               20\r
-                                               ));\r
-               \r
-               burnRate.show();\r
-       }\r
 \r
        public double getCombustionEfficiency() {\r
                return .97;\r
index a80a48550eba0717044086fba1c220a601a2e757..624a299554a6456083316715b6a96188c534555a 100644 (file)
@@ -2,14 +2,12 @@ package com.billkuker.rocketry.motorsim.fuel;
 \r
 import javax.measure.quantity.Pressure;\r
 import javax.measure.quantity.Temperature;\r
-import javax.measure.quantity.Velocity;\r
 import javax.measure.quantity.VolumetricDensity;\r
 import javax.measure.unit.SI;\r
 \r
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;\r
-import com.billkuker.rocketry.motorsim.visual.Chart;\r
 \r
 public class KNER extends SaintRobertFuel {\r
 \r
@@ -53,24 +51,6 @@ public class KNER extends SaintRobertFuel {
                        }\r
                };\r
        }\r
-       \r
-       public static void main( String args[]) throws Exception{\r
-               KNER f = new KNER();\r
-               \r
-               Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(\r
-                               SI.MEGA(SI.PASCAL),\r
-                               SI.METERS_PER_SECOND,\r
-                               f,\r
-                               "burnRate");\r
-               burnRate.setDomain(\r
-                               burnRate.new IntervalDomain(\r
-                                               Amount.valueOf(0, SI.MEGA(SI.PASCAL)),\r
-                                               Amount.valueOf(11, SI.MEGA(SI.PASCAL)),\r
-                                               20\r
-                                               ));\r
-               \r
-               burnRate.show();\r
-       }\r
 \r
        public double getCombustionEfficiency() {\r
                return .97;\r
index a1a323b02206a8af525d643a485390c340d1f796..5ac01a658f575825dc47096dc98752e7d2bec2f3 100644 (file)
@@ -1,15 +1,12 @@
 package com.billkuker.rocketry.motorsim.fuel;\r
 \r
-import javax.measure.quantity.Pressure;\r
 import javax.measure.quantity.Temperature;\r
-import javax.measure.quantity.Velocity;\r
 import javax.measure.quantity.VolumetricDensity;\r
 import javax.measure.unit.SI;\r
 \r
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;\r
-import com.billkuker.rocketry.motorsim.visual.Chart;\r
 \r
 public class KNSB extends PiecewiseSaintRobertFuel {\r
 \r
@@ -47,24 +44,6 @@ public class KNSB extends PiecewiseSaintRobertFuel {
                        }\r
                };\r
        }\r
-       \r
-       public static void main( String args[]) throws Exception{\r
-               KNSB f = new KNSB();\r
-               \r
-               Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(\r
-                               SI.MEGA(SI.PASCAL),\r
-                               SI.METERS_PER_SECOND,\r
-                               f,\r
-                               "burnRate");\r
-               burnRate.setDomain(\r
-                               burnRate.new IntervalDomain(\r
-                                               Amount.valueOf(0, SI.MEGA(SI.PASCAL)),\r
-                                               Amount.valueOf(11, SI.MEGA(SI.PASCAL)),\r
-                                               20\r
-                                               ));\r
-               \r
-               burnRate.show();\r
-       }\r
 \r
        public double getCombustionEfficiency() {\r
                return .97;\r
index 7b163ad2328883bb3e54696bf1d8755774c1517c..a74dfd4c00ff5865cdac9234a36ba2eadfb791a6 100644 (file)
@@ -17,7 +17,6 @@ import org.jscience.physics.amount.Amount;
 \r
 import com.billkuker.rocketry.motorsim.RocketScience;\r
 import com.billkuker.rocketry.motorsim.fuel.EditableCombustionProduct;\r
-import com.billkuker.rocketry.motorsim.visual.Chart;\r
 \r
 public class EditablePiecewiseLinearFuel implements EditableFuel{\r
        private static final Logger log = Logger\r
@@ -164,28 +163,4 @@ public class EditablePiecewiseLinearFuel implements EditableFuel{
                }\r
        }\r
 \r
-\r
-       \r
-       public static void main( String args[]) throws Exception{\r
-               EditablePiecewiseLinearFuel f = new EditablePiecewiseLinearFuel();\r
-               f.add(Amount.valueOf(0,SI.MEGA(SI.PASCAL)), Amount.valueOf(2, SI.METERS_PER_SECOND));\r
-               //f.add(Amount.valueOf(2,SI.MEGA(SI.PASCAL)), Amount.valueOf(2, SI.METERS_PER_SECOND));\r
-               //f.add(Amount.valueOf(4,SI.MEGA(SI.PASCAL)), Amount.valueOf(1, SI.METERS_PER_SECOND));\r
-               //f.add(Amount.valueOf(10,SI.MEGA(SI.PASCAL)), Amount.valueOf(3, SI.METERS_PER_SECOND));\r
-               //f.add(Amount.valueOf(20,SI.MEGA(SI.PASCAL)), Amount.valueOf(4, SI.METERS_PER_SECOND));\r
-               Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(\r
-                               SI.MEGA(SI.PASCAL),\r
-                               SI.METERS_PER_SECOND,\r
-                               f,\r
-                               "burnRate");\r
-               burnRate.setDomain(\r
-                               burnRate.new IntervalDomain(\r
-                                               Amount.valueOf(0, SI.MEGA(SI.PASCAL)),\r
-                                               Amount.valueOf(11, SI.MEGA(SI.PASCAL)),\r
-                                               200\r
-                                               ));\r
-               \r
-               burnRate.show();\r
-       }\r
-\r
 }\r
index c3154c5dd320dfcc9b2c83d54398c8cf0a8622cf..d26657f5aefc70c33a23d6c62233687788a5df1c 100644 (file)
@@ -13,8 +13,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;\r
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;\r
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 public class CSlot extends ExtrudedShapeGrain implements Validating {\r
 \r
@@ -104,12 +102,6 @@ public class CSlot extends ExtrudedShapeGrain implements Validating {
                generateGeometry();\r
        }\r
 \r
-       public static void main(String args[]) throws Exception {\r
-               CSlot e = new CSlot();\r
-               new Editor(e).showAsWindow();\r
-               new GrainPanel(e).showAsWindow();\r
-       }\r
-       \r
        public void validate() throws ValidationException{\r
                if ( oD.equals(Amount.ZERO) )\r
                        throw new ValidationException(this, "Invalid oD");\r
index 5b05536343919d6439092c9e30ff3969a472ca0a..6248239d292b9dd1bc611448aca3f93a490f9707 100644 (file)
@@ -13,8 +13,6 @@ import javax.measure.unit.SI;
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.Validating;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 \r
 public class CoredCylindricalGrain extends ExtrudedGrain implements Validating {\r
@@ -248,10 +246,4 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements Validating {
                this.innerSurfaceInhibited = innerSurfaceInhibited;\r
        }\r
 \r
-       public static void main(String args[]) throws Exception {\r
-               CoredCylindricalGrain e = DEFAULT_GRAIN;\r
-               new Editor(e).showAsWindow();\r
-               new GrainPanel(e).showAsWindow();\r
-       }\r
-\r
 }\r
index aefaf327a338948f2e03ece292a1bc672dac61bc..4ef34ae2d6b29efdc613d6975c1c8caf3d244bbb 100644 (file)
@@ -14,8 +14,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;\r
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;\r
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 public class Finocyl extends ExtrudedShapeGrain implements Validating {\r
        private Amount<Length> oD = Amount.valueOf(30, SI.MILLIMETER);\r
@@ -109,12 +107,6 @@ public class Finocyl extends ExtrudedShapeGrain implements Validating {
                generateGeometry();\r
        }\r
        \r
-       public static void main(String args[]) throws Exception {\r
-               Finocyl e = new Finocyl();\r
-               new Editor(e).showAsWindow();\r
-               new GrainPanel(e).showAsWindow();\r
-       }\r
-       \r
        @Override\r
        public void validate() throws ValidationException{\r
                if ( iD.equals(Amount.ZERO) )\r
index 9844f3e7873faff32378adcbcf67fd101c6b27a2..ffbd4b61e008f1dfc321b60db2d1fba1bbd523cc 100644 (file)
@@ -12,8 +12,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;\r
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;\r
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 public class Moonburner extends ExtrudedShapeGrain implements Validating {\r
 \r
@@ -76,13 +74,7 @@ public class Moonburner extends ExtrudedShapeGrain implements Validating {
                xsection.subtract(new Ellipse2D.Double(odmm/2 - idmm/2 + offmm, odmm/2 - idmm/2, idmm, idmm));\r
                webThickness = null;\r
        }\r
-       \r
-       public static void main(String args[]) throws Exception {\r
-               Moonburner e = new Moonburner();\r
-               new Editor(e).showAsWindow();\r
-               new GrainPanel(e).showAsWindow();\r
-       }\r
-       \r
+\r
        public void validate() throws ValidationException{\r
                if ( iD.equals(Amount.ZERO) )\r
                        throw new ValidationException(this, "Invalid iD");\r
index 3ce4dae36ba4a5883131adc674fcebae3dc7e3f7..a3ede32729342ea7eb54c82fcf0a066723169f60 100644 (file)
@@ -7,10 +7,7 @@ import javax.measure.unit.SI;
 \r
 import org.jscience.physics.amount.Amount;\r
 \r
-import com.billkuker.rocketry.motorsim.Grain;\r
 import com.billkuker.rocketry.motorsim.Validating;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 public class RodAndTubeGrain extends CompoundGrain implements Validating {\r
        CoredCylindricalGrain rod, tube;\r
@@ -104,13 +101,6 @@ public class RodAndTubeGrain extends CompoundGrain implements Validating {
                tube.setForeEndInhibited(foreEndInhibited);\r
        }\r
 \r
-\r
-       public static void main(String args[]) throws Exception {\r
-               Grain g = DEFAULT_GRAIN;\r
-               new Editor(g).showAsWindow();\r
-               new GrainPanel(g).showAsWindow();\r
-       }\r
-\r
        @Override\r
        public void validate() throws ValidationException {\r
                rod.validate();\r
index 655daa5c9f42ad39d8a4992dfc842c0d06602b93..223e4b2f7c598c331ae5b642ddb21ea4458d21ca 100644 (file)
@@ -14,8 +14,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;\r
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;\r
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 public class Star extends ExtrudedShapeGrain implements Validating {\r
        private Amount<Length> oD = Amount.valueOf(30, SI.MILLIMETER);\r
@@ -102,13 +100,6 @@ public class Star extends ExtrudedShapeGrain implements Validating {
                generateGeometry();\r
        }\r
        \r
-       \r
-       public static void main(String args[]) throws Exception {\r
-               Star e = new Star();\r
-               new Editor(e).showAsWindow();\r
-               new GrainPanel(e).showAsWindow();\r
-       }\r
-       \r
        @Override\r
        public void validate() throws ValidationException{\r
                if ( iD.equals(Amount.ZERO) )\r
index d734334500fc384dcf0ca79987f8b4e692e40035..62fc8b9964b703fe042006625b156c2f7514bded 100644 (file)
@@ -14,8 +14,6 @@ import javax.measure.unit.SI;
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.grain.ExtrudedGrain;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 public abstract class ExtrudedShapeGrain extends ExtrudedGrain {\r
        \r
@@ -140,11 +138,5 @@ public abstract class ExtrudedShapeGrain extends ExtrudedGrain {
                }\r
                return res;\r
        }\r
-       \r
-       public static void main(String args[]) throws Exception {\r
-               ExtrudedShapeGrain e = DEFAULT_GRAIN;\r
-               new Editor(e).showAsWindow();\r
-               new GrainPanel(e).showAsWindow();\r
-       }\r
 \r
 }\r
index 20cd4e4f573399126a01ec98c26c67adcd67f6a9..879499d902a755aa9a98fa18cc43fedfc530da0f 100644 (file)
@@ -17,8 +17,6 @@ import org.apache.log4j.Logger;
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.Grain;\r
-import com.billkuker.rocketry.motorsim.visual.Editor;\r
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;\r
 \r
 public abstract class RotatedShapeGrain implements Grain {\r
        \r
@@ -246,13 +244,5 @@ public abstract class RotatedShapeGrain implements Grain {
                }\r
                return len;\r
        }\r
-\r
-       \r
-\r
-       public static void main(String args[]) throws Exception {\r
-               RotatedShapeGrain e = DEFAULT_GRAIN;\r
-               new Editor(e).showAsWindow();\r
-               new GrainPanel(e).showAsWindow();\r
-       }\r
        \r
 }\r
index d03e699bcf59336708f9f201541e55e688110b58..9450ce5951f33ded5159b918b577934be5e3b89d 100644 (file)
@@ -1,7 +1,5 @@
 package com.billkuker.rocketry.motorsim.io;\r
 \r
-import java.io.File;\r
-import java.io.FileOutputStream;\r
 import java.io.OutputStream;\r
 import java.io.PrintWriter;\r
 import java.lang.reflect.InvocationTargetException;\r
@@ -22,9 +20,7 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Burn;\r
 import com.billkuker.rocketry.motorsim.BurnSummary;\r
 import com.billkuker.rocketry.motorsim.GraphSimplifier;\r
-import com.billkuker.rocketry.motorsim.Motor;\r
 import com.billkuker.rocketry.motorsim.RocketScience;\r
-import com.billkuker.rocketry.motorsim.motors.kuker.PVC9;\r
 \r
 public class HTMLExporter {\r
 \r
@@ -212,35 +208,4 @@ public class HTMLExporter {
                out.close();\r
        }\r
 \r
-       public static void main(String args[]) throws Exception {\r
-\r
-               Motor m = new PVC9();\r
-               Burn b = new Burn(m);\r
-\r
-               File f = new File("test.html");\r
-               export(b, System.out);\r
-               export(b, new FileOutputStream(f));\r
-\r
-               /*\r
-                * \r
-                * EndBurner g = new EndBurner(); g.setLength(Amount.valueOf(70,\r
-                * SI.MILLIMETER)); g.setoD(Amount.valueOf(30, SI.MILLIMETER));\r
-                * g.setPuntDepth(Amount.valueOf(10, SI.MILLIMETER));\r
-                * g.setPuntDiameter(Amount.valueOf(10, SI.MILLIMETER));\r
-                * \r
-                * Chart<Length, Area> c = new Chart<Length, Area>(SI.MILLIMETER,\r
-                * SI.MILLIMETER.pow(2).asType(Area.class), g, "surfaceArea");\r
-                * c.setDomain(c.new IntervalDomain(Amount.valueOf(0, SI.CENTIMETER), g\r
-                * .webThickness()));\r
-                * \r
-                * GraphSimplifier<Length, Area> gs = new GraphSimplifier<Length,\r
-                * Area>(g, "surfaceArea", c.new IntervalDomain(Amount.valueOf(0,\r
-                * SI.CENTIMETER), g.webThickness()).iterator());\r
-                * \r
-                * System.out.print(toChart(SI.MILLIMETER,\r
-                * SI.MILLIMETER.pow(2).asType(Area.class), gs, "value", gs\r
-                * .getDomain().iterator(), "Area"));\r
-                */\r
-       }\r
-\r
 }\r