[Csp-commits] svn:csp r1105 - trunk/CSP/CSPSim/Include

[<sv...@ww...>]

Author: delta
Date: 2004-06-29 03:42:45 -0700 (Tue, 29 Jun 2004)
New Revision: 1105

Modified:
   trunk/CSP/CSPSim/Include/FlightModel.h
Log:
min/max workaround.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1105

Modified: trunk/CSP/CSPSim/Include/FlightModel.h
===================================================================
--- trunk/CSP/CSPSim/Include/FlightModel.h	2004-06-29 10:41:44 UTC (rev 1104)
+++ trunk/CSP/CSPSim/Include/FlightModel.h	2004-06-29 10:42:45 UTC (rev 1105)
@@ -96,11 +96,11 @@
 	                         double airspeed,
 	                         double qBar) {
 		// prevent driving the model outside its range of validity
-		m_Alpha = std::max(-0.8, std::min(0.8, alpha));
+		m_Alpha = simdata::clampTo(alpha,-0.8, 0.8);
 		m_AlphaDot = alphaDot;
 		m_Beta = beta;
 		m_qBarS = m_HalfWingArea * qBar * airspeed * airspeed;
-		m_Inv2V = 0.5 / std::max(0.5, airspeed);
+		m_Inv2V = 0.5 / std::max<double>(0.5, airspeed);
 	}
 
 	inline void setControlSurfaces(double aileron,