X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Faerodynamics%2FFlightConditions.java;h=45b9d20f4a213ce861b8d9ed273cbd13ec41ec94;hb=8320c04afa30e2aa0150adc870d02abeedb01066;hp=64e814559f58c812801107c11b8c7ee4419c30dc;hpb=6460090e9ec07b12234369583032d02d7c5ed3b1;p=debian%2Fopenrocket

diff --git a/src/net/sf/openrocket/aerodynamics/FlightConditions.java b/src/net/sf/openrocket/aerodynamics/FlightConditions.java
index 64e81455..45b9d20f 100644
--- a/src/net/sf/openrocket/aerodynamics/FlightConditions.java
+++ b/src/net/sf/openrocket/aerodynamics/FlightConditions.java
@@ -57,7 +57,7 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable {
 	 * Sqrt(1 - M^2)  for M<1
 	 * Sqrt(M^2 - 1)  for M>1
 	 */
-	private double beta = Math.sqrt(1 - mach * mach);
+	private double beta = MathUtil.safeSqrt(1 - mach * mach);
 	
 
 	/** Current roll rate. */
@@ -122,7 +122,7 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable {
 	 */
 	public void setRefArea(double area) {
 		refArea = area;
-		refLength = Math.sqrt(area / Math.PI) * 2;
+		refLength = MathUtil.safeSqrt(area / Math.PI) * 2;
 		fireChangeEvent();
 	}
 	
@@ -237,9 +237,9 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable {
 		
 		this.mach = mach;
 		if (mach < 1)
-			this.beta = Math.sqrt(1 - mach * mach);
+			this.beta = MathUtil.safeSqrt(1 - mach * mach);
 		else
-			this.beta = Math.sqrt(mach * mach - 1);
+			this.beta = MathUtil.safeSqrt(mach * mach - 1);
 		fireChangeEvent();
 	}
 	
@@ -378,6 +378,7 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable {
 	 * 
 	 * @return	the number of times this object has been modified since instantiation.
 	 */
+	@Override
 	public int getModID() {
 		return modID + modIDadd + this.atmosphericConditions.getModID();
 	}