Code

Feat/518 calculate eal#21

Code

Merged

sahand-asgarpour merged 99 commits intosahand-asgarpour:mastersahand-asgarpour/ra2ce_graz:masterfrom Deltares:feat/518-calculate-ealDeltares/ra2ce:feat/518-calculate-ealCopy head branch name to clipboardSep 9, 2024

+1,528-950

Commits

Commits on Jun 18, 2024

• chore: renaming representative_damage_percentile

  sahand-asgarpour

  committed
  0588fdb

  Copy full SHA for 0588fdb

Commits on Jun 26, 2024

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  21dce5c

  Copy full SHA for 21dce5c

Commits on Jun 27, 2024

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  504b581

  Copy full SHA for 504b581

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  a5af064

  Copy full SHA for a5af064

Commits on Jun 28, 2024

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  1f3fb33

  Copy full SHA for 1f3fb33

Commits on Jul 5, 2024

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  23812db

  Copy full SHA for 23812db

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  fba88b0

  Copy full SHA for fba88b0

Commits on Jul 11, 2024

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  4e5a648

  Copy full SHA for 4e5a648

Commits on Jul 12, 2024

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  d514459

  Copy full SHA for d514459

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  4efcb50

  Copy full SHA for 4efcb50

Commits on Jul 16, 2024

• feat: risk_calculation_factory/base and its inherited classes are created. risk_calculation_mode/year added to the analysis_config

  sahand-asgarpour

  committed
  d35208f

  Copy full SHA for d35208f

• feat: risk_calculation_factory returns the correct RiskCalculationBase classes

  sahand-asgarpour

  committed
  9a4b685

  Copy full SHA for 9a4b685

• feat: self._to_integrate = self.rework_damage_data() added to each risk_calculation class

  sahand-asgarpour

  committed
  5509bc3

  Copy full SHA for 5509bc3

• chore: renaming to _rework_damage_data

  sahand-asgarpour

  committed
  0b7c476

  Copy full SHA for 0b7c476

• feat: minor + creating the risk column in the self.result

  sahand-asgarpour

  committed
  29c0339

  Copy full SHA for 29c0339

• feat: aggregate_wl is added to analysis_config_data; can be read from ini and config.

  sahand-asgarpour

  committed
  089b8a3

  Copy full SHA for 089b8a3

• chore: aggregate_wl removed form AnalysisSectionLosses, because aggregate_wl is now part of AnalysisConfigData

  sahand-asgarpour

  committed
  75bc74d

  Copy full SHA for 75bc74d

• chore: self.analysis_config.config_data.aggregate_wl is used in _get_disrupted_criticality_analysis_results

  sahand-asgarpour

  committed
  49e091c

  Copy full SHA for 49e091c

• chore: aggregate_wl_suffix added to filter on the criticality_results that have any EV or RP columns with aggregate_wl_suffix of above aggregate_wl.

  sahand-asgarpour

  committed
  5daae6d

  Copy full SHA for 5daae6d

• chore: analysis_config_data_reader updated

  sahand-asgarpour

  committed
  133a8db

  Copy full SHA for 133a8db

• chore: analysis_config_data_reader updated

  sahand-asgarpour

  committed
  293bbee

  Copy full SHA for 293bbee

• chore: re package imported correctly

  sahand-asgarpour

  committed
  960faf2

  Copy full SHA for 960faf2

• chore: re package imported correctly

  sahand-asgarpour

  committed
  0cb9dab

  Copy full SHA for 0cb9dab

• chore: removed aggregate_wl from test analysis.ini

  sahand-asgarpour

  committed
  876df04

  Copy full SHA for 876df04

• chore: aggregate_wl added to the config of the test

  sahand-asgarpour

  committed
  68e1dbd

  Copy full SHA for 68e1dbd

• feat: EventTypeEnum NONE added and analysis.ini is updated for correcting failing tests

  sahand-asgarpour

  committed
  922e7d2

  Copy full SHA for 922e7d2

• feat: aggregate_wl is removed from analysis.ini for correcting failing tests

  sahand-asgarpour

  committed
  28bd6e6

  Copy full SHA for 28bd6e6

• feat: aggregate_wl is removed from analysis.ini for correcting failing tests

  sahand-asgarpour

  committed
  930d5b0

  Copy full SHA for 930d5b0

• chore: error numbers are reduced. event_type default has become NONE instead of INVALID. The latter used to give error.

  sahand-asgarpour

  committed
  1811c17

  Copy full SHA for 1811c17

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  60702fe

  Copy full SHA for 60702fe

• Merge branch 'master' into chore/losses_aggregate_and_event_type_incorporation

  sahand-asgarpour

  committed
  def3676

  Copy full SHA for def3676

• Merge branch 'master' into feat/518-calculate-eal

  sahand-asgarpour

  committed
  707228d

  Copy full SHA for 707228d

• Merge remote-tracking branch 'origin/feat/518-calculate-eal' into chore/losses_aggregate_and_event_type_incorporation

  sahand-asgarpour

  committed
  91dbec2

  Copy full SHA for 91dbec2

Commits on Jul 17, 2024

• chore: getting the return_periods is revised to get the numbers in the column names

  sahand-asgarpour

  committed
  3ab2eea

  Copy full SHA for 3ab2eea

• chore: cut_from_year rework function is updated to return correct _to_integrate

  sahand-asgarpour

  committed
  20db693

  Copy full SHA for 20db693

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  5ada8b4

  Copy full SHA for 5ada8b4

• Merge branch 'master' into feat/518-calculate-eal

  sahand-asgarpour

  committed
  73d0a96

  Copy full SHA for 73d0a96

• test: updating test_calc_vlh for the cases with more than one event and different aggregate_wl[:2]

  sahand-asgarpour

  committed
  91a25f0

  Copy full SHA for 91a25f0

• test: resilience_curve updated. Test assertion added. expected_results updated to include the second resilience curve

  sahand-asgarpour

  committed
  e94aa56

  Copy full SHA for e94aa56

• test: resilience_curve updated and relevant tests are updated

  sahand-asgarpour

  committed
  096c573

  Copy full SHA for 096c573

• test: TestRiskCalculation created

  sahand-asgarpour

  committed
  08c91f6

  Copy full SHA for 08c91f6

• test: TestRiskCalculation minor change

  sahand-asgarpour

  committed
  0e6b2db

  Copy full SHA for 0e6b2db

Commits on Jul 18, 2024

• test: TestRiskCalculation expected data updated

  sahand-asgarpour

  committed
  17d836b

  Copy full SHA for 17d836b

Commits on Jul 22, 2024

• chore: Unused import removed + .gitignor update

  sahand-asgarpour

  committed
  e05c4bc

  Copy full SHA for e05c4bc

• Update tests/analysis/losses/resilience_curves/test_resilience_curves.py

  Show description for 7764d13
  

  sahand-asgarpour

  and

  ArdtK

  authored
  7764d13

  Copy full SHA for 7764d13

• chore: ABC inheritance removed

  sahand-asgarpour

  committed
  81b102f

  Copy full SHA for 81b102f

• Merge branch 'feat/518-calculate-eal' of https://github.com/Deltares/ra2ce into feat/518-calculate-eal

  sahand-asgarpour

  committed
  dc2d980

  Copy full SHA for dc2d980

• chore: attributes with type hints are added to the class and removed form __init__

  sahand-asgarpour

  committed
  c0204e3

  Copy full SHA for c0204e3

• chore: Unused imports are removed

  sahand-asgarpour

  committed
  4e4a616

  Copy full SHA for 4e4a616

• chore: passing key (k) is simplified

  sahand-asgarpour

  committed
  5ebb2e2

  Copy full SHA for 5ebb2e2

• chore: converted the function to an internal method of _get_to_integrate

  sahand-asgarpour

  committed
  451e6c3

  Copy full SHA for 451e6c3

• chore: inplace used instead of reassigning

  sahand-asgarpour

  committed
  6400047

  Copy full SHA for 6400047

• chore: conditions aggregated for readability

  sahand-asgarpour

  committed
  84760f0

  Copy full SHA for 84760f0

• chore: local variable is modified

  sahand-asgarpour

  committed
  fd6adce

  Copy full SHA for fd6adce

• chore: super.__init__ is removed and _rework_damage_data usage moved to the base class

  sahand-asgarpour

  committed
  f05f88c

  Copy full SHA for f05f88c

• chore: list made set + commented lines removed

  sahand-asgarpour

  committed
  c981900

  Copy full SHA for c981900

• chore: self._to_integrates is returned in the end and not set in the method

  sahand-asgarpour

  committed
  7874ab5

  Copy full SHA for 7874ab5

• chore: asssert exists() added

  sahand-asgarpour

  committed
  5f49114

  Copy full SHA for 5f49114

• chore: self._rework_damage_data() moved to _get_to_integrate

  sahand-asgarpour

  committed
  be6edab

  Copy full SHA for be6edab

• chore: self._rework_damage_data() returned

  sahand-asgarpour

  committed
  e424b3d

  Copy full SHA for e424b3d

• chore: self._rework_damage_data() does not return but set self._to_integrate

  sahand-asgarpour

  committed
  568b940

  Copy full SHA for 568b940

• chore: cut_from_year test updated + rework_to_integrate sets self._to_integrate

  sahand-asgarpour

  committed
  b897ad6

  Copy full SHA for b897ad6

• chore: cut_from_year test updated

  sahand-asgarpour

  committed
  08403cb

  Copy full SHA for 08403cb

• chore: cut_from_year test updated

  sahand-asgarpour

  committed
  7edffcf

  Copy full SHA for 7edffcf

• chore: cut_from_year test updated

  sahand-asgarpour

  committed
  b821409

  Copy full SHA for b821409

Commits on Jul 23, 2024

• test: factory test is made

  sahand-asgarpour

  committed
  63f55fc

  Copy full SHA for 63f55fc

• test: a fixture is added

  sahand-asgarpour

  committed
  9cb4b7f

  Copy full SHA for 9cb4b7f

• feat: get_suffix created for AggregateWlEnum

  sahand-asgarpour

  committed
  13695c0

  Copy full SHA for 13695c0

• chore: improvements for a correct encapsulation implementation

  sahand-asgarpour

  committed
  3b2225e

  Copy full SHA for 3b2225e

• chore: module test_risk_calculation_factory created

  sahand-asgarpour

  committed
  acd0c1b

  Copy full SHA for acd0c1b

Commits on Jul 24, 2024

• chore: __post_init__ removed

  sahand-asgarpour

  committed
  4690a22

  Copy full SHA for 4690a22

• chore: properties protected

  sahand-asgarpour

  committed
  368bd6d

  Copy full SHA for 368bd6d

• chore: integrate_df_trapezoidal updated to avoid changing self._to_integrate

  sahand-asgarpour

  committed
  3805f3e

  Copy full SHA for 3805f3e

• chore: test updated regarding the protected attributes

  sahand-asgarpour

  committed
  2b62b14

  Copy full SHA for 2b62b14

• chore: get_wl_prefix updated

  sahand-asgarpour

  committed
  9a92294

  Copy full SHA for 9a92294

• chore: _ removed for the fixtures

  sahand-asgarpour

  committed
  98d80b9

  Copy full SHA for 98d80b9

• chore: fixtures moved to congtest + factory test in new module

  sahand-asgarpour

  committed
  5d830dd

  Copy full SHA for 5d830dd

• test: get_wl _prefix is added

  sahand-asgarpour

  committed
  8bb32cc

  Copy full SHA for 8bb32cc

• test: get_wl _prefix is modified to include expected prefixes

  sahand-asgarpour

  committed
  d3b2637

  Copy full SHA for d3b2637

• test: get_wl _prefix fixed

  sahand-asgarpour

  committed
  bd3c2f3

  Copy full SHA for bd3c2f3

• chore: gitignor updated

  sahand-asgarpour

  committed
  2722712

  Copy full SHA for 2722712

• Merge branch 'master' of https://github.com/Deltares/ra2ce

  sahand-asgarpour

  committed
  d50ba16

  Copy full SHA for d50ba16

• Merge branch 'master' into feat/518-calculate-eal

  sahand-asgarpour

  committed
  c2674de

  Copy full SHA for c2674de

Commits on Jul 25, 2024

• chore: minor

  sahand-asgarpour

  committed
  45f7b4b

  Copy full SHA for 45f7b4b

• chore: minor

  sahand-asgarpour

  committed
  86678a3

  Copy full SHA for 86678a3

• chore: usage of abstract classes corrected and dependencies are updated accordingly

  sahand-asgarpour

  committed
  1f510ca

  Copy full SHA for 1f510ca

Commits on Aug 9, 2024

• Changed get_disruption to calculate_distruption

  Cham8920

  committed
  5a46327

  Copy full SHA for 5a46327

Commits on Aug 12, 2024

• Merge branch 'master' into feat/518-calculate-eal

  sahand-asgarpour

  authored
  6b43901

  Copy full SHA for 6b43901

Commits on Aug 13, 2024

• chore: id test updated

  sahand-asgarpour

  committed
  2851cf6

  Copy full SHA for 2851cf6

• chore: conftest created at the lowest level. id naming also changed

  sahand-asgarpour

  committed
  cb67a3d

  Copy full SHA for cb67a3d

• chore: prefix replaced with abbr

  sahand-asgarpour

  committed
  c64b8ea

  Copy full SHA for c64b8ea

• chore: properties defined in init

  sahand-asgarpour

  committed
  b044f17

  Copy full SHA for b044f17

• chore: _return_periods property and read-only (annotated) return_periods property

  sahand-asgarpour

  committed
  fa61102

  Copy full SHA for fa61102

• chore: fixture added to the naming and reference

  sahand-asgarpour

  committed
  94efa73

  Copy full SHA for 94efa73

• Merge branch 'master' into feat/518-calculate-eal

  ArdtK

  authored
  aa85149

  Copy full SHA for aa85149

Commits on Aug 28, 2024

• chore: performance_key set once

  sahand-asgarpour

  committed
  709065b

  Copy full SHA for 709065b

Commits on Sep 2, 2024

• Merge branch 'master' into feat/518-calculate-eal

  sahand-asgarpour

  authored
  10ed002

  Copy full SHA for 10ed002

Commits on Sep 5, 2024

• fix: average renamed (#572)

  sahand-asgarpour

  authored
  1baffce

  Copy full SHA for 1baffce

Commits on Sep 6, 2024

• Merge branch 'master' into feat/518-calculate-eal

  sahand-asgarpour

  authored
  6b37ff1

  Copy full SHA for 6b37ff1