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

add at_reg_id_event #642

Merged
merged 22 commits into from
Mar 1, 2023
Merged

add at_reg_id_event #642

merged 22 commits into from
Mar 1, 2023

Commits on Feb 5, 2023

  1. add at_reg_id_event

    @aleeciu
    aleeciu committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    7b01fed View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. remove as attr, add admin_0 option, add unit test

    @aleeciu
    aleeciu committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    f0096d7 View commit details
    Browse the repository at this point in the history

  2. work with agg regs and not exposure

    @aleeciu
    aleeciu committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    a93474f View commit details
    Browse the repository at this point in the history

  3. grammar

    @aleeciu
    aleeciu committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    09254d1 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Update climada/engine/impact.py 

    Co-authored-by: Lukas Riedel <34276446+peanutfun@users.noreply.github.com>
    @aleeciu @peanutfun
    aleeciu and peanutfun authored Feb 27, 2023
    Configuration menu
    Copy the full SHA
    4236025 View commit details
    Browse the repository at this point in the history

  2. Update climada/engine/impact.py 

    Co-authored-by: Lukas Riedel <34276446+peanutfun@users.noreply.github.com>
    @aleeciu @peanutfun
    aleeciu and peanutfun authored Feb 27, 2023
    Configuration menu
    Copy the full SHA
    af28fef View commit details
    Browse the repository at this point in the history

  3. Update climada/engine/impact.py 

    Co-authored-by: Lukas Riedel <34276446+peanutfun@users.noreply.github.com>
    @aleeciu @peanutfun
    aleeciu and peanutfun authored Feb 27, 2023
    Configuration menu
    Copy the full SHA
    cff3318 View commit details
    Browse the repository at this point in the history

  4. add haz indexes as df indexes

    @aleeciu
    aleeciu committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    f96ae47 View commit details
    Browse the repository at this point in the history

  5. raise error when no imp_mat

    @aleeciu
    aleeciu committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    bdcf0d4 View commit details
    Browse the repository at this point in the history

  6. Update climada/engine/impact.py 

    Co-authored-by: Lukas Riedel <34276446+peanutfun@users.noreply.github.com>
    @aleeciu @peanutfun
    aleeciu and peanutfun authored Feb 27, 2023
    Configuration menu
    Copy the full SHA
    c99ce83 View commit details
    Browse the repository at this point in the history

  7. update docstring

    @aleeciu
    aleeciu committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    8cc4769 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. update test

    @aleeciu
    aleeciu committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    17d6d5e View commit details
    Browse the repository at this point in the history

  2. Update climada/engine/impact.py 

    Co-authored-by: Chahan M. Kropf <chahan.kropf@usys.ethz.ch>
    @aleeciu @chahank
    aleeciu and chahank authored Feb 28, 2023
    Configuration menu
    Copy the full SHA
    f4ea128 View commit details
    Browse the repository at this point in the history

  3. delete commented code

    @aleeciu
    aleeciu committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    afb5f3b View commit details
    Browse the repository at this point in the history

  4. use np.array and cntries iso_codes

    @aleeciu
    aleeciu committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    f262bb1 View commit details
    Browse the repository at this point in the history

  5. remove commented code

    @aleeciu
    aleeciu committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    5fcf72b View commit details
    Browse the repository at this point in the history

  6. Only compute unique aggregation regions once

    @peanutfun
    peanutfun committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    6cce7ce View commit details
    Browse the repository at this point in the history

  7. Split TestImpactReg into three test cases

    @peanutfun
    peanutfun committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    cf9c79c View commit details
    Browse the repository at this point in the history

  8. Format new code with black

    @peanutfun
    peanutfun committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    c84deb0 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Apply suggestions for docstring 

    Co-authored-by: Emanuel Schmid <51439563+emanuel-schmid@users.noreply.github.com>
    @peanutfun @emanuel-schmid
    peanutfun and emanuel-schmid authored Mar 1, 2023
    Configuration menu
    Copy the full SHA
    1188c45 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/impact_at_reg_id

    @peanutfun
    peanutfun committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    4a9b991 View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @peanutfun
    peanutfun committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    57053be View commit details
    Browse the repository at this point in the history