Changeset 197:93f89e9049be for src/mlx/acft.py

Timestamp:

05/27/12 11:15:19 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Added support for smoothed IAS and VS values

File:

• src/mlx/acft.py (modified) (8 diffs)

src/mlx/acft.py

@@ -12 +12 @@
 import traceback
 
+from collections import deque
+
+#---------------------------------------------------------------------------------------
+
+class SmoothedValue(object):
+    """A smoothed value."""
+    def __init__(self):
+        """Construct the value."""
+        self._deque = deque()
+        self._sum = 0
+
+    def add(self, length, value):
+        """Add the given value and smooth with the given length."""
+        dequeLength = len(self._deque)
+        while dequeLength>=length:
+            self._sum -= self._deque.popleft()
+            dequeLength -= 1
+
+        self._sum += value
+        self._deque.append(value)
+
+    def get(self):
+        """Get the average."""
+        return self._sum / len(self._deque)
+        
 #---------------------------------------------------------------------------------------
 
@@ -36 +61 @@
         self._checkers = []
 
+        config = flight.config
         # Loggers
 
@@ -58 +84 @@
         self._checkers.append(checks.SpoilerLogger())
 
-        if flight.config.isMessageTypeFS(const.MESSAGETYPE_VISIBILITY):
+        if config.isMessageTypeFS(const.MESSAGETYPE_VISIBILITY):
             self._checkers.append(checks.VisibilityChecker())
 
@@ -66 +92 @@
         # queried from it, so the model should have a reference to the GUI as
         # well and access such data via the GUI!
-        if flight.config.onlineACARS and not flight.entranceExam:
+        if config.onlineACARS and not flight.entranceExam:
             self._checkers.append(checks.ACARSSender(flight._gui))
 
@@ -93 +119 @@
         self._checkers.append(checks.SpeedChecker())
         self._checkers.append(checks.VSChecker())
-        self._checkers.append(checks.OverspeedChecker())
+
+        timeout = 5.0 + config.realIASSmoothingLength - 1
+        self._checkers.append(checks.OverspeedChecker(timeout = timeout))
+                              
         self._checkers.append(checks.StallChecker())
 
@@ -99 +128 @@
         
         self._checkers.append(checks.ReverserChecker())
+
+        self._smoothedIAS = SmoothedValue()
+        self._smoothedVS = SmoothedValue()
 
     @property
@@ -132 +164 @@
 
     def handleState(self, aircraftState):
-        """Called when the state of the aircraft changes."""
+        """Called when the state of the aircraft changes.
+
+        This is the function that the simulator calls directly with the new
+        state."""
+        config = self._flight.config
+
+        self._smoothedIAS.add(config.realIASSmoothingLength, aircraftState.ias)
+        aircraftState.smoothedIAS = self._smoothedIAS.get()
+
+        print "handleState, realVSSmoothingLength:", config.realVSSmoothingLength
+        self._smoothedVS.add(config.realVSSmoothingLength, aircraftState.vs)
+        aircraftState.smoothedVS = self._smoothedVS.get()
+        
         for checker in self._checkers:
             try:
@@ -753 +797 @@
 
 #---------------------------------------------------------------------------------------
+
+if __name__ == "__main__":
+    value = SmoothedValue()
+
+    print "Adding 1, 12.0"
+    value.add(1, 12.0)
+    print value.get()
+
+    print "Adding 1, 15.0"
+    value.add(1, 15.0)
+    print value.get()
+
+    print "Adding 2, 18.0"
+    value.add(2, 18.0)
+    print value.get()
+
+    print "Adding 2, 20.0"
+    value.add(2, 20.0)
+    print value.get()
+
+    print "Adding 5, 22.0"
+    value.add(5, 22.0)
+    print value.get()
+
+    print "Adding 5, 25.0"
+    value.add(5, 25.0)
+    print value.get()
+
+    print "Adding 5, 29.0"
+    value.add(5, 29.0)
+    print value.get()
+
+    print "Adding 5, 21.0"
+    value.add(5, 21.0)
+    print value.get()
+
+    print "Adding 5, 26.0"
+    value.add(5, 26.0)
+    print value.get()
+
+    print "Adding 2, 30.0"
+    value.add(2, 30.0)
+    print value.get()
+
+    print "Adding 2, 55.0"
+    value.add(2, 55.0)
+    print value.get()
+
+#---------------------------------------------------------------------------------------