Changeset 13:7cdc145ceef9 for src/checks.py

Timestamp:

02/11/12 19:53:12 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed some types and small problems

File:

• src/checks.py (modified) (15 diffs)

src/checks.py

@@ -122 +122 @@
         """Construct the logger."""
         self._logged = False
-        self._spoilerExtension = None
+        self._spoilersExtension = None
     
     def check(self, flight, aircraft, logger, oldState, state):
@@ -128 +128 @@
         if flight.stage==const.STAGE_LANDING and not self._logged:
             if state.onTheGround:
-                if state.spoilerExtension!=self._spoilerExtension:
+                if state.spoilersExtension!=self._spoilersExtension:
                     logger.message(state.timestamp, "Spoilers deployed")
                     self._logged = True
             else:
-                self._spoilerExtension = state.spoilerExtension
+                self._spoilersExtension = state.spoilersExtension
 
 #---------------------------------------------------------------------------------------
@@ -456 +456 @@
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
-        logger.fault(AntiCollisionLightChecker, state.timestamp,
+        logger.fault(AntiCollisionLightsChecker, state.timestamp,
                      FaultChecker._appendDuring(flight, "Anti-collision lights were off"),
                      1)
@@ -486 +486 @@
 class FlapsRetractChecker(SimpleFaultChecker):
     """Check if the flaps are not retracted too early."""
+    def __init__(self):
+        """Construct the flaps checker."""
+        self._timeStart = None
+    
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds.
@@ -497 +501 @@
             if state.flapsSet==0 and state.timestamp<=(self._timeStart+2.0):
                 return True
+        else:
+            self._timeStart = None
         return False
 
@@ -542 +548 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return state.gearsDown and state.ias>gearSpeedLimit
+        return state.gearsDown and state.ias>aircraft.gearSpeedLimit
 
     def logFault(self, flight, aircraft, logger, oldState, state):
@@ -616 +622 @@
             if flight.options.compensation is not None:
                 limit += flight.options.compensation
-            return state.grossWeight>mlw
+            return self.getWeight(state)>limit
 
         return False
@@ -622 +628 @@
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
+        mname = "M" + self._name
         logger.noGo(self.__class__, state.timestamp,
-                    "%s exceeded: %.0f kg" % (self._name, state.grossWeight),
-                    "%s NO GO" % (self._name,))
+                    "%s exceeded: %s is %.0f kg" % \
+                    (mname, self._name, self.getWeight(state)),
+                    "%s NO GO" % (mname,))
+
+    def getWeight(self, state):
+        """Get the weight that is interesting for us."""
+        return state.grossWeight
 
 #---------------------------------------------------------------------------------------
@@ -632 +644 @@
     def __init__(self):
         """Construct the checker."""
-        super(MLWChecker, self).__init__("MLW")
-
-    def getLimit(flight, aircraft, state):
+        super(MLWChecker, self).__init__("LW")
+
+    def getLimit(self, flight, aircraft, state):
         """Get the limit if we are in the right state."""
         return aircraft.mlw if flight.stage==const.STAGE_LANDING and \
@@ -645 +657 @@
     def __init__(self):
         """Construct the checker."""
-        super(MTOWChecker, self).__init__("MTOW")
-
-    def getLimit(flight, aircraft, state):
+        super(MTOWChecker, self).__init__("TOW")
+
+    def getLimit(self, flight, aircraft, state):
         """Get the limit if we are in the right state."""
         return aircraft.mtow if flight.stage==const.STAGE_TAKEOFF else None
@@ -657 +669 @@
     def __init__(self):
         """Construct the checker."""
-        super(MZFWChecker, self).__init__("MZFW")
-
-    def getLimit(flight, aircraft, state):
+        super(MZFWChecker, self).__init__("ZFW")
+
+    def getLimit(self, flight, aircraft, state):
         """Get the limit if we are in the right state."""
         return aircraft.mzfw
+
+    def getWeight(self, state):
+        """Get the weight that is interesting for us."""
+        return state.zfw
 
 #---------------------------------------------------------------------------------------
@@ -725 +741 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return state.groundSpeed>80 and not current.pitotHeatOn
+        return state.groundSpeed>80 and not state.pitotHeatOn
                
     def logFault(self, flight, aircraft, logger, oldState, state):
@@ -765 +781 @@
         """Log the fault."""
         logger.fault(SpeedChecker, state.timestamp,
-                     FaultChecker._appendDuring(flight, "Reverser used below 60 knots"),
+                     FaultChecker._appendDuring(flight, "Taxi speed over 50 knots"),
                      FaultChecker._getLinearScore(50, 80, 10, 15, state.groundSpeed))
 
@@ -821 +837 @@
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
+        print state.n1
         logger.fault(LandingLightsChecker, state.timestamp,
                      FaultChecker._appendDuring(flight, "Thrust setting was too high (>97%)"),
@@ -841 +858 @@
         return vs < -8000 or vs > 8000 or \
                (altitude<500 and vs < (VSChecker.BELOW500 *
-                                       VSCHECKER.TOLERANCE)) or \
+                                       VSChecker.TOLERANCE)) or \
                (altitude<2500 and vs < (VSChecker.BELOW2500 *
-                                        VSCHECKER.TOLERANCE)) or \
+                                        VSChecker.TOLERANCE)) or \
                (altitude<5000 and vs < (VSChecker.BELOW5000 *
-                                        VSCHECKER.TOLERANCE)) or \
+                                        VSChecker.TOLERANCE)) or \
                (altitude<10000 and vs < (VSChecker.BELOW10000 *
-                                         VSCHECKER.TOLERANCE))
+                                         VSChecker.TOLERANCE))
                
     def logFault(self, flight, aircraft, logger, oldState, state):