Skip to content

Commit

Permalink
Correct name detections_tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
cleherny committed Jan 11, 2024
1 parent d5659e1 commit 2ae1245
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The procedure is defined in three distinct workflows:

1. **Training and evaluation**: enables the detection model to be trained and evaluated using a customised dataset reviewed by domain experts and constituting the ground truth. The detector is first trained on the [_SWISSIMAGE 10 cm_](https://www.swisstopo.admin.ch/fr/geodata/images/ortho/swissimage10.html) mosaic of 2020, using manually vectorized MES of the [swissTLM3D](https://www.swisstopo.admin.ch/fr/geodata/landscape/tlm3d.html) product.
2. **Detection**: permits the inference detection of MES in a given set of images ([_SWISSIMAGE Journey_](https://www.swisstopo.admin.ch/en/maps-data-online/maps-geodata-online/journey-through-time-images.html)) using the previously trained model.
3. **Detection tracking**: identifies and tracks MES evolution over time.
3. **Detections tracking**: identifies and tracks MES evolution over time.

<p align="center">
<img src="./images/dqry_workflow_graph.png?raw=true" width="100%">
Expand Down Expand Up @@ -86,7 +86,7 @@ The folders/files of the project `proj-dqry` (in combination with `object-detect
<pre>.
├── config # configurations files folder
│   ├── config_det.template.yaml # template file for detection workflow over several years
│   ├── config_dt.yaml # detection tracking workflow
│   ├── config_dt.yaml # detections tracking workflow
│   ├── config_det.yaml # detection workflow
│   ├── config_trne.yaml # training and evaluation workflow
│   ├── detectron2_config_dqry.yaml # detectron 2
Expand All @@ -113,7 +113,7 @@ The folders/files of the project `proj-dqry` (in combination with `object-detect
│   ├── tlm-hr-trn-topo.shp # shapefile of the labels
│   └── tlm-hr-trn-topo.shx # shapefile indexes of the labels
├── output # outputs folders
│   ├── output_dt # detection tracking outputs
│   ├── output_dt # detections tracking outputs
│   │   └── oth_detections_at_0dot*_threshold_year-*_score-0dot*_area-*_elevation-*_distance-* # final filtered detections file for a given year
│   │   ├── plots # plots storage
│   │      │ └── quarry_area.png # quarry area vs year plot
Expand Down Expand Up @@ -180,7 +180,7 @@ The folders/files of the project `proj-dqry` (in combination with `object-detect
│      └── val_TP-FN-FP_vs_threshold.html # plot validation dataset TP-FN-FP vs threshold values
├── scripts
│   ├── batch_process.sh # batch script automatising the detection workflow
│   ├── detection_tracking.py # script tracking detections in several years dataset
│   ├── detections_tracking.py # script tracking detections in mulitple years dataset
│   ├── filter_detection.py # script filtering detections according to threshold values
│   ├── get_dem.sh # batch script downloading the DEM of Switzerland
│   ├── plots.py # script plotting figures
Expand Down Expand Up @@ -211,7 +211,7 @@ The `proj-dqry` repository contains scripts to prepare and post-process the data

1. `prepare_data.py`
2. `filter_detection.py`
3. `detection_tracking.py`
3. `detections_tracking.py`
4. `plots.py`
5. `get_DEM.sh`
6. `batch_process.sh`
Expand Down Expand Up @@ -258,7 +258,7 @@ $ scripts/get_dem.sh
$ scripts/batch_process.sh
```

**Detection tracking**: copy the required input files (filtered detection files (`oth_detections_filter_year-{year}_[filters_list].geojson`)) to **input_dt** folder.
**Detections tracking**: copy the required input files (filtered detection files (`oth_detections_filter_year-{year}_[filters_list].geojson`)) to **input_dt** folder.

```bash
$ mkdir input_dt
Expand Down
2 changes: 1 addition & 1 deletion config/config_dt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ detections_tracking.py:

# Plots
plots.py:
object_id: [ID_OBJECT1, ID_OBJECT2, ID_OBJECT3,...] # Provide a list of id_object defined by detection_tracking.py
object_id: [ID_OBJECT1, ID_OBJECT2, ID_OBJECT3,...] # Provide a list of id_object defined by detections_tracking.py
plots: ['area-year']
datasets:
detection: ./output/output_dm/oth_detections_at_0dot3_threshold_score-0dot95_area-5000_elevation-1200_distance-10/quarry_times.geojson # Object tracking file, produced by detection_monitoring.py
Expand Down
6 changes: 3 additions & 3 deletions scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ The script identifies the position of polygons between different years to identi
<i>Schematic representation of the object tracking strategy.</i>
</p>

The `detection_tracking.py` section of the _yaml_ configuration file is expected as follow:
The `detections_tracking.py` section of the _yaml_ configuration file is expected as follow:

```bash
detection_tracking.py:
detections_tracking.py:
years: [YEAR1, YEAR2, YEAR3,...]
datasets:
detection: ./input/input_dt/oth_detection_at_0dot*_threshold_year-{year}_score-[SCORE]_elevation-[elevation]_distance-[distance]_area-[area].geojson
Expand All @@ -128,7 +128,7 @@ Input and output paths of the config file must be adapted if necessary. The scri
The script can be run by executing the following command:

```bash
$ python3 <dir_path>/scripts/detection_tracking.py <dir_path>/config/config_dt.yaml
$ python3 <dir_path>/scripts/detections_tracking.py <dir_path>/config/config_dt.yaml
```

The outputs are a _geojson_ and _csv_ (**quarry_time**) files saving detections over the years with their characteristics (ID_object, ID_feature, year, score, area, geometry).
Expand Down

0 comments on commit 2ae1245

Please sign in to comment.