Changeset 140:7f24ede5d214 for src/mlx/acft.py

Timestamp:

05/01/12 09:14:13 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Reworked fuel tank handling to be more indirect

File:

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

src/mlx/acft.py

@@ -328 +328 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: centre, left, right
+    - fuel: left, centre, right
     - n1: left, right
     - reverser: left, right"""
+    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_CENTRE, const.FUELTANK_RIGHT]    
+    
     def __init__(self, flight):
         super(Boeing737, self).__init__(flight)
@@ -435 +437 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: centre, left, right
+    - fuel: left, right
     - n1: left, right
     - reverser: left, right."""
+    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_RIGHT]    
+
     def __init__(self, flight):
         super(DH8D, self).__init__(flight)
@@ -466 +470 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: centre, left, right
+    - fuel: left, centre, right
     - n1: left, right
     - reverser: left, right"""
+    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_CENTRE, const.FUELTANK_RIGHT]    
+
     def __init__(self, flight):
         super(Boeing767, self).__init__(flight)
@@ -518 +524 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: centre, left, right
+    - fuel: left, centre, right
     - n1: left, right
     - reverser: left, right."""
+    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_CENTRE, const.FUELTANK_RIGHT]    
+
     def __init__(self, flight):
         super(CRJ2, self).__init__(flight)
@@ -550 +558 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: centre, left, right
+    - fuel: left, centre, right
     - n1: left, right
     - reverser: left, right."""
+    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_CENTRE, const.FUELTANK_RIGHT]    
+
     def __init__(self, flight):
         super(F70, self).__init__(flight)
@@ -583 +593 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: left, right, left aux, right aux
+    - fuel: left aux, left, right, right aux
     - rpm: left, right
     - reverser: left, right."""
+    fuelTanks = [const.FUELTANK_LEFT_AUX, const.FUELTANK_LEFT,
+                 const.FUELTANK_RIGHT, const.FUELTANK_RIGHT_AUX]
+
     def __init__(self, flight):
         super(DC3, self).__init__(flight)
@@ -621 +634 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: centre, left tip, left aux, right tip, right aux, external 1,
+    - fuel: left tip, left aux, centre, right aux, right tip, external 1,
     external 2
     - n1: left, right
     - reverser: left, right."""
+    fuelTanks = [const.FUELTANK_LEFT_TIP, const.FUELTANK_LEFT_AUX,
+                 const.FUELTANK_CENTRE,
+                 const.FUELTANK_RIGHT_AUX, const.FUELTANK_RIGHT_TIP,
+                 const.FUELTANK_EXTERNAL1, const.FUELTANK_EXTERNAL2]
+
     def __init__(self, flight):
         super(T134, self).__init__(flight)
@@ -655 +673 @@
     The aircraft type-specific values in the aircraft state have the following
     structure:
-    - fuel: centre, left, right, centre 2, left aux, right aux
+    - fuel: left aux, left, centre, centre 2, right, right aux
     - n1: left, centre, right
     - reverser: left, right"""
+    fuelTanks = [const.FUELTANK_LEFT_AUX, const.FUELTANK_LEFT,
+                 const.FUELTANK_CENTRE, const.FUELTANK_CENTRE2,
+                 const.FUELTANK_RIGHT, const.FUELTANK_RIGHT_AUX]
     def __init__(self, flight):
         super(T154, self).__init__(flight)
@@ -691 +712 @@
     - n1: left, right
     - reverser: left, right"""
+    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_RIGHT]
+    
     def __init__(self, flight):
         super(YK40, self).__init__(flight)