diff --git a/README.md b/README.md
index b6231c992be8ce81967e591f0f72cb5c127dd267..0d12a6332b694107c851d07b49cdacb7ec316c66 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,28 @@
## Setup
-### Requirements
+### Gitlab / SSH keys
+
+Once you have access to [our gitlab](https://git.step.polymtl.ca/polystar/robomaster/computer-vision), you should setup your ssh key, so you don't have to enter your credentials at every git operation. [The tutorials on gitlab (Settings > SSH keys)](https://git.step.polymtl.ca/profile/keys) should get you set upped on this.
+
+
+### IDE / PyCharm
+
+Our IDE is [PyCharm](https://www.jetbrains.com/fr-fr/pycharm/). As students, we have access to a free full version [https://www.jetbrains.com/fr-fr/community/education/#students]().
+
+You can use another IDE, but you need to find how to configure the following tools on your own.
+
+
+### Relative imports / PyCharm
+
+If you are using pycharm, then add [common](./common) as `Sources Root` (right click on common, then `Mark Directory As` > `Sources Root`). The project you are woking on should be added the same way.
+
+
+
+It will enable the relative imports (eg. `from polystar.common.utils.str_utils import snake2camel` will be understood by Pycharm).
+
+
+### Dependency management / Poetry
We use [poetry](https://python-poetry.org/) to manage our dependencies.
@@ -24,33 +45,87 @@ We use [poetry](https://python-poetry.org/) to manage our dependencies.
c. Hit `Ok`, then `Apply`. PyCharm should update its indexes. **Restart the terminal for the changes to apply in it if you use PyCharm's terminal**
+### Code formatter / Black
+To format your code in the same way as everybody else, we use [Black](https://pypi.org/project/black/). They have a [nice install section](https://black.readthedocs.io/en/stable/editor_integration.html#pycharm-intellij-idea). I strongly recommend doing their 3rd step, using the File Watchers plugin to run Black on every file save. This way, your files will be nicely formatted every time you save them.
-### Relative imports
+For reference, the config used is in [./pyproject.toml](pyproject.toml).
-If you are using pycharm, then add [common](./) as `Sources Root` (right click on common, then `Mark Directory As` > `Sources Root`). The project you are woking on should be added the same way.
-
+### Clean imports / Isort and AutoFlake
-It will enable the relative imports.
+#### Isort
+[Isort](https://pypi.org/project/isort/) is a tool that will keep your imports sorted nicely, so you dont have to worry about that part.
-## Repo Organisation
+We install it and use it with the File Watchers plugin, as done for Black:
- - [./common] In this directory, we write common code that can be used by every sub-project
- - [./dataset] In this directory, we add the images that are part of our dataset
- - Sub projects
- - [./drone-at-base]: The goal is to detect the base from the drone
- - [./robots-at-robots]: The goal is to identify and track the robots
- - [./robots-at-runes]: The goal is to infer the runes rotation angle and speed
+1. Install isort
+
+ `pip install isort`
+
+2. Locate it
+
+ (MacOS / Linux) `which isort`
+
+ (Windows) `where isort`
+
+3. Create a watcher in PyCharm.
+
+ Refer to the parameters used for black. It should look like:
+
+ 
+
+
+#### AutoFlake
+
+[AutoFlake](https://pypi.org/project/autoflake/) will remove the unused imports for you. Reproduce the steps you used to set up isort, and use the following for the `Arguments` field on FileWacher: `--in-place --remove-all-unused-imports $FilePath$`.
-## Sub-project organisation
+### Dataset
+
+#### ROCO
+
+Download the directory [PolySTAR/RoboMaster/EÌquipe-Computer vision/DJI ROCO](https://drive.google.com/drive/folders/1AM3PqwwHzlK3tAS-1R5Qk3edPv0T4NzB) in Drive, with the 4 datasets given by DJI, and unzip in folder [dataset/dji_roco](../dataset/dji_roco).
+
+The dji_roco directory should look like:
+
+
+
+#### TWITCH
+
+Download the directory [PolySTAR/RoboMaster/EÌquipe-Computer vision/datasets/twitch/v1](https://drive.google.com/drive/folders/1TaxdzB57U9wII9K2VDOEP8vUMm94_cR7) in Drive, with the 8 labelized videos from twitch, and unzip in folder [dataset/twitch/v1](dataset/twitch/v1).
+
+The twitch/v1 directory should look like:
+
+
+
+
+#### Check
+
+To verify that the datasets are correctly set upped, you can run the tests in [./common/tests/common/integration_tests/datasets](./common/tests/common/integration_tests/datasets).
+
+
+
+## Quick overview on organisation
+
+### Repo Organisation
+
+ - [./common](common) In this directory, we write common code that can be used by every sub-project
+ - [./dataset](dataset) In this directory, we add the images that are part of our dataset
+ - Sub projects
+ - [./robots-at-robots](robots-at-robots): The goal is to identify and track the robots
+ - [./robots-at-runes](robots-at-runes): The goal is to infer the runes rotation angle and speed
+
+
+### Sub-project organisation
The organisation for ech sub-project should follow the structure:
- - a `research` directory, where all the tests / model training, and code that shouldn't be ran by the robots would go
- - a `polystar/{sub_project_name}` directory, where the code that should be ran by the robots should go
+ - a `research/{sub_project_name}` directory, where all the tests / model training, and code that shouldn't be ran by the robots would go
+ - a `polystar/{sub_project_name}` directory, where the code that should be run by the robots should go
+ - (optional) a `tests/{sub_project_name}` directory, where we test the code
+
## Goals
diff --git a/common/README.md b/common/README.md
index c46c8443f363cd645477e268b2316d68a2bf28d1..f5addbe71d53d35ca74c07ce5aca3f75b8604eb5 100644
--- a/common/README.md
+++ b/common/README.md
@@ -4,23 +4,6 @@
This code is designed to be shared across projects
-### Dataset
-
-#### ROCO
-
-Download the directory [PolySTAR/RoboMaster/EÌquipe-Computer vision/DJI ROCO](https://drive.google.com/drive/folders/1AM3PqwwHzlK3tAS-1R5Qk3edPv0T4NzB) in Drive, with the 4 datasets given by DJI, and unzip in folder [dataset/dji_roco](../dataset/dji_roco).
-
-The dji_roco directory should look like:
-
-
-
-#### TWITCH
-
-Download the directory [PolySTAR/RoboMaster/EÌquipe-Computer vision/datasets/twitch/v1](https://drive.google.com/drive/folders/1TaxdzB57U9wII9K2VDOEP8vUMm94_cR7) in Drive, with the 8 labelized videos from twitch, and unzip in folder [dataset/twitch/v1](../dataset/twitch/v1).
-
-The twitch/v1 directory should look like:
-
-
## Dataset creation
diff --git a/common/tests/common/integration_tests/__init__.py b/common/tests/common/integration_tests/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/common/tests/common/integration_tests/datasets/__init__.py b/common/tests/common/integration_tests/datasets/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/common/tests/common/integration_tests/datasets/test_dji_dataset.py b/common/tests/common/integration_tests/datasets/test_dji_dataset.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a70700ed98a0b48d630e41210f5cc49c998f6d1
--- /dev/null
+++ b/common/tests/common/integration_tests/datasets/test_dji_dataset.py
@@ -0,0 +1,22 @@
+from unittest import TestCase
+
+from research.common.datasets.roco.roco_dataset_builder import ROCODatasetBuilder
+from research.common.datasets.roco.zoo.roco_dataset_zoo import ROCODatasetsZoo
+
+
+class TestDJIDataset(TestCase):
+ def test_north(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI.NORTH_CHINA, 2474)
+
+ def test_south(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI.SOUTH_CHINA, 2555)
+
+ def test_central(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI.CENTRAL_CHINA, 2655)
+
+ def test_final(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI.FINAL, 2685)
+
+ def assert_dataset_has_size(self, dataset_builder: ROCODatasetBuilder, size: int):
+ dataset = dataset_builder.build_lazy()
+ self.assertEqual(size, len(dataset))
diff --git a/common/tests/common/integration_tests/datasets/test_dji_zoomed_dataset.py b/common/tests/common/integration_tests/datasets/test_dji_zoomed_dataset.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f3517090553af3adb55639c1c8bbe219e3aeffd
--- /dev/null
+++ b/common/tests/common/integration_tests/datasets/test_dji_zoomed_dataset.py
@@ -0,0 +1,22 @@
+from unittest import TestCase
+
+from research.common.datasets.roco.roco_dataset_builder import ROCODatasetBuilder
+from research.common.datasets.roco.zoo.roco_dataset_zoo import ROCODatasetsZoo
+
+
+class TestDJIDataset(TestCase):
+ def test_north(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI_ZOOMED.NORTH_CHINA, 5474)
+
+ def test_south(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI_ZOOMED.SOUTH_CHINA, 5272)
+
+ def test_central(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI_ZOOMED.CENTRAL_CHINA, 5307)
+
+ def test_final(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.DJI_ZOOMED.FINAL, 5260)
+
+ def assert_dataset_has_size(self, dataset_builder: ROCODatasetBuilder, size: int):
+ dataset = dataset_builder.build_lazy()
+ self.assertEqual(size, len(dataset))
diff --git a/common/tests/common/integration_tests/datasets/test_twitch_dataset_v1.py b/common/tests/common/integration_tests/datasets/test_twitch_dataset_v1.py
new file mode 100644
index 0000000000000000000000000000000000000000..39e8224df2b5b66c0f4b6f92d302735e378ee1e7
--- /dev/null
+++ b/common/tests/common/integration_tests/datasets/test_twitch_dataset_v1.py
@@ -0,0 +1,20 @@
+from unittest import TestCase
+
+from research.common.datasets.roco.roco_dataset_builder import ROCODatasetBuilder
+from research.common.datasets.roco.zoo.roco_dataset_zoo import ROCODatasetsZoo
+
+
+class TestTwitchDataset(TestCase):
+ def test_sizes(self):
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470149568, 372)
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470150052, 186)
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470151286, 841)
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470152289, 671)
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470152730, 367)
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470152838, 161)
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470153081, 115)
+ self.assert_dataset_has_size(ROCODatasetsZoo.TWITCH.T470158483, 66)
+
+ def assert_dataset_has_size(self, dataset_builder: ROCODatasetBuilder, size: int):
+ dataset = dataset_builder.build_lazy()
+ self.assertEqual(size, len(dataset))
diff --git a/doc/add_isort.png b/doc/add_isort.png
new file mode 100644
index 0000000000000000000000000000000000000000..c66480a63b828c87c8fbcd6790fe81a3e6550761
Binary files /dev/null and b/doc/add_isort.png differ
diff --git a/common/doc/dataset_dji_repo.png b/doc/dataset_dji_repo.png
similarity index 100%
rename from common/doc/dataset_dji_repo.png
rename to doc/dataset_dji_repo.png
diff --git a/common/doc/dataset_twitch_repo.png b/doc/dataset_twitch_repo.png
similarity index 100%
rename from common/doc/dataset_twitch_repo.png
rename to doc/dataset_twitch_repo.png