Add updated data and models (#45)

* Add basis for creation of updated OSM dataset

* Add first new binding

* Add bindings

* Add bindings

* Add bindings

* Add bindings

* Add bindings

* Add bindings

* Add new measures to avoid duplicates

* Add bindings

* Add/Improve tools to analyze duplicates in data

* Remove routes such that ratio between duplicate and original bindings is similar to the DRN bindings

* Update bindings after discussion with Philipp

* Downgrade sqlalchemy to fix bug with optuna hyperparameter tuning

* Tuning progress

* Rename sg file

* Tuning progress

* Tuning finished

* Rename hyperparameter file

* Add updated DRN hypermodel

* Update readme

* Rename osm example route files

* Add jupyter notebook for data analysis

* Add matching results for paper figure

* Update matching results for paper figure

* Finish figure for paper

* Update figure for paper

* Finalize figure for paper

* Add averages of distances

* Only create visualizations for bike SGs

* Add notebooks for matching paper

* Add json with no-match-lsas for old lsa data and old bindings

* Reset temporary change

* Update used topological model in matching endpoint

* Fix dockerfile

backend/Dockerfile

@@ -26,7 +26,9 @@ WORKDIR /code
 # Install Python dependencies separated from the
 # run script to enable Docker caching
 ADD pyproject.toml /code
-RUN poetry install --no-interaction --no-ansi --no-dev
+# Get build arg that specifies whether dev dependencies should be installed
+ARG INSTALL_DEV_DEPENDENCIES=false
+RUN if [ $INSTALL_DEV_DEPENDENCIES = true ] ; then poetry install --no-interaction --no-ansi; else poetry install --no-interaction --no-ansi --no-dev; fi
 
 # Install CURL for healthcheck
 RUN apt-get install -y curl

backend/backend/analytics/management/commands/run_analysis.py

@@ -237,7 +237,7 @@ def handle(self, *args, **options):
 
         # Add strategies that should be analyized.
         # strategies = {"ml-drn": [ ProximityMatcher(search_radius_m=20), MLMatcher("drn") ]}
-        strategies = {"topo": [ TopologicHypermodelMatcher.from_config_file() ]}
+        strategies = {"topo": [ TopologicHypermodelMatcher.from_config_file(f'config/topologic.hypermodel.drn.updated.json') ]}
 
         runs = []
         for strategy_name, strategy in strategies.items():

backend/backend/backend/settings.py

@@ -52,7 +52,8 @@
         'jiggle_vis',
         'projection_vis',
         'ml_evaluation',
-        'demo'
+        'demo',
+        'django_extensions'
     ]
 
 MIDDLEWARE = [
@@ -165,3 +166,33 @@
 
 # The initial search radius in meters
 SEARCH_RADIUS_M = 20
+
+if DEBUG:
+    SHELL_PLUS = "ipython"
+
+    SHELL_PLUS_PRINT_SQL = True
+
+    NOTEBOOK_ARGUMENTS = [
+        "--ip",
+        "0.0.0.0",
+        "--port",
+        "8888",
+        "--allow-root",
+        "--no-browser",
+    ]
+
+    IPYTHON_ARGUMENTS = [
+        "--ext",
+        "django_extensions.management.notebook_extension",
+        "--debug",
+    ]
+
+    IPYTHON_KERNEL_DISPLAY_NAME = "Django Shell-Plus"
+
+    SHELL_PLUS_POST_IMPORTS = [ # extra things to import in notebook
+        ("module1.submodule", ("func1", "func2", "class1", "etc")),
+        ("module2.submodule", ("func1", "func2", "class1", "etc"))
+
+    ]
+
+    os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/112.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 112
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/114.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 114
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/115.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 115
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/119.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 119
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/120.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 120
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/125.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 125
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/128.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 128
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/133.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 133
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/140.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 140
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/156.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 156
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/159.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 159
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/160.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 160
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/161.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 161
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/165.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 165
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/166.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 166
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/169.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 169
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/170.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 170
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/171.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 171
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/172.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 172
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/173.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 173
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/181.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 181
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/182.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 182
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/192.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 192
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/197.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 197
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/200.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 200
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/211.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 211
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/222.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 222
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/223.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 223
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/229.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 229
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/237.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 237
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/238.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 238
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/249.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 249
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/250.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 250
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/251.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 251
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/253.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 253
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/254.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 254
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/255.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 255
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/263.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 263
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/266.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 266
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/269.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 269
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/276.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 276
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/278.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 278
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/282.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 282
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/284.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 284
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/295.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 295
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/301.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 301
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/302.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 302
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/303.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 303
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/306.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 306
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/307.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 307
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/309.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 309
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/310.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 310
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/315.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 315
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/327.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 327
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/335.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 335
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/340.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 340
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/343.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 343
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/348.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 348
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/350.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 350
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/353.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 353
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/360.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 360
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/368.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 368
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/370.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 370
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/373.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 373
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/374.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 374
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/377.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 377
+}

backend/backend/composer/logs/routes_with_no_duplicates_in_bindings_of_routes_before_49/388.json

@@ -0,0 +1,3 @@
+{
+    "route_id": 388
+}