Deduplicate shortest path code (#176)

The code was identical except for comments and print statements. So now we move it all into a single function that is part of the package, so the individual scripts are just a few lines. Only AGV was an outlier since it had a lot of code after the shared code. Perhaps @rbruijnshkv can comment on if that is needed or not. Another difference I noticed is this, AGV has this set to 5: ``` distance_interval = 50 # The distance interval you want to segment the lines at ``` This only deduplicates, I didn't want to start modifying the code at the same time. So I cannot run it since it relies on local paths that I don't have.
Deltares · Oct 22, 2024 · 68c5dbc · 68c5dbc
1 parent 0e367e1
commit 68c5dbc
Show file tree

Hide file tree

Showing 14 changed files with 479 additions and 4,773 deletions.
diff --git a/pixi.lock b/pixi.lock
@@ -14706,9 +14706,10 @@ packages:
   name: peilbeheerst-model
   version: 0.1.0
   path: src/peilbeheerst_model
-  sha256: 21b935f0542b5dbb76baaf1944b11ef6fab94b5a5926565410fe3d62722c332d
+  sha256: e8c270f68d683c802990a8bb905cd665fd327b33e1d17bf3e01dfe9c49ec335e
   requires_dist:
   - geopandas
+  - matplotlib
   - numpy
   - pandas
   - pydantic

diff --git a/src/peilbeheerst_model/Shortest_path/01_shortest_path_Hollandse_Delta.py b/src/peilbeheerst_model/Shortest_path/01_shortest_path_Hollandse_Delta.py
diff --git a/src/peilbeheerst_model/Shortest_path/02_shortest_path_HHSK.py b/src/peilbeheerst_model/Shortest_path/02_shortest_path_HHSK.py
diff --git a/src/peilbeheerst_model/Shortest_path/03_shortest_path_HHNK.py b/src/peilbeheerst_model/Shortest_path/03_shortest_path_HHNK.py
diff --git a/src/peilbeheerst_model/Shortest_path/04_shortest_path_Delfland.py b/src/peilbeheerst_model/Shortest_path/04_shortest_path_Delfland.py
diff --git a/src/peilbeheerst_model/Shortest_path/05_shortest_path_Scheldestromen.py b/src/peilbeheerst_model/Shortest_path/05_shortest_path_Scheldestromen.py
diff --git a/src/peilbeheerst_model/Shortest_path/06_shortest_path_Zuiderzeeland.py b/src/peilbeheerst_model/Shortest_path/06_shortest_path_Zuiderzeeland.py
diff --git a/src/peilbeheerst_model/Shortest_path/07_shortest_path_WSRL.py b/src/peilbeheerst_model/Shortest_path/07_shortest_path_WSRL.py
diff --git a/src/peilbeheerst_model/Shortest_path/08_shortest_path_Wetterskip.py b/src/peilbeheerst_model/Shortest_path/08_shortest_path_Wetterskip.py
diff --git a/src/peilbeheerst_model/Shortest_path/09_shortest_path_Rijnland.py b/src/peilbeheerst_model/Shortest_path/09_shortest_path_Rijnland.py
diff --git a/src/peilbeheerst_model/Shortest_path/10_shortest_path_AGV.py b/src/peilbeheerst_model/Shortest_path/10_shortest_path_AGV.py
diff --git a/src/peilbeheerst_model/peilbeheerst_model/__init__.py b/src/peilbeheerst_model/peilbeheerst_model/__init__.py
@@ -1,6 +1,7 @@
 __version__ = "0.1.0"
 
 from peilbeheerst_model.parse_crossings import ParseCrossings
+from peilbeheerst_model.shortest_path import shortest_path_waterschap
 from peilbeheerst_model.waterschappen import waterschap_data
 
-__all__ = ["ParseCrossings", "waterschap_data"]
+__all__ = ["ParseCrossings", "shortest_path_waterschap", "waterschap_data"]
diff --git a/src/peilbeheerst_model/peilbeheerst_model/shortest_path.py b/src/peilbeheerst_model/peilbeheerst_model/shortest_path.py
diff --git a/src/peilbeheerst_model/pyproject.toml b/src/peilbeheerst_model/pyproject.toml
@@ -14,7 +14,17 @@ authors = [
 license = { text = "MIT" }
 
 requires-python = ">=3.10"
-dependencies = ["geopandas", "numpy", "pandas", "pydantic", "shapely", "tqdm", "matplotlib"]
+dependencies = [
+    "geopandas",
+    "numpy",
+    "pandas",
+    "pydantic",
+    "shapely",
+    "tqdm",
+    "matplotlib",
+    "fiona",
+    "networkx",
+]
 dynamic = ["version"]
 
 [project.optional-dependencies]