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.

Sign up for GitHub

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

Jump to bottom

feat: 595 adaptation run and combine losses and damages #616

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open

feat: 595 adaptation run and combine losses and damages #616

wants to merge 82 commits into from

Conversation

ArdtK
Copy link
Contributor

@ArdtK ArdtK commented Dec 2, 2024 •
edited
Loading

Issue addressed

Solves #595

Code of conduct

  • I HAVE NOT added sensitive or compromised (test) data to the repository.
  • I HAVE NOT added vulnerabilities to the repository.
  • I HAVE discussed my solution with (other) members of the RA2CE team.

What has been done?

  • Extend AnalysisFactory to get an adaptation analysis (was put onder damages at the start)
  • Add the analysis inputs for the damages and losses analyses to the AdaptationOption and change the classmethods to create the collection and options accordingly
  • Run the damages and losses analysis from the AdaptationOption

Checklist

  • Code is formatted using our custom black and isort definitions.
  • Tests are either added or updated.
  • Branch is up to date with master.
  • Updated documentation if needed.

Additional Notes (optional)

  • Network input data has been adjusted
  • Fix some bugs in the csv-readers for losses (object_type was not set`)

ArdtK and others added 30 commits November 27, 2024 13:26
@ArdtK
chore: extend config and reader
48326b5
@ArdtK
chore: add/correct attributes of config data
84f599d
@ArdtK
chore: extend reader with options
2954acf
@ArdtK
chore: add adaptation property and extend test
69015a8
@ArdtK
chore: first changes
88af277
@ArdtK
chore: add adaptation to enum
2b70a23
@ArdtK
Merge branch 'feat/604-adaptation-extend-analysis-config-dataclass-an…
bdbc35a 
…d-reader' into feat/592-adaptation-create-class-adaptationoptioncollection
@ArdtK
chore: extend classes
ed85cca
@ArdtK
chore: put adaptation in separate enum
e84e8b2
@ArdtK
Merge branch 'feat/604-adaptation-extend-analysis-config-dataclass-an…
825d2b1 
…d-reader' into feat/592-adaptation-create-class-adaptationoptioncollection
@ArdtK
chore: add get_analysis
befdfa8
@ArdtK
chore: remove no_intervention from config
4bab16c
@ArdtK
chore: rename no_intervention to no_adaptation
a4c6d24
@ArdtK
Delete ra2ce/analysis/adaptation/adaptation_option_collection.py
47c94fc
@ArdtK
chore: restore no_adaptation_option
b00ba88
@ArdtK
Merge branch 'feat/604-adaptation-extend-analysis-config-dataclass-an…
214582a 
…d-reader' of https://github.com/Deltares/ra2ce into feat/604-adaptation-extend-analysis-config-dataclass-and-reader
@ArdtK
Merge branch 'feat/604-adaptation-extend-analysis-config-dataclass-an…
d23492b 
…d-reader' into feat/592-adaptation-create-class-adaptationoptioncollection
@ArdtK
chore: expand logic and add tests
c1dee8b
@ArdtK
chore: add losses analysis name to config
d11c58c
@ArdtK
Merge branch 'feat/604-adaptation-extend-analysis-config-dataclass-an…
e7826df 
…d-reader' into feat/592-adaptation-create-class-adaptationoptioncollection
@ArdtK
chore: take losses_analysis from config
61e09a1
@ArdtK
chore: fix test
60a349f
@ArdtK
test: add tests
af07a89
@ArdtK
chore: fix logic for paths
3f49320
@ArdtK
chore: small changes
75f3117
@ArdtK
Merge branch 'master' into feat/592-adaptation-create-class-adaptatio…
1fc6161 
…noptioncollection
@ArdtK
test: add test data
03be931
@ArdtK
chore: small change of folders
4cbdd1c
@ArdtK
chore: small changes to paths
cda391a
@ArdtK
chore: small ini change
9c06029
@ArdtK ArdtK linked an issue Dec 2, 2024 that may be closed by this pull request
Adaptation: run and combine Losses and Damages for BAU and other options #595
Open
ArdtK and others added 18 commits December 2, 2024 13:58
@ArdtK
chore: remove unused imports
5d3001c
@ArdtK
empty commit to conclude merge
743cb47
@ArdtK
test: fix losses input paths
19d749e
@ArdtK
chore: fix losses run
20da45c
@ArdtK
chore: small cleanup
a450bd3
@ArdtK
chore: small changes, add docstring
5dc4cd4
@ArdtK
chore: fix tests
3f86093
@ArdtK
chore: small changes
9cc580d
@ArdtK
test: adapt losses configs
d07a98d
@ArdtK
chore: restore graph_file_hazard
78bc2a6
@ArdtK
chore: copy static folder as well for avg_speed
fc2bbf0
@ArdtK
chore: add hazard section with wl_aggregate
20801ce
@ArdtK
test: correct name of resilience_curve csv
3303e1f
@Cham8920
updated network in test data
d1ac1dc
@ArdtK
Merge branch 'feat/595-adaptation-run-and-combine-losses-and-damages'…
1c46891 
… of https://github.com/Deltares/ra2ce into feat/595-adaptation-run-and-combine-losses-and-damages
@ArdtK
chore: calculate benefit for options
f6baae1
@ArdtK
chore: final changes
c8c5eb6
@ArdtK
chore: add TODOs
c05cdb6
@ArdtK ArdtK marked this pull request as ready for review December 3, 2024 15:23
Carsopre
Carsopre requested changes Dec 4, 2024
View reviewed changes
Copy link
Collaborator

@Carsopre Carsopre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to revise a few things, but in general I believe it does the work.

ra2ce/analysis/adaptation/adaptation.py Show resolved Hide resolved
ra2ce/analysis/adaptation/adaptation.py Show resolved Hide resolved
ra2ce/analysis/adaptation/adaptation.py Show resolved Hide resolved
ra2ce/analysis/adaptation/adaptation_option.py Show resolved Hide resolved
ra2ce/analysis/adaptation/adaptation_option.py
Comment on lines +122 to +124
_damages_config.config_data = replace_paths(
_damages_config.config_data, "damages"
)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this replacing of path an assumption?

ra2ce/analysis/adaptation/adaptation_option.py Show resolved Hide resolved
ra2ce/analysis/adaptation/adaptation_option.py Show resolved Hide resolved
ra2ce/analysis/analysis_config_data/analysis_config_data.py Show resolved Hide resolved
ra2ce/analysis/losses/time_values/time_values_reader.py Show resolved Hide resolved
tests/analysis/adaptation/test_adaptation.py Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Carsopre Carsopre Carsopre requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Adaptation: run and combine Losses and Damages for BAU and other options
3 participants
@ArdtK @Carsopre @Cham8920