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

598 adaptation calculate impact adaptation option for time horizon #617

Merged
merged 17 commits into from
Dec 6, 2024
Merged

598 adaptation calculate impact adaptation option for time horizon #617

merged 17 commits into from
Dec 6, 2024
+46 −2

Commits on Dec 2, 2024

  1. run_net_present_impact method

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    1a6fb17 View commit details
    Browse the repository at this point in the history

  2. chore/rename variable

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    a401930 View commit details
    Browse the repository at this point in the history

  3. chore/remove unrelated uncertainty files

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    6455bfa View commit details
    Browse the repository at this point in the history

  4. calculate net present impact for all options

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    8924ed6 View commit details
    Browse the repository at this point in the history

  5. chore/docstrings

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 2, 2024
    Configuration menu
    Copy the full SHA
    9d38d77 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2024

  1. Merge branch 'master' into 598-adaptation-calculate-impact-adaptation… 

    …-option-for-time-horizon
    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    2ea7abb View commit details
    Browse the repository at this point in the history

  2. create net_present_value factor

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    5e767b5 View commit details
    Browse the repository at this point in the history

  3. add test get_net_present_value_factor

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    e7a4210 View commit details
    Browse the repository at this point in the history

  4. run black

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    7c17669 View commit details
    Browse the repository at this point in the history

  5. run black again

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    298eb77 View commit details
    Browse the repository at this point in the history

  6. Update tests/analysis/adaptation/test_adaptation_option_collection.py 

    Co-authored-by: Carles S. Soriano Pérez <[email protected]>
    @MatthiasHauthDeltares @Carsopre
    MatthiasHauthDeltares and Carsopre authored Dec 6, 2024
    Configuration menu
    Copy the full SHA
    e14f581 View commit details
    Browse the repository at this point in the history

  7. Update ra2ce/analysis/adaptation/adaptation_option.py 

    Co-authored-by: Carles S. Soriano Pérez <[email protected]>
    @MatthiasHauthDeltares @Carsopre
    MatthiasHauthDeltares and Carsopre authored Dec 6, 2024
    Configuration menu
    Copy the full SHA
    5377073 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into 598-adaptation-calculate-impact-adaptation… 

    …-option-for-time-horizon
    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    4de7063 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/598-adaptation-calculate-impact-… 

    …adaptation-option-for-time-horizon' into 598-adaptation-calculate-impact-adaptation-option-for-time-horizon
    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    6c4ced0 View commit details
    Browse the repository at this point in the history

  10. chore/remove unncessary imports

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    fe29111 View commit details
    Browse the repository at this point in the history

  11. chore/remove parenthesis

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    6c68a58 View commit details
    Browse the repository at this point in the history

  12. chore/fix test

    @MatthiasHauthDeltares
    MatthiasHauthDeltares committed Dec 6, 2024
    Configuration menu
    Copy the full SHA
    b3123dc View commit details
    Browse the repository at this point in the history