Changeset 1151:2ef1ab0b28cb


Ignore:
Timestamp:
04/24/24 18:26:56 (2 weeks ago)
Author:
István Váradi <ivaradi@…>
Branch:
python3
hg-Phase:
(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')
Message:

Gate information is updated to reflect the current situation (re #386).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/mlx/gates.py

    r1105 r1151  
    133133#--------------------------------------------------------------------------------------
    134134
    135 def getAvilableIf(othersAvailable = []):
     135def getAvailableIf(othersAvailable = []):
    136136    """Get a function that determines if a gate is available based on the
    137137    statuses of other gates."""
    … …  
    145145lhbpGates = Gates()
    146146
    147 lhbpGates.add(Gate("1", "1", "S"))
    148 lhbpGates.add(Gate("2", "1", "S"))
    149 lhbpGates.add(Gate("3", "1", "S"))
    150 lhbpGates.add(Gate("4", "1", "S"))
    151 lhbpGates.add(Gate("5", "1", "S"))
    152 lhbpGates.add(Gate("6", "1", "S"))
    153 lhbpGates.add(Gate("25", "1", "S"))
    154 lhbpGates.add(Gate("26", "1", "S"))
    155 lhbpGates.add(Gate("27", "1", "S"))
    156 lhbpGates.addSpace()
     147lhbpGates.add(Gate("R101", "1", "S"))
     148lhbpGates.add(Gate("R102", "1", "S"))
     149lhbpGates.add(Gate("R103", "1", "S"))
     150lhbpGates.add(Gate("R104", "1", "S",
     151                   availableFn = getAvailableIf(othersAvailable = ["R105"])))
     152lhbpGates.add(Gate("R105", "1", "S",
     153                   availableFn = getAvailableIf(othersAvailable = ["R104", "R106"])))
     154lhbpGates.add(Gate("R106", "1", "S",
     155                   availableFn = getAvailableIf(othersAvailable = ["R105", "R108"])))
     156lhbpGates.add(Gate("R107", "1", "S",
     157                   availableFn = getAvailableIf(othersAvailable = ["R108"])))
     158lhbpGates.add(Gate("R108", "1", "S",
     159                   availableFn = getAvailableIf(othersAvailable = ["R106", "R107"])))
     160
     161lhbpGates.addSpace()
     162lhbpGates.add(Gate("R110", "1", "S",
     163                   availableFn = getAvailableIf(othersAvailable = ["R111"])))
     164lhbpGates.add(Gate("R111", "1", "S",
     165                   availableFn = getAvailableIf(othersAvailable = ["R110", "R112"])))
     166lhbpGates.add(Gate("R112", "1", "S",
     167                   availableFn = getAvailableIf(othersAvailable = ["R111"])))
     168lhbpGates.add(Gate("R113", "1", "S",
     169                   availableFn = getAvailableIf(othersAvailable = ["R112", "R114"])))
     170lhbpGates.add(Gate("R114", "1", "S",
     171                   availableFn = getAvailableIf(othersAvailable = ["R113"])))
     172lhbpGates.add(Gate("R115", "1", "S"))
     173lhbpGates.add(Gate("R116", "1", "S",
     174                   availableFn = getAvailableIf(othersAvailable = ["R117"])))
     175lhbpGates.add(Gate("R117", "1", "S",
     176                   availableFn = getAvailableIf(othersAvailable = ["R116", "R117A"])))
     177lhbpGates.add(Gate("R117A", "1", "S",
     178                   availableFn = getAvailableIf(othersAvailable = ["R116", "R117"])))
     179lhbpGates.addNewColumn()
     180
     181lhbpGates.add(Gate("G150", "1", "S"))
     182lhbpGates.add(Gate("G151", "1", "S"))
     183lhbpGates.add(Gate("G152", "1", "S"))
     184lhbpGates.add(Gate("G153", "1", "S"))
     185lhbpGates.add(Gate("G154", "1", "S"))
     186lhbpGates.add(Gate("G155", "1", "S"))
     187
     188lhbpGates.addSpace()
     189lhbpGates.add(Gate("G170", "1", "S"))
     190lhbpGates.add(Gate("G171", "1", "S"))
     191lhbpGates.add(Gate("G172", "1", "S"))
     192lhbpGates.addNewColumn()
    157193
    158194lhbpGates.add(Gate("31", "2B", "G"))
    159195lhbpGates.add(Gate("32", "2B", "G"))
    160196lhbpGates.add(Gate("33", "2B", "G"))
    161 lhbpGates.addNewColumn()
    162 
    163 lhbpGates.add(Gate("34", "2B", "G"))
    164 lhbpGates.add(Gate("35", "2B", "G"))
    165 lhbpGates.add(Gate("36", "2B", "G"))
     197lhbpGates.add(Gate("34", "2B", "G",
     198                   availableFn = getAvailableIf(othersAvailable = ["34L", "34R"])))
     199lhbpGates.add(Gate("34L", "2B", "G",
     200                   availableFn = getAvailableIf(othersAvailable = ["34", "34R"])))
     201lhbpGates.add(Gate("34R", "2B", "G",
     202                   availableFn = getAvailableIf(othersAvailable = ["34L", "34"])))
     203lhbpGates.add(Gate("35", "2B", "G",
     204                   availableFn = getAvailableIf(othersAvailable = ["35L", "35R"])))
     205lhbpGates.add(Gate("35L", "2B", "G",
     206                   availableFn = getAvailableIf(othersAvailable = ["35", "35R"])))
     207lhbpGates.add(Gate("35R", "2B", "G",
     208                   availableFn = getAvailableIf(othersAvailable = ["35L", "35"])))
     209lhbpGates.add(Gate("36", "2B", "G",
     210                   availableFn = getAvailableIf(othersAvailable = ["36L", "36R"])))
     211lhbpGates.add(Gate("36L", "2B", "G",
     212                   availableFn = getAvailableIf(othersAvailable = ["36", "36R"])))
     213lhbpGates.add(Gate("36R", "2B", "G",
     214                   availableFn = getAvailableIf(othersAvailable = ["36L", "36"])))
     215lhbpGates.addSpace()
     216
    166217lhbpGates.add(Gate("37", "2B", "G"))
    167218lhbpGates.add(Gate("38", "2B", "G"))
    168 lhbpGates.add(Gate("39", "2B", "G"))
    169 lhbpGates.addSpace()
     219lhbpGates.add(Gate("39", "2B", "G",
     220                   availableFn = getAvailableIf(othersAvailable = ["37L", "37R"])))
     221lhbpGates.add(Gate("39L", "2B", "G",
     222                   availableFn = getAvailableIf(othersAvailable = ["37", "37R"])))
     223lhbpGates.add(Gate("39R", "2B", "G",
     224                   availableFn = getAvailableIf(othersAvailable = ["37L", "37"])))
     225lhbpGates.addNewColumn()
    170226
    171227lhbpGates.add(Gate("42", "2A", "G"))
    … …  
    173229lhbpGates.add(Gate("44", "2A", "G"))
    174230lhbpGates.add(Gate("45", "2A", "G"))
    175 lhbpGates.addNewColumn()
    176 
    177 lhbpGates.add(Gate("107", "1", "S"))
    178 lhbpGates.add(Gate("108", "1", "S"))
    179 lhbpGates.add(Gate("109", "1", "S"))
    180 lhbpGates.add(Gate("R110", "1", "S",
    181                    availableFn = getAvilableIf(othersAvailable = ["R111"])))
    182 lhbpGates.add(Gate("R111", "1", "S",
    183                    availableFn = getAvilableIf(othersAvailable = ["R110", "R112"])))
    184 lhbpGates.add(Gate("R112", "1", "S",
    185                    availableFn = getAvilableIf(othersAvailable = ["R111"])))
    186 lhbpGates.add(Gate("R113", "1", "S",
    187                    availableFn = getAvilableIf(othersAvailable = ["R114"])))
    188 lhbpGates.add(Gate("R114", "1", "S",
    189                    availableFn = getAvilableIf(othersAvailable = ["R113"])))
    190 lhbpGates.add(Gate("R115", "1", "S"))
    191 lhbpGates.add(Gate("R116", "1", "S"))
    192 lhbpGates.add(Gate("R117", "1", "S"))
    193 lhbpGates.addNewColumn()
     231lhbpGates.addSpace()
    194232
    195233lhbpGates.add(Gate("R210", "2A", "S",
    196                    availableFn = getAvilableIf(othersAvailable = ["R212A"]),
     234                   availableFn = getAvailableIf(othersAvailable = ["R212A"]),
    197235                   taxiThrough = True))
    198236lhbpGates.add(Gate("R211", "2A", "S",
    199                    availableFn = getAvilableIf(othersAvailable = ["R212A"]),
     237                   availableFn = getAvailableIf(othersAvailable = ["R212A"]),
    200238                   taxiThrough = True))
    201239lhbpGates.add(Gate("R212", "2A", "S",
    202                    availableFn = getAvilableIf(othersAvailable = ["R212A"]),
     240                   availableFn = getAvailableIf(othersAvailable = ["R212A"]),
    203241                   taxiThrough = True))
    204242lhbpGates.add(Gate("R212A", "2A", "S",
    205                    availableFn = getAvilableIf(othersAvailable = ["R210", "R211", "R212"]),
     243                   availableFn = getAvailableIf(othersAvailable = ["R210", "R211", "R212"]),
    206244                   taxiThrough = True))
    207245lhbpGates.addSpace()
    … …  
    213251lhbpGates.addSpace()
    214252
    215 lhbpGates.add(Gate("R224", "2A", "R"))
     253lhbpGates.add(Gate("R224", "2A", "S"))
    216254lhbpGates.add(Gate("R225", "2A", "S"))
    217255lhbpGates.add(Gate("R226", "2A", "S"))
    … …  
    222260lhbpGates.add(Gate("R271", "2A", "S"))
    223261lhbpGates.add(Gate("R272", "2A", "S"))
     262lhbpGates.add(Gate("R273", "2A", "S"))
    224263lhbpGates.add(Gate("R274", "2A", "S"))
    225264lhbpGates.add(Gate("R275", "2A", "S"))
    … …  
    227266lhbpGates.add(Gate("R277", "2A", "S"))
    228267lhbpGates.add(Gate("R278", "2A", "S",
    229                    availableFn = getAvilableIf(othersAvailable = ["R278A"]),
     268                   availableFn = getAvailableIf(othersAvailable = ["R278A"]),
    230269                   taxiThrough = True))
    231270lhbpGates.add(Gate("R278A", "2A", "S",
    232                    availableFn = getAvilableIf(othersAvailable = ["R278", "R279"]),
     271                   availableFn = getAvailableIf(othersAvailable = ["R278", "R279"]),
    233272                   taxiThrough = True))
    234273lhbpGates.add(Gate("R279", "2A", "S",
    235                    availableFn = getAvilableIf(othersAvailable = ["R278A"]),
    236                    taxiThrough = True))
     274                   availableFn = getAvailableIf(othersAvailable = ["R278A"]),
     275                   taxiThrough = True))
Note: See TracChangeset for help on using the changeset viewer.