Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Topological metrics #74

Merged
merged 28 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
44f304f
Implement outlet matching
Feb 29, 2024
1c829e9
Implement outlet matching
Feb 29, 2024
74bbfb9
Merge branch 'main' into outlet_match_metric
Mar 4, 2024
bf69ed7
Merge branch 'main' into outlet_match_metric
Mar 4, 2024
2bf7d17
Merge branch 'main' into outlet_match_metric
Mar 6, 2024
d8bcd0d
Update metric_utilities.py
Mar 6, 2024
792f3ae
Merge branch 'main' into outlet_match_metric
Mar 6, 2024
1cbd9b8
Update metric_utilities.py
Mar 6, 2024
14b2ce4
Update metric_utilities.py
Mar 6, 2024
e16dac3
Update test_metric_utilities.py
Mar 6, 2024
6dd0e65
Update test_metric_utilities.py
Mar 6, 2024
d1eda73
Update metric_utilities.py
Mar 6, 2024
d9ba711
Update metric_utilities.py
Mar 6, 2024
03fb75b
Update metric_utilities.py
Mar 6, 2024
2a5f9a0
Update test_metric_utilities.py
barneydobson Mar 7, 2024
a99950c
Update metric_utilities.py
barneydobson Mar 7, 2024
8465bb9
Update metric_utilities.py
barneydobson Mar 7, 2024
3699dd6
Update metric_utilities.py
barneydobson Mar 7, 2024
f12a790
Ensure align_calc_nse dates are consistent format
barneydobson Mar 7, 2024
927c74b
Add netcomp metrics
Mar 7, 2024
e22020a
Merge branch 'outlet_match_metric' into topological_metrics
Mar 7, 2024
1c7b955
test new metrics
Mar 7, 2024
64d7b03
BC changes
barneydobson Mar 11, 2024
893189b
Merge branch 'main' into topological_metrics
barneydobson Mar 11, 2024
eb5a601
Update metric_utilities.py
barneydobson Mar 11, 2024
ee4e500
Merge branch 'topological_metrics' of https://github.com/ImperialColl…
barneydobson Mar 11, 2024
bdcbd8b
Update pyproject.toml
barneydobson Mar 11, 2024
4cf2675
Update metric_utilities.py
barneydobson Mar 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --extra=dev --output-file=dev-requirements.txt
Expand Down Expand Up @@ -68,10 +68,14 @@ cramjam==2.7.0
# via fastparquet
cycler==0.12.1
# via matplotlib
cytoolz==0.12.3
# via swmmanywhere (pyproject.toml)
dill==0.3.7
# via multiprocess
distlib==0.3.8
# via virtualenv
exceptiongroup==1.2.0
# via pytest
fastparquet==2023.10.1
# via swmmanywhere (pyproject.toml)
filelock==3.13.1
Expand All @@ -93,14 +97,9 @@ geojson==3.1.0
geopandas==0.14.2
# via
# osmnx
# snkit
# swmmanywhere (pyproject.toml)
geopy==2.4.1
# via swmmanywhere (pyproject.toml)
gitdb==4.0.11
# via gitpython
gitpython==3.1.41
# via swmmanywhere (pyproject.toml)
identify==2.5.33
# via pre-commit
idna==3.6
Expand All @@ -109,6 +108,8 @@ imageio==2.33.1
# via scikit-image
iniconfig==2.0.0
# via pytest
joblib==1.3.2
# via swmmanywhere (pyproject.toml)
julian==0.14
# via pyswmm
kiwisolver==1.4.5
Expand All @@ -133,8 +134,11 @@ mypy-extensions==1.0.0
# via mypy
netcdf4==1.6.5
# via swmmanywhere (pyproject.toml)
netcomp @ git+https://github.com/barneydobson/NetComp.git
# via swmmanywhere (pyproject.toml)
networkx==3.2.1
# via
# netcomp
# osmnx
# scikit-image
# swmmanywhere (pyproject.toml)
Expand All @@ -150,6 +154,7 @@ numpy==1.26.3
# imageio
# matplotlib
# netcdf4
# netcomp
# numba
# osmnx
# pandas
Expand Down Expand Up @@ -262,6 +267,7 @@ scikit-image==0.22.0
# via pysheds
scipy==1.12.0
# via
# netcomp
# pysheds
# salib
# scikit-image
Expand All @@ -270,22 +276,27 @@ shapely==2.0.2
# via
# geopandas
# osmnx
# snkit
# swmmanywhere (pyproject.toml)
six==1.16.0
# via
# fiona
# python-dateutil
smmap==5.0.1
# via gitdb
snkit==1.9.0
# via swmmanywhere (pyproject.toml)
snuggs==1.4.7
# via rasterio
swmm-toolkit==0.15.3
# via pyswmm
tifffile==2024.1.30
# via scikit-image
tomli==2.0.1
# via
# build
# coverage
# mypy
# pip-tools
# pyproject-hooks
# pytest
toolz==0.12.1
# via cytoolz
tqdm==4.66.2
# via
# cdsapi
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,17 @@ classifiers = [
dependencies = [
# TODO definitely don't need all of these
"cdsapi",
"cytoolz",
"fastparquet",
"fiona",
"geopandas",
"geopy",
"GitPython",
"joblib",
"loguru",
"matplotlib",
"netcdf4",
"netcomp@ git+https://github.com/barneydobson/NetComp.git",
"networkx",
"numpy",
"osmnx",
Expand All @@ -47,7 +50,6 @@ dependencies = [
"SALib",
"SciPy",
"shapely",
"snkit",
"tqdm",
"xarray",
]
Expand Down
23 changes: 12 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile
Expand Down Expand Up @@ -56,6 +56,8 @@ cramjam==2.7.0
# via fastparquet
cycler==0.12.1
# via matplotlib
cytoolz==0.12.3
# via swmmanywhere (pyproject.toml)
dill==0.3.7
# via multiprocess
fastparquet==2023.10.1
Expand All @@ -75,18 +77,15 @@ geojson==3.1.0
geopandas==0.14.2
# via
# osmnx
# snkit
# swmmanywhere (pyproject.toml)
geopy==2.4.1
# via swmmanywhere (pyproject.toml)
gitdb==4.0.11
# via gitpython
gitpython==3.1.41
# via swmmanywhere (pyproject.toml)
idna==3.6
# via requests
imageio==2.33.1
# via scikit-image
joblib==1.3.2
# via swmmanywhere (pyproject.toml)
julian==0.14
# via pyswmm
kiwisolver==1.4.5
Expand All @@ -105,8 +104,11 @@ multiprocess==0.70.15
# via salib
netcdf4==1.6.5
# via swmmanywhere (pyproject.toml)
netcomp @ git+https://github.com/barneydobson/NetComp.git
# via swmmanywhere (pyproject.toml)
networkx==3.2.1
# via
# netcomp
# osmnx
# scikit-image
# swmmanywhere (pyproject.toml)
Expand All @@ -120,6 +122,7 @@ numpy==1.26.3
# imageio
# matplotlib
# netcdf4
# netcomp
# numba
# osmnx
# pandas
Expand Down Expand Up @@ -204,6 +207,7 @@ scikit-image==0.22.0
# via pysheds
scipy==1.12.0
# via
# netcomp
# pysheds
# salib
# scikit-image
Expand All @@ -212,22 +216,19 @@ shapely==2.0.2
# via
# geopandas
# osmnx
# snkit
# swmmanywhere (pyproject.toml)
six==1.16.0
# via
# fiona
# python-dateutil
smmap==5.0.1
# via gitdb
snkit==1.9.0
# via swmmanywhere (pyproject.toml)
snuggs==1.4.7
# via rasterio
swmm-toolkit==0.15.3
# via pyswmm
tifffile==2024.1.30
# via scikit-image
toolz==0.12.1
# via cytoolz
tqdm==4.66.2
# via
# cdsapi
Expand Down
Loading