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/592 adaptation create class adaptationoptioncollection #609

Merged
merged 36 commits into from
Nov 29, 2024
Merged

Feat/592 adaptation create class adaptationoptioncollection #609

merged 36 commits into from
Nov 29, 2024

Conversation

ArdtK
Copy link
Contributor

@ArdtK ArdtK commented Nov 27, 2024 •
edited
Loading

Issue addressed

Solves #590 and #592

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?

  • Create new classes with tests
  • Add a fixture with testdata and config for later use

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)

Add any additional notes or information that may be helpful.

@ArdtK ArdtK linked an issue Nov 27, 2024 that may be closed by this pull request
Adaptation: create class AdaptationOptionCollection #592
Closed
ArdtK and others added 25 commits November 27, 2024 16:52
@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 ArdtK marked this pull request as ready for review November 28, 2024 12:40
Carsopre
Carsopre previously requested changes Nov 29, 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.

Minor remarks to work before it can be merged.

ra2ce/analysis/adaptation/adaptation_option.py Outdated Show resolved Hide resolved
ra2ce/analysis/adaptation/adaptation_option_collection.py Outdated Show resolved Hide resolved
ra2ce/analysis/adaptation/adaptation_option_collection.py Outdated Show resolved Hide resolved
tests/analysis/adaptation/test_adaptation_option_collection.py Show resolved Hide resolved
@ArdtK ArdtK requested a review from Carsopre November 29, 2024 13:29
@ArdtK ArdtK dismissed Carsopre’s stale review November 29, 2024 14:11

Already discussed the options and don't want to create a pile of depending PRs

@ArdtK ArdtK merged commit f9c0175 into master Nov 29, 2024
0 of 2 checks passed
@ArdtK ArdtK deleted the feat/592-adaptation-create-class-adaptationoptioncollection branch November 29, 2024 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cham8920 Cham8920 Cham8920 left review comments

@MatthiasHauthDeltares MatthiasHauthDeltares MatthiasHauthDeltares approved these changes

@Carsopre Carsopre Awaiting requested review from Carsopre

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

Successfully merging this pull request may close these issues.

Adaptation: create class AdaptationOptionCollection
4 participants
@ArdtK @Carsopre @MatthiasHauthDeltares @Cham8920