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.

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

Align optimisation result #334

Merged
merged 8 commits into from
Jun 7, 2024
Merged

Align optimisation result #334

merged 8 commits into from
Jun 7, 2024

Conversation

NicolaCourtier
Copy link
Member

Description

Move the Result class into base_optimiser.py and use it to align the results returned by all optimisers.

Issue reference

Fixes #271

Review

Before you mark your PR as ready for review, please ensure that you've considered the following:

  • Updated the CHANGELOG.md in reverse chronological order (newest at the top) with a concise description of the changes, including the PR number.
  • Noted any breaking changes, including details on how it might impact existing functionality.

Type of change

  • New Feature: A non-breaking change that adds new functionality.
  • Optimization: A code change that improves performance.
  • Examples: A change to existing or additional examples.
  • Bug Fix: A non-breaking change that addresses an issue.
  • Documentation: Updates to documentation or new documentation for new features.
  • Refactoring: Non-functional changes that improve the codebase.
  • Style: Non-functional changes related to code style (formatting, naming, etc).
  • Testing: Additional tests to improve coverage or confirm functionality.
  • Other: (Insert description of change)

Key checklist:

  • No style issues: $ pre-commit run (or $ nox -s pre-commit) (see CONTRIBUTING.md for how to set this up to run automatically when committing locally, in just two lines of code)
  • All unit tests pass: $ nox -s tests
  • The documentation builds: $ nox -s doctest

You can run integration tests, unit tests, and doctests together at once, using $ nox -s quick.

Further checks:

  • Code is well-commented, especially in complex or unclear areas.
  • Added tests that prove my fix is effective or that my feature works.
  • Checked that coverage remains or improves, and added tests if necessary to maintain or increase coverage.

Thank you for contributing to our project! Your efforts help us to deliver great software.

Copy link

codecov bot commented May 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.24%. Comparing base (1020428) to head (ca82f4c).
Report is 2 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #334      +/-   ##
===========================================
+ Coverage    97.07%   97.24%   +0.16%     
===========================================
  Files           41       41              
  Lines         2328     2322       -6     
===========================================
- Hits          2260     2258       -2     
+ Misses          68       64       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@NicolaCourtier NicolaCourtier marked this pull request as ready for review May 23, 2024 21:24
@NicolaCourtier NicolaCourtier mentioned this pull request Jun 6, 2024
15 tasks
Copy link
Member

@BradyPlanden BradyPlanden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @NicolaCourtier, this is a nice addition! It's a great step towards a larger Results class to be used across the library. A few comments to look at :)

pybop/optimisers/base_optimiser.py Outdated Show resolved Hide resolved
examples/standalone/optimiser.py Outdated Show resolved Hide resolved
pybop/optimisers/scipy_optimisers.py Outdated Show resolved Hide resolved
Copy link
Member

@BradyPlanden BradyPlanden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can combine the imports, otherwise LGTM! Thanks @NicolaCourtier :)

examples/standalone/optimiser.py Outdated Show resolved Hide resolved
pybop/optimisers/base_pints_optimiser.py Outdated Show resolved Hide resolved
pybop/optimisers/scipy_optimisers.py Outdated Show resolved Hide resolved
Co-authored-by: Brady Planden <55357039+BradyPlanden@users.noreply.github.com>
@NicolaCourtier NicolaCourtier merged commit bd733a8 into develop Jun 7, 2024
29 checks passed
@NicolaCourtier NicolaCourtier deleted the 271-optim-result branch June 7, 2024 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update optimisation class to return type dict
2 participants