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/518 calculate eal #531

Merged
merged 100 commits into from
Sep 10, 2024
Merged

Feat/518 calculate eal #531

merged 100 commits into from
Sep 10, 2024

Conversation

sahand-asgarpour
Copy link
Contributor

@sahand-asgarpour sahand-asgarpour commented Jul 17, 2024 •
edited
Loading

Issue addressed

Solves #518

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?

Explain how you addressed the resolution of the related issue, what choices you made and why.

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.

@sahand-asgarpour
chore: renaming representative_damage_percentile
0588fdb
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
21dce5c
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
504b581
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
a5af064
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
1f3fb33
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
23812db
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
fba88b0
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
4e5a648
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
d514459
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
4efcb50
@sahand-asgarpour
feat: risk_calculation_factory/base and its inherited classes are cre…
d35208f 
…ated. risk_calculation_mode/year added to the analysis_config
@sahand-asgarpour
feat: risk_calculation_factory returns the correct RiskCalculationBas…
9a4b685 
…e classes
@sahand-asgarpour
feat: self._to_integrate = self.rework_damage_data() added to each ri…
5509bc3 
…sk_calculation class
@sahand-asgarpour
chore: renaming to _rework_damage_data
0b7c476
@sahand-asgarpour
feat: minor + creating the risk column in the self.result
29c0339
@sahand-asgarpour
feat: aggregate_wl is added to analysis_config_data; can be read from…
089b8a3 
… ini and config.
@sahand-asgarpour
chore: aggregate_wl removed form AnalysisSectionLosses, because aggre…
75bc74d 
…gate_wl is now part of AnalysisConfigData
@sahand-asgarpour
chore: self.analysis_config.config_data.aggregate_wl is used in _get_…
49e091c 
…disrupted_criticality_analysis_results
@sahand-asgarpour
chore: aggregate_wl_suffix added to filter on the criticality_results…
5daae6d 
… that have any EV or RP columns with aggregate_wl_suffix of above aggregate_wl.
@sahand-asgarpour
chore: analysis_config_data_reader updated
133a8db
@sahand-asgarpour
chore: analysis_config_data_reader updated
293bbee
@sahand-asgarpour
chore: re package imported correctly
960faf2
@sahand-asgarpour
chore: re package imported correctly
0cb9dab
@sahand-asgarpour
chore: removed aggregate_wl from test analysis.ini
876df04
@sahand-asgarpour
chore: aggregate_wl added to the config of the test
68e1dbd
@sahand-asgarpour
feat: EventTypeEnum NONE added and analysis.ini is updated for correc…
922e7d2 
…ting failing tests
@sahand-asgarpour
feat: aggregate_wl is removed from analysis.ini for correcting failin…
28bd6e6 
…g tests
@sahand-asgarpour
feat: aggregate_wl is removed from analysis.ini for correcting failin…
930d5b0 
…g tests
@sahand-asgarpour
chore: error numbers are reduced. event_type default has become NONE …
1811c17 
…instead of INVALID. The latter used to give error.
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
60702fe
@sahand-asgarpour sahand-asgarpour added enhancement New feature or request Launch labels Jul 25, 2024
ArdtK
ArdtK requested changes Aug 12, 2024
View reviewed changes
Copy link
Contributor

@ArdtK ArdtK left a comment

Choose a reason for hiding this comment

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

I did look at the changes since my last review. I couldn't check when Carles did his last review.

tests/network/network_config_data/test_get_wl_prefix.py Outdated Show resolved Hide resolved
ra2ce/analysis/losses/losses_base.py Outdated Show resolved Hide resolved
ra2ce/analysis/losses/losses_base.py Outdated Show resolved Hide resolved
ra2ce/analysis/losses/risk_calculation/risk_calculation_base.py Show resolved Hide resolved
tests/conftest.py Outdated Show resolved Hide resolved
tests/conftest.py Outdated Show resolved Hide resolved
@ArdtK ArdtK self-requested a review August 13, 2024 15:29
Carsopre
Carsopre reviewed Aug 21, 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.

That the tests give now a timeout should be an indication that something has not been done correctly (performance sinkhole). But in general the remarks I sent have been addressed.

ra2ce/analysis/losses/losses_base.py Outdated Show resolved Hide resolved
ra2ce/analysis/losses/losses_base.py Show resolved Hide resolved
@sahand-asgarpour
Copy link
Contributor Author

That the tests give now a timeout should be an indication that something has not been done correctly (performance sinkhole). But in general the remarks I sent have been addressed.

Thanks for the update. I do not know what is not implemented correctly. Locally the tests that lead to TC timeout error run successfully.

@sahand-asgarpour sahand-asgarpour self-assigned this Sep 4, 2024
@sahand-asgarpour sahand-asgarpour added this to the Launch 2024 milestone Sep 4, 2024
@sahand-asgarpour @Carsopre
Fix/573 update rfid c in the graph simple after segmentation (#574)
1a86765 
* fix: lanes added

* feat: raise error if not all attributes_to_include in the dgf

* feat: reverted the raise error if not all attributes_to_include in the dgf

* feat: function created and used in nut to update rfid_c

* feat: function used in osm_network_wrapper in nut to update rfid_c

* Update ra2ce/network/networks_utils.py

chore: inline comments changed

Co-authored-by: Carles S. Soriano Pérez <carles.sorianoperez@deltares.nl>

* chore: apply the comments on a previously made function + using deepcopy()

* chore: use of deepcopy is corrected

---------

Co-authored-by: Carles S. Soriano Pérez <carles.sorianoperez@deltares.nl>
@sahand-asgarpour sahand-asgarpour merged commit 2882876 into master Sep 10, 2024
3 checks passed
@sahand-asgarpour sahand-asgarpour deleted the feat/518-calculate-eal branch September 10, 2024 09:05
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

@ArdtK ArdtK ArdtK approved these changes

Assignees

@sahand-asgarpour sahand-asgarpour

Labels
enhancement New feature or request
Projects
None yet
Milestone
Launch 2024
Development

Successfully merging this pull request may close these issues.

Calculate EAL
4 participants
@sahand-asgarpour @Carsopre @ArdtK @Cham8920