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

Additions for #327 - Enable DesignCosts in WeightedCost #413

Merged
merged 54 commits into from
Aug 1, 2024
Merged

Additions for #327 - Enable DesignCosts in WeightedCost #413

merged 54 commits into from
Aug 1, 2024

Commits on May 16, 2024

  1. Add a WeightedCost

    @NicolaCourtier
    NicolaCourtier committed May 16, 2024
    Configuration menu
    Copy the full SHA
    7d3051a View commit details
    Browse the repository at this point in the history

  2. Fix setting

    @NicolaCourtier
    NicolaCourtier committed May 16, 2024
    Configuration menu
    Copy the full SHA
    7898e88 View commit details
    Browse the repository at this point in the history

  3. Add tests

    @NicolaCourtier
    NicolaCourtier committed May 16, 2024
    Configuration menu
    Copy the full SHA
    7a9bcc4 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored May 17, 2024
    Configuration menu
    Copy the full SHA
    39524d3 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored May 23, 2024
    Configuration menu
    Copy the full SHA
    400c875 View commit details
    Browse the repository at this point in the history

  2. Update base_cost.py

    @NicolaCourtier
    NicolaCourtier committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a1c2ec6 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Update CHANGELOG.md

    @NicolaCourtier
    NicolaCourtier committed May 24, 2024
    Configuration menu
    Copy the full SHA
    501064d View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored May 28, 2024
    Configuration menu
    Copy the full SHA
    1fbcf11 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    61b4bbd View commit details
    Browse the repository at this point in the history

  2. Update imports

    @NicolaCourtier
    NicolaCourtier authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    5fa3db4 View commit details
    Browse the repository at this point in the history

  3. Update x0 to [0.5]

    @NicolaCourtier
    NicolaCourtier committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    23b1099 View commit details
    Browse the repository at this point in the history

  4. style: pre-commit fixes

    @pre-commit-ci
    pre-commit-ci[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    d6708d6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    ff93f70 View commit details
    Browse the repository at this point in the history

  6. style: pre-commit fixes

    @pre-commit-ci
    pre-commit-ci[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    37ac6e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Update spm_weighted_cost.py

    @NicolaCourtier
    NicolaCourtier committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    1c540d9 View commit details
    Browse the repository at this point in the history

  2. Update TypeError with test

    @NicolaCourtier
    NicolaCourtier committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3a9e10a View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    449a753 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    41acda3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    bfaba72 View commit details
    Browse the repository at this point in the history

  3. Update spm_weighted_cost.py

    @NicolaCourtier
    NicolaCourtier committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    be1c566 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Update evaluate and _evaluate

    @NicolaCourtier
    NicolaCourtier committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    f608aa7 View commit details
    Browse the repository at this point in the history

  2. Pass current_sensitivities to MAP

    @NicolaCourtier
    NicolaCourtier committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    68b763d View commit details
    Browse the repository at this point in the history

  3. Add test_weighted_design_cost

    @NicolaCourtier
    NicolaCourtier committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    8c2632d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    ea655f0 View commit details
    Browse the repository at this point in the history

  5. style: pre-commit fixes

    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    c189d7a View commit details
    Browse the repository at this point in the history

  6. Add evaluate back into GaussianLogLikelihood

    @NicolaCourtier
    NicolaCourtier committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    2b1ae4c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    939b364 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    eb5ce52 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    626a070 View commit details
    Browse the repository at this point in the history

  2. Update to super()

    @NicolaCourtier
    NicolaCourtier authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    8c41327 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    12daca8 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge branch 'develop' into 327-weighted-cost

    @NicolaCourtier
    NicolaCourtier authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    dee6cbe View commit details
    Browse the repository at this point in the history

  2. style: pre-commit fixes

    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    80a803e View commit details
    Browse the repository at this point in the history

  3. Update prediction to self._current_prediction

    @NicolaCourtier
    NicolaCourtier committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f185523 View commit details
    Browse the repository at this point in the history

  4. Update y to self._current_prediction

    @NicolaCourtier
    NicolaCourtier committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    23b77e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Update cost_list to args

    @NicolaCourtier
    NicolaCourtier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    5157a8d View commit details
    Browse the repository at this point in the history

  2. Remove repeated line

    @NicolaCourtier
    NicolaCourtier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    3e220b1 View commit details
    Browse the repository at this point in the history

  3. Add descriptions

    @NicolaCourtier
    NicolaCourtier committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    95600be View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. refactor: Integrates DesignProblems into weighted_cost structure, add… 

    …s error checking for different problem class, general refactor for improved clarity
    @BradyPlanden
    BradyPlanden committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    8c7dddb View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. feat: adds support for single DesignProblem optimisation, fixes for m… 

    …inimising, adds integration tests
    @BradyPlanden
    BradyPlanden committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    132f83c View commit details
    Browse the repository at this point in the history

  2. refactor: move WeightedCost into seperate file

    @BradyPlanden
    BradyPlanden committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    d739642 View commit details
    Browse the repository at this point in the history

  3. Merge branch '327-weighted-cost' into 327b-weighted-cost

    @BradyPlanden
    BradyPlanden committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    5b327d2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 327-weighted-cost

    @BradyPlanden
    BradyPlanden authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    766bd16 View commit details
    Browse the repository at this point in the history

  5. Merge branch '327-weighted-cost' into 327b-weighted-cost

    @BradyPlanden
    BradyPlanden authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c03b4f6 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. fix: add MAP catches for weightedcost implementation, update .gitignore

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

  2. Merge branch 'refs/heads/develop' into 327b-weighted-cost 

    # Conflicts:
#	examples/scripts/spm_weighted_cost.py
#	pybop/costs/_likelihoods.py
#	pybop/costs/_weighted_cost.py
#	pybop/costs/base_cost.py
#	pybop/costs/fitting_costs.py
#	tests/unit/test_cost.py
    @BradyPlanden
    BradyPlanden committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    9aae101 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Clarify evaluation sequence

    @NicolaCourtier
    NicolaCourtier committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    589a5f6 View commit details
    Browse the repository at this point in the history

  2. Update spme_max_energy output

    @NicolaCourtier
    NicolaCourtier committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    deb4ebe View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. fix: catch update_capacity overwrite on super(), add UserWarning for … 

    …global update_capacity() usage, add tests for side-effects on underlying objects
    @BradyPlanden
    BradyPlanden committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    f2bcfec View commit details
    Browse the repository at this point in the history

  2. fix: update warning location

    @BradyPlanden
    BradyPlanden committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    1899c0b View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. feat: adds @Property for new WeightedCost attributes, adds to docstring

    @BradyPlanden
    BradyPlanden committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    6f46164 View commit details
    Browse the repository at this point in the history

  2. Suggestions from review

    @BradyPlanden
    BradyPlanden committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    0e503ae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/develop' into 327b-weighted-cost 

    # Conflicts:
#	pybop/costs/_likelihoods.py
#	pybop/costs/_weighted_cost.py
#	pybop/costs/base_cost.py
#	pybop/costs/design_costs.py
    @BradyPlanden
    BradyPlanden committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    e0d01c7 View commit details
    Browse the repository at this point in the history

  4. Add changlog entry

    @BradyPlanden
    BradyPlanden committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    1bedcd7 View commit details
    Browse the repository at this point in the history