Arrival features

.gitignore

@@ -117,3 +117,11 @@ states.json
 log
 .todo
 *.swp
+data/*/build
+
+### JetBrains template
+.idea
+
+### Output
+output
+batch_output

.travis.yml

@@ -5,5 +5,10 @@ python:
   - "3.6"
 install:
   - pip install -r requirements.txt
+before_script:
+  - cd data/simple
+  - python generate.py
+  - python generate_scenario.py
+  - cd ../..
 script:
   - travis_wait python -m unittest discover tests

README.md

@@ -1,74 +1,90 @@
 # ASSET2 - Airport Surface Simulator and Evaluation Tool 2
 
-[![Build Status](https://travis-ci.org/heronyang/airport-simulation.svg?branch=master)](https://travis-ci.org/heronyang/airport-simulation)
+[![Build Status](https://travis-ci.com/nasa-airport/airport-simulation.svg?branch=master)](https://travis-ci.com/nasa-airport/airport-simulation)
+
+![demo](https://user-images.githubusercontent.com/7262715/45591580-ef937f80-b90b-11e8-9c15-a596be0bd283.gif)
 
-![Demo](doc/independent-study/figure/demo.gif)
 
 ## About
 
-ASSET2 is a generic airport simulation tool for research purpose. It is designed to support multiple airports, to test and to evaulate customized schedulers. Please check out [our paper](https://github.com/heronyang/airport-simulation/raw/master/doc/analaysing-effect-uncertainty.pdf) for more information.
+ASSET2 is a generic airport simulation tool for research purpose. It is designed to support multiple airports, to test and to evaluate customized schedulers. Please check out [our paper](https://drive.google.com/file/d/0B8ck8iyI0dnfSEtUSDl3SjBiYXgwdXpOWERvaWMzZ1NtV3A0/view?usp=sharing) for more information.
 
 > This tool is built for Carnegie Mellon University MSIT Practicum Project and Master Independent Study sponsored by the NASA Ames Research Center.
 
-## Prepare airport data
-
-Place airport related data under `data` folder like `data/sfo-terminal-2/build/` (use IATA airport code).
 
-## Install
+## How to Run
 
-If you're on Ubuntu:
+> **Please note that the code runs in Python 3.** 
+>
+> **Please avoid Python>=3.7.0** because it breaks the legacy Cython, which one of the dependencies line-profiler depends on. The issue has not been [fixed](https://github.com/rkern/line_profiler/issues) at the moment. Try to install a lower version instead.
 
-    $ sudo apt-get update
-    $ sudo apt-get install -y python3-pip
-    $ mkdir -p ~/.config/matplotlib/
-    $ echo "backend : Agg" >> ~/.config/matplotlib/matplotlibrc
+### Prepare Airport Data
 
-Install dependencies:
+Place airport related data under `data` folder like `data/sfo-terminal-2/build/` (use IATA airport code).
 
-    $ pip3 install -r requirements.txt
+### First-Time Installation
+**If you're on Ubuntu:**
 
-## Run
+```sh
+$ sudo apt-get update
+$ sudo apt-get install -y python3-pip
+$ mkdir -p ~/.config/matplotlib/
+$ echo "backend : Agg" >> ~/.config/matplotlib/matplotlibrc
+```
 
-    $ python3 simulator.py -f plans/base.yaml
+**Set-up Virtual Environment (highly recommended):**
 
-### Batch Run
+ - If you are using IntelliJ or any other JetBrain IDE, see [this link](https://www.jetbrains.com/help/idea/creating-virtual-environment.html) (recommended).
 
-    $ python3 simulator.py -f batch_plans/simple-uc.yaml
+ - If you are using commend line:
+
+    ```sh
+    $ {path/to/python3} -m venv venv # create a new virtual environment
+    $ source venv/bin/activate # activate the virtual environment
+    $ pip install -r requirements.txt # install dependencies locally
+    $ python simulator.py -f plans/base.yaml # execute the simulation
+    ```
 
-### Execution under Virtual Environtment
+**Install dependencies:**
 
-If you don't want to install the dependencies for the whole system, you may
-want to use the virtual environment where we install dependencies under this
-project folder.
+```sh
+$ pip install -r requirements.txt
+```
 
-    $ python3 -m venv env # create a new virtual environment
-    $ source env/bin/activate # activate the virtual environment
-    $ python3 -m pip -r install requirements.txt # install dependencies locally
-    $ python3 simulator.py -f plans/base.yaml # execute the simulation
+### Run
+```sh
+$ python simulator.py -f plans/base.yaml
+$ python simulator.py -f batch_plans/simple-uc.yaml # Batch Run
+```
 
-## Tests
+### Visualization
+```sh
+$ python visualization/server.py
+```
 
-    $ python3 -m unittest discover tests    # all tests
-    $ python3 -m unittest tests/test_scheduler.py   # single test
+### Tests
+```sh
+$ python -m unittest discover tests    # all tests
+$ python -m unittest tests/test_scheduler.py   # single test
+```
 
 ### Check Style
+```sh
+$ pycodestyle --show-pep8 --show-source --exclude=venv .
+$ ls -1 *py scheduler/*py | xargs pylint # optional but recommended
+```
 
-    $ pycodestyle --show-pep8 --show-source .
-    $ ls -1 *py scheduler/*py | xargs pylint # optional but recommended
-
-## Visiualization
-
-    $ python3 visualization/server.py
-
-## Documentation
-
-    $ pydoc <python-file-name-without-.py>
+### Documentation
+```sh
+$ pydoc <python-file-name-without-.py>
+```
 
 ## Developer Guidelines
 
 ### Sequential Diagram
 
-![sequential diagram](doc/independent-study/figure/flow.png)
+![image](https://user-images.githubusercontent.com/7262715/45591601-63358c80-b90c-11e8-809c-54c3446258fa.png)
+
 
 ### Experiment Flow
 

airport.py

@@ -98,8 +98,7 @@ def __add_aircrafts_from_scenario(self, scenario, now, sim_time):
         for flight in scenario.departures:
 
             # Only if the scheduled appear time is between now and next tick
-            if not (now <= flight.appear_time and
-                    flight.appear_time < next_tick_time):
+            if not (now <= flight.appear_time < next_tick_time):
                 continue
 
             gate, aircraft = flight.from_gate, flight.aircraft
@@ -117,6 +116,11 @@ def __add_aircrafts_from_scenario(self, scenario, now, sim_time):
                 self.add_aircraft(aircraft)
                 self.logger.info("Adds %s into the airport", flight)
 
+        # # Deal with the arrival flights
+        # for flight in scenario.arrivals:
+        #     if not (now <= flight.appear_time < next_tick_time):
+        #          continue
+
     def remove_aircrafts(self, scenario):
         """Removes departure aircrafts if they've moved to the runway.
         """