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

Graphfcns #31

Merged
merged 46 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
6b6b629
Merge pull request #30 from ImperialCollegeLondon/main
barneydobson Jan 26, 2024
3ac4d52
Initial attempt at graph function examples
Jan 26, 2024
1880635
Update pydantic req
Jan 26, 2024
ad5e321
Update requirements
Jan 26, 2024
3166f52
Add split_long_edges (first attempt)
Jan 29, 2024
4eba34d
Add subcatchment derivation and tests
Jan 30, 2024
da89ee1
Update to use pathlib
Jan 30, 2024
c4fc7e2
Create some data for tests
Jan 31, 2024
a516bec
Edit geosptail_uitilties
Jan 31, 2024
39cdca1
Add load/save_graph
Jan 31, 2024
b6f5095
Update test_data CRS
Jan 31, 2024
efb12d4
Add calculate_contributing_area to graph_utilities
Jan 31, 2024
dfc44ba
Update geospatial_utilities.py
Feb 1, 2024
cfadabc
Add set_elevation graphfcn
Feb 1, 2024
8fa708e
Add and test set_surface_slope
Feb 1, 2024
36ba850
Add chahinan angle
Feb 1, 2024
cf606be
Add weight calculation
Feb 1, 2024
e45fd74
Add and testidentify_outlets and its parameters
Feb 1, 2024
c7075fa
Add shortest path and pipe by pipe
Feb 1, 2024
d385029
Refactor pipe_by_pipe and convert graphfcn to class
Feb 1, 2024
d0bbf90
Enable derive_toplogy for non-double directed
Feb 2, 2024
fe55037
Ensure addresses can both set and generate addresses
Feb 5, 2024
d7af934
Unlink with missing_ok
Feb 5, 2024
1ab4002
Specify None function outputs
Feb 5, 2024
de19a57
Update save/load graph to wkt
Feb 5, 2024
9207466
Update Addresses to FilePaths
barneydobson Feb 6, 2024
c61b021
Oneline json.loads in load_graph
barneydobson Feb 6, 2024
abea9f3
Use f-string formatting
barneydobson Feb 6, 2024
1658ebc
Tidy up contributing area assignment
barneydobson Feb 6, 2024
85d09a7
Tidy bounds normalising in weights
barneydobson Feb 6, 2024
83ec08c
Convert set_slope to comprehension
barneydobson Feb 6, 2024
c35616b
Use shapely for geoms rather than shapely.geom
barneydobson Feb 6, 2024
4a77002
Remove forward referencing in typing
Feb 20, 2024
ed5383f
More informative pysheds names
Feb 20, 2024
6dd7394
Remove completed TODO
Feb 20, 2024
f06043b
Update swmmanywhere/geospatial_utilities.py
barneydobson Feb 20, 2024
3b5e1f7
move serialize linestring out of save_graph
Feb 20, 2024
6cba347
Update swmmanywhere/graph_utilities.py
barneydobson Feb 20, 2024
586aa68
Merge remote-tracking branch 'origin/graphfcns' into graphfcns
Feb 20, 2024
19707a0
Use __init_subclass__ for graphfcn
Feb 20, 2024
ff8cbc4
Update swmmanywhere/graph_utilities.py
barneydobson Feb 20, 2024
beb0b76
Test opposite and unindent in shortest path
Feb 20, 2024
4a1cca9
Add negative cycle check
Feb 20, 2024
2bfedaf
Add weighted negative cycle check
Feb 20, 2024
682bbe4
Update geospatial_utilities.py
barneydobson Feb 25, 2024
c529443
Update graph_utilities.py
Feb 28, 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
11 changes: 10 additions & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ affine==2.4.0
# via
# pysheds
# rasterio
annotated-types==0.6.0
# via pydantic
attrs==23.2.0
# via
# fiona
Expand Down Expand Up @@ -190,6 +192,10 @@ pre-commit==3.6.0
# via swmmanywhere (pyproject.toml)
pyarrow==14.0.2
# via swmmanywhere (pyproject.toml)
pydantic==2.5.3
# via swmmanywhere (pyproject.toml)
pydantic-core==2.14.6
# via pydantic
pyparsing==3.1.1
# via
# matplotlib
Expand Down Expand Up @@ -271,7 +277,10 @@ tqdm==4.66.1
# cdsapi
# swmmanywhere (pyproject.toml)
typing-extensions==4.9.0
# via mypy
# via
# mypy
# pydantic
# pydantic-core
tzdata==2023.4
# via pandas
urllib3==2.1.0
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies = [ # TODO definitely don't need all of these
"osmnx",
"pandas",
"pyarrow",
"pydantic",
"pysheds",
"PyYAML",
"rasterio",
Expand Down
10 changes: 10 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ affine==2.4.0
# via
# pysheds
# rasterio
annotated-types==0.6.0
# via pydantic
attrs==23.2.0
# via
# fiona
Expand Down Expand Up @@ -150,6 +152,10 @@ pillow==10.2.0
# scikit-image
pyarrow==14.0.2
# via swmmanywhere (pyproject.toml)
pydantic==2.5.3
# via swmmanywhere (pyproject.toml)
pydantic-core==2.14.6
# via pydantic
pyparsing==3.1.1
# via
# matplotlib
Expand Down Expand Up @@ -212,6 +218,10 @@ tqdm==4.66.1
# via
# cdsapi
# swmmanywhere (pyproject.toml)
typing-extensions==4.9.0
# via
# pydantic
# pydantic-core
tzdata==2023.4
# via pandas
urllib3==2.1.0
Expand Down
Loading
Loading