diff --git a/README.md b/README.md index aa28079..1d5fdaa 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ See a live instance at [http://3lips.30hours.dev](http://3lips.30hours.dev). - Install docker and docker-compose on the host machine. - Clone this repository to some directory. -- Edit the [./config/config.yml](./config./config.yml) file for scenario. +- Edit the [./config/config.yml](config./config.yml) file for scenario. - Run the docker compose command. ```bash diff --git a/event/algorithm/localisation/EllipseParametric.py b/event/algorithm/localisation/EllipseParametric.py index fa5a49f..ff1ef29 100644 --- a/event/algorithm/localisation/EllipseParametric.py +++ b/event/algorithm/localisation/EllipseParametric.py @@ -3,13 +3,12 @@ @author 30hours """ -from data.Ellipsoid import Ellipsoid -from algorithm.geometry.Geometry import Geometry -import numpy as np import math +import numpy as np import itertools -from concurrent.futures import ThreadPoolExecutor +from data.Ellipsoid import Ellipsoid +from algorithm.geometry.Geometry import Geometry class EllipseParametric: diff --git a/event/algorithm/localisation/EllipsoidParametric.py b/event/algorithm/localisation/EllipsoidParametric.py index 3235c7a..07020b1 100644 --- a/event/algorithm/localisation/EllipsoidParametric.py +++ b/event/algorithm/localisation/EllipsoidParametric.py @@ -3,10 +3,11 @@ @author 30hours """ +import math +import numpy as np + from data.Ellipsoid import Ellipsoid from algorithm.geometry.Geometry import Geometry -import numpy as np -import math class EllipsoidParametric: diff --git a/event/algorithm/localisation/SphericalIntersection.py b/event/algorithm/localisation/SphericalIntersection.py index d38ecc7..96e381a 100644 --- a/event/algorithm/localisation/SphericalIntersection.py +++ b/event/algorithm/localisation/SphericalIntersection.py @@ -3,9 +3,10 @@ @author 30hours """ -from algorithm.geometry.Geometry import Geometry -import numpy as np import math +import numpy as np + +from algorithm.geometry.Geometry import Geometry class SphericalIntersection: diff --git a/script/README.md b/script/README.md index f843783..bc6d949 100644 --- a/script/README.md +++ b/script/README.md @@ -2,7 +2,15 @@ This folder is for post-processing scripts on API data. ## Scripts -- **plot_accuracy.py** plots a comparison between ADS-B truth and target localisation data in ENU coordinates. +- **plot_accuracy.py** plots a comparison between ADS-B truth and target localisation data in ENU coordinates. Also generates RMS error values for the data. + ``` + python plot_associate.py (--start_time ) (--stop_time ) + ``` + +- **plot_associate.py** plots when each radar detected a particular target in a 2D heatmap. + ``` + python plot_associate.py (--start_time ) (--stop_time ) + ``` ## Docker Environment