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

Chore/315 indirect analyses implement the same interface #320

Merged
merged 43 commits into from
Mar 14, 2024
Merged

Chore/315 indirect analyses implement the same interface #320

merged 43 commits into from
Mar 14, 2024

Conversation

ArdtK
Copy link
Contributor

@ArdtK ArdtK commented Mar 11, 2024 •
edited
Loading

Outline of change

  • add a protocol analysis_indirect_protocol for the indirect analyses
  • extend/improve the analysis_factory for the indirect analyses
  • break down indirect_analyses in files per analysis type and remove it finally
    • existing losses is expanded with an execute() to comply with analysis_indirect_protocol
    • refactor origin_closest_destination analyzer to match the input that an analysis provides
    • tests are refactored accordingly
  • class HazardNames is added to better manage the hazard names
  • expanded HazardFiles with a classmethod

@ArdtK ArdtK linked an issue Mar 11, 2024 that may be closed by this pull request
Indirect analyses implement the same interface #315
Closed
15 tasks
ArdtK added 24 commits March 11, 2024 14:46
@ArdtK
chore: reorganize imports, add type hints
aa10082
@ArdtK
chore: improve indirect_analysis_protocol
eb2fd8f
@ArdtK
chore: adjust indirect runner for new collection
568f8f8
@ArdtK
chore: add indirect analyses as separate files
c4e36e2
@ArdtK
chore: reorganize hazard files/names
a3e4947
@ArdtK
test: fix losses tests
bcaef6b
@ArdtK
chore: fix losses module
d32be90
@ArdtK
chore: fix OD
ec6af50
@ArdtK
test: expand test collection with indirect analyses
d345b27
@ArdtK
chore: add docstring and test for hazard_files
11d7624
@ArdtK
test: add test for hazard_names
11ac897
@ArdtK
chore: add docstring to hazard_names
b02fcc6
@ArdtK
chore: add license to hazard_files
8be76e8
@ArdtK
chore: solve bug
4ed322c
@ArdtK
test: remove unused imports
673ac69
@ArdtK
test: improve fixture
1fb3fb3
@ArdtK
test: improve fixture
7e7f591
@ArdtK
Merge branch 'master' into chore/315-indirect-analyses-implement-the-…
b1df1d1 
…same-interface
@ArdtK
test: improve fixture
4560962
@ArdtK
chore: rework indirect analysis protocol and classes for use of hazar…
22a0ab4 
…d_names
@ArdtK
test: fix unittests
5eec801
@ArdtK
chore: remove unnecessary lambda with parameterless init
f376511
@ArdtK
chore: improve multi link redundancy
67f8a60
@ArdtK
chore: solve bug in single link redundancy
63bdb0b
@ArdtK ArdtK requested a review from Carsopre March 13, 2024 15:00
Carsopre
Carsopre requested changes Mar 13, 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.

In general awesome work, let's try to adding icing to the cake 👍

ra2ce/analysis/analysis_factory.py Outdated Show resolved Hide resolved
ra2ce/analysis/analysis_collection.py Outdated Show resolved Hide resolved
ra2ce/analysis/analysis_factory.py Show resolved Hide resolved
ra2ce/analysis/analysis_factory.py Outdated Show resolved Hide resolved
ra2ce/analysis/direct/__init__.py Outdated Show resolved Hide resolved
tests/analysis/indirect/test_losses.py Show resolved Hide resolved
tests/analysis/test_analysis_collection.py Outdated Show resolved Hide resolved
tests/analysis/test_analysis_collection.py Outdated Show resolved Hide resolved
tests/analysis/test_analysis_factory.py Outdated Show resolved Hide resolved
tests/network/hazard/test_hazard_files.py Outdated Show resolved Hide resolved
@ArdtK ArdtK marked this pull request as ready for review March 14, 2024 08:38
@Carsopre Carsopre merged commit a274fa5 into master Mar 14, 2024
3 checks passed
@Carsopre Carsopre deleted the chore/315-indirect-analyses-implement-the-same-interface branch March 14, 2024 10:40
Carsopre added a commit that referenced this pull request Apr 12, 2024
@Carsopre
Merge pull request #320 from Deltares/chore/315-indirect-analyses-imp…
8a4d703 
…lement-the-same-interface

Chore/315 indirect analyses implement the same interface
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Carsopre Carsopre Carsopre approved these changes

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

Successfully merging this pull request may close these issues.

Indirect analyses implement the same interface
2 participants
@ArdtK @Carsopre