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

Fix/573 update rfid c in the graph simple after segmentation #22

Merged
merged 104 commits into from
Sep 9, 2024
Merged

Fix/573 update rfid c in the graph simple after segmentation #22

merged 104 commits into from
Sep 9, 2024

Conversation

sahand-asgarpour
Copy link
Owner

Issue addressed

Solves Deltares#573 main ra2ce

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 and others added 29 commits July 24, 2024 16:45
@sahand-asgarpour
chore: _ removed for the fixtures
98d80b9
@sahand-asgarpour
chore: fixtures moved to congtest + factory test in new module
5d830dd
@sahand-asgarpour
test: get_wl _prefix is added
8bb32cc
@sahand-asgarpour
test: get_wl _prefix is modified to include expected prefixes
d3b2637
@sahand-asgarpour
test: get_wl _prefix fixed
bd3c2f3
@sahand-asgarpour
chore: gitignor updated
2722712
@sahand-asgarpour
Merge branch 'master' of https://github.com/Deltares/ra2ce
d50ba16
@sahand-asgarpour
Merge branch 'master' into feat/518-calculate-eal
c2674de
@sahand-asgarpour
chore: minor
45f7b4b
@sahand-asgarpour
chore: minor
86678a3
@sahand-asgarpour
chore: usage of abstract classes corrected and dependencies are updat…
1f510ca 
…ed accordingly
@Cham8920
Changed get_disruption to calculate_distruption
5a46327
@sahand-asgarpour
Merge branch 'master' into feat/518-calculate-eal
6b43901
@sahand-asgarpour
chore: id test updated
2851cf6
@sahand-asgarpour
chore: conftest created at the lowest level. id naming also changed
cb67a3d
@sahand-asgarpour
chore: prefix replaced with abbr
c64b8ea
@sahand-asgarpour
chore: properties defined in init
b044f17
@sahand-asgarpour
chore: _return_periods property and read-only (annotated) return_peri…
fa61102 
…ods property
@sahand-asgarpour
chore: fixture added to the naming and reference
94efa73
@ArdtK
Merge branch 'master' into feat/518-calculate-eal
aa85149
@sahand-asgarpour
chore: performance_key set once
709065b
@sahand-asgarpour
Merge branch 'master' into feat/518-calculate-eal
10ed002
@sahand-asgarpour
fix: average renamed (#572)
1baffce
@sahand-asgarpour
Merge branch 'master' into feat/518-calculate-eal
6b37ff1
@sahand-asgarpour
fix: lanes added
6219863
@sahand-asgarpour
feat: raise error if not all attributes_to_include in the dgf
aff082f
@sahand-asgarpour
feat: reverted the raise error if not all attributes_to_include in th…
10c88b9 
…e dgf
@sahand-asgarpour
feat: function created and used in nut to update rfid_c
0d356d3
@sahand-asgarpour
feat: function used in osm_network_wrapper in nut to update rfid_c
1267962
@sahand-asgarpour sahand-asgarpour merged commit 5c6e054 into sahand-asgarpour:master Sep 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sahand-asgarpour @Cham8920 @ArdtK