hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up imports.

Browse Source
This commit is contained in:
kruland2607 2013-03-13 16:22:40 -05:00
parent db286c3293
commit faf5f12d27
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/net/sf/openrocket/simulation/BasicTumbleStatus.java
View File

@ -2,9 +2,6 @@ package net.sf.openrocket.simulation;
import java.util.Iterator;
import net.sf.openrocket.aerodynamics.AerodynamicForces;
import net.sf.openrocket.aerodynamics.FlightConditions;
import net.sf.openrocket.aerodynamics.WarningSet;
import net.sf.openrocket.motor.MotorInstanceConfiguration;
import net.sf.openrocket.rocketcomponent.Configuration;
import net.sf.openrocket.rocketcomponent.FinSet;
@ -32,12 +29,12 @@ public class BasicTumbleStatus extends SimulationStatus {
public BasicTumbleStatus(SimulationStatus orig) {
super(orig);
if ( orig instanceof BasicTumbleStatus ) {
if (orig instanceof BasicTumbleStatus) {
this.drag = ((BasicTumbleStatus) orig).drag;
}
}
public double getTumbleDrag( ) {
public double getTumbleDrag() {
return drag;
}
@ -51,27 +48,27 @@ public class BasicTumbleStatus extends SimulationStatus {
double aBt = 0.0;
Rocket r = this.getConfiguration().getRocket();
Iterator<RocketComponent> componentIterator = r.iterator();
while ( componentIterator.hasNext() ) {
while (componentIterator.hasNext()) {
RocketComponent component = componentIterator.next();
if ( ! component.isAerodynamic() ) {
if (!component.isAerodynamic()) {
continue;
}
if ( component instanceof FinSet ) {
if (component instanceof FinSet) {
double finComponent = ((FinSet)component).getFinArea();
int finCount = ((FinSet)component).getFinCount();
double finComponent = ((FinSet) component).getFinArea();
int finCount = ((FinSet) component).getFinCount();
// check bounds on finCount.
if ( finCount >= finEff.length ) {
finCount = finEff.length-1;
if (finCount >= finEff.length) {
finCount = finEff.length - 1;
}
aFins += finComponent * finEff[finCount];
} else if (component instanceof SymmetricComponent ){
aBt += ((SymmetricComponent) component) .getComponentPlanformArea();
} else if (component instanceof SymmetricComponent) {
aBt += ((SymmetricComponent) component).getComponentPlanformArea();
}
}
drag = ( cDFin * aFins + cDBt * aBt );
drag = (cDFin * aFins + cDBt * aBt);
}
}