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

Rework math handling #639

Merged
merged 25 commits into from
Sep 30, 2024
Merged

Rework math handling #639

merged 25 commits into from
Sep 30, 2024

Commits on Jul 15, 2024

  1. isolate _def_path, scenario overrides, and math object (not yet integ… 

    …rated)
    @irm-codebase
    irm-codebase committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    a47e1df View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Extract math documentation from model file

    @irm-codebase
    irm-codebase committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    d2d70ce View commit details
    Browse the repository at this point in the history

  2. add model math tests

    @irm-codebase
    irm-codebase committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    3f44bbf View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Improve model math tests, remove duplicates from test_core_model

    @irm-codebase
    irm-codebase committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    28f8ebb View commit details
    Browse the repository at this point in the history

  2. extended validation function, added logging tests

    @irm-codebase
    irm-codebase committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    2872060 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Add dict method, remove underscores in attributes

    @irm-codebase
    irm-codebase committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    31de31b View commit details
    Browse the repository at this point in the history

  2. code now uses new math object (tests exected to fail)

    @irm-codebase
    irm-codebase committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    a6e8c7c View commit details
    Browse the repository at this point in the history

  3. all tests passing

    @irm-codebase
    irm-codebase committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    fda1ea0 View commit details
    Browse the repository at this point in the history

  4. fix docs creation, add changelog

    @irm-codebase
    irm-codebase committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    480bcc1 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. removed _model_def_dict

    @irm-codebase
    irm-codebase committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    6e3e334 View commit details
    Browse the repository at this point in the history

  2. Trigger CI (and minor logging string fix)

    @brynpickering
    brynpickering committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    8da8dac View commit details
    Browse the repository at this point in the history

  3. PR: now CalliopeMath, better backend init, small fixes

    @irm-codebase
    irm-codebase committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    6730409 View commit details
    Browse the repository at this point in the history

  4. PR: comment improvements

    @irm-codebase
    irm-codebase committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    09b09f7 View commit details
    Browse the repository at this point in the history

  5. update changelog

    @irm-codebase
    irm-codebase committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    1530b8f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'rework-def-dict' into rework-math

    @irm-codebase
    irm-codebase committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    41b7fe5 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge branch 'main' into rework-math

    @brynpickering
    brynpickering committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    434236d View commit details
    Browse the repository at this point in the history

  2. Post-merge fixes

    @brynpickering
    brynpickering committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    06efe33 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Move math to build step; fix clustering issues 

    - clustering had representative days that didn't represent themselves
    @brynpickering
    brynpickering committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    a2ee8f0 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. PR improvements: math components in CalliopeMath, small fixes (#665)

    @irm-codebase
    irm-codebase authored Aug 19, 2024
    Configuration menu
    Copy the full SHA
    3284a55 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge branch 'main' into rework-math

    @brynpickering
    brynpickering committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    a615252 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge remote-tracking branch 'origin/main' into rework-math

    @irm-codebase
    irm-codebase committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    d024911 View commit details
    Browse the repository at this point in the history

  2. pd.notnull -> pd.notna

    @brynpickering
    brynpickering committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    ccf0950 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into rework-math

    @brynpickering
    brynpickering committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    ab757e5 View commit details
    Browse the repository at this point in the history

  4. Run pre-commit on _all_ files

    @brynpickering
    brynpickering committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    bff333e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into rework-math

    @brynpickering
    brynpickering committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    d923a4a View commit details
    Browse the repository at this point in the history