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

86 sensitivity analysis sampling #97

Merged
merged 72 commits into from
Apr 1, 2024
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
91bd1eb
Initial commit
barneydobson Mar 16, 2024
e68530e
Update test_swmmanywhere.py
barneydobson Mar 16, 2024
6d9f7fb
Update test_swmmanywhere.py
barneydobson Mar 16, 2024
48e8863
Create test_experimenter.py
barneydobson Mar 16, 2024
4f070f7
Update test_experimenter.py
barneydobson Mar 16, 2024
9a7355e
Merge branch 'main' into 86-sensitivity-analysis-sampling
Mar 18, 2024
5e2459b
Merge branch 'main' into 86-sensitivity-analysis-sampling
Mar 18, 2024
8af45bd
Merge branch 'fix-geometries' into 86-sensitivity-analysis-sampling
Mar 18, 2024
4c0d958
Merge branch '51-gridded-metrics' into 86-sensitivity-analysis-sampling
Mar 18, 2024
f1a69b0
Merge branch '91-design-output-metrics-as-in-metrics-for-the-networks…
Mar 18, 2024
e349f48
Update swmmanywhere.py
Mar 18, 2024
2d936c3
Merge branch 'main' into 86-sensitivity-analysis-sampling
Mar 18, 2024
5206bc4
Merge verbosity
Mar 18, 2024
c2f4d90
Update test_metric_utilities.py
Mar 18, 2024
61bf093
typo
Mar 18, 2024
93cac80
Update graph_utilities.py
Mar 18, 2024
8663bb2
Use design storm
Mar 19, 2024
c11a10a
Update metric_utilities.py
Mar 19, 2024
db9585d
Update swmmanywhere.py
Mar 19, 2024
88eb5f3
Update pyproject.toml
Mar 19, 2024
c688a4c
Revert "Update metric_utilities.py"
Mar 19, 2024
ff69382
Update metric_utilities.py
Mar 19, 2024
6113088
Update metric_utilities.py
Mar 19, 2024
692b46d
redo fixes
Mar 19, 2024
6f6ffea
update for new storm
Mar 19, 2024
9588122
Update schema.yml
Mar 19, 2024
790bcb2
Update metric_utilities.py
Mar 19, 2024
7f28274
Update experimenter.py
Mar 19, 2024
6a26247
Update to new experimenter
Mar 19, 2024
b864338
Merge branch '86-sensitivity-analysis-sampling' of https://github.com…
Mar 19, 2024
f009c39
log
Mar 19, 2024
4b82b23
Update experimenter.py
Mar 19, 2024
484ca89
Update metric_utilities.py
Mar 19, 2024
d8d2b99
Update experimenter.py
Mar 19, 2024
469a9ff
Update experimenter.py
Mar 19, 2024
d12530e
Update test_graph_utilities.py
Mar 19, 2024
4f2c1c7
move numba stuff to geospatial
Mar 19, 2024
af58539
Update graph_utilities.py
Mar 19, 2024
e4a38e5
Undo that, didn't seem to work
Mar 19, 2024
9046178
Merge branch 'main' into 86-sensitivity-analysis-sampling
Mar 20, 2024
2103147
Update experimenter.py
Mar 20, 2024
1496d9d
allow set model_number
Mar 20, 2024
e4f9c06
handle model number in create_project_structure
Mar 21, 2024
36a074a
Update experimenter.py
Mar 21, 2024
e9e742e
lock the bounding box file to prevent json error
Mar 21, 2024
57dddaa
Merge branch '7-downloader-mock' into 86-sensitivity-analysis-sampling
Mar 21, 2024
50164e4
Revert "lock the bounding box file to prevent json error"
Mar 21, 2024
aa24eb6
Update preprocessing.py
Mar 21, 2024
0c627b7
merge
Mar 25, 2024
841f519
Update experimenter.py
Mar 25, 2024
f02c1f1
Update experimenter.py
Mar 25, 2024
5bf2f4e
Update experimenter.py
barneydobson Mar 25, 2024
8679c56
Update swmmanywhere/paper/experimenter.py
barneydobson Mar 26, 2024
f26ce5d
Update experimenter.py
barneydobson Mar 26, 2024
2ab1373
Merge branch '86-sensitivity-analysis-sampling' of https://github.com…
barneydobson Mar 26, 2024
e014ef7
Update experimenter.py
barneydobson Mar 26, 2024
0a85214
Update swmmanywhere.py
barneydobson Mar 26, 2024
649b635
Update swmmanywhere.py
barneydobson Mar 26, 2024
c710cec
Update typing
barneydobson Mar 26, 2024
e7feb7a
Update graph_utilities.py
barneydobson Mar 26, 2024
edb8b64
Update geospatial_utilities.py
barneydobson Mar 26, 2024
c3a0bbb
Merge branch 'main' into 86-sensitivity-analysis-sampling
barneydobson Mar 26, 2024
1da3f6f
Update experimenter.py
barneydobson Apr 1, 2024
ac9726d
Update experimenter.py
barneydobson Apr 1, 2024
d91ef66
import future imports
barneydobson Apr 1, 2024
ca59f50
Update metric_utilities.py
barneydobson Apr 1, 2024
20852d3
Update experimenter.py
barneydobson Apr 1, 2024
f2b4890
Update experimenter.py
barneydobson Apr 1, 2024
7930b00
Update metric_utilities.py
barneydobson Apr 1, 2024
ec9d19b
Update graph_utilities.py
barneydobson Apr 1, 2024
ac43542
Update experimenter.py
barneydobson Apr 1, 2024
3f8e89b
Merge branch 'main' into 86-sensitivity-analysis-sampling
barneydobson Apr 1, 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
Prev Previous commit
Next Next commit
Update graph_utilities.py
to stop 0**-1 or similar
Dobson committed Mar 19, 2024
commit af58539dc24fd2ce97270d963ca7b32d33eb2a0e
2 changes: 1 addition & 1 deletion swmmanywhere/graph_utilities.py
Original file line number Diff line number Diff line change
@@ -695,7 +695,7 @@ def __call__(self, G: nx.Graph,
total_weight = 0
for attr, bds in bounds.items():
# Normalise
weight = (d[attr] - bds[0]) / (bds[1] - bds[0])
weight = (d[attr] - bds[0]) / (bds[1] - bds[0]) + 1e-10
barneydobson marked this conversation as resolved.
Show resolved Hide resolved
# Exponent
weight = weight ** getattr(topology_derivation,f'{attr}_exponent')
# Scaling