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

Update optim.log to store cost #335

Merged
merged 16 commits into from
Jun 17, 2024
Merged

Update optim.log to store cost #335

merged 16 commits into from
Jun 17, 2024

Conversation

NicolaCourtier
Copy link
Member

Description

Update the log attribute of the optimisation object to store the cost at each iteration as well as the parameter values. Use these cost values in the convergence plot instead of recomputing them.

Issue reference

Fixes #165

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 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.47%. Comparing base (aa38b95) to head (0bd0315).
Report is 733 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #335      +/-   ##
===========================================
+ Coverage    97.33%   97.47%   +0.13%     
===========================================
  Files           42       42              
  Lines         2404     2418      +14     
===========================================
+ Hits          2340     2357      +17     
+ Misses          64       61       -3     

☔ 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 24, 2024 11:50
@NicolaCourtier
Copy link
Member Author

Merge after #334

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 Nicola! One area that needs a bit of attention, otherwise a nice addition :)

@@ -70,6 +70,21 @@ def plot2d(
for j, yj in enumerate(y):
costs[j, i] = cost(np.array([xi, yj]))

if plot_optim:
Copy link
Member

Choose a reason for hiding this comment

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

Is the aim of this codeblock to append the locations the optimiser visited to the cost landscapes? At the moment, it breaks the gradient plots below it due to cost function being overwritten as a np.array, and as such isn't used in the plot2d object.

I added the below to line 127 of unit/test_plots.py to catch the error.

# Plot gradient cost landscape
pybop.plot2d(optim, gradient=True, steps=5)

Copy link
Member Author

Choose a reason for hiding this comment

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

Great catch! Yes, it should have been costs not cost... and thanks for the test.

From further testing, I've seen that the extra points (and nans) can modify the contour plot in unexpected ways. So I have implemented interpolation to avoid the nans and made this feature optional with the switch use_optim_log.

pybop/plotting/plot2d.py Outdated Show resolved Hide resolved
NicolaCourtier and others added 3 commits June 12, 2024 11:35
Co-authored-by: Brady Planden <55357039+BradyPlanden@users.noreply.github.com>
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.

LGTM, thanks @NicolaCourtier!

@NicolaCourtier NicolaCourtier merged commit 4dfdd1d into develop Jun 17, 2024
29 checks passed
@NicolaCourtier NicolaCourtier deleted the 165-optim-trace branch July 4, 2024 13:34
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.

Store optimisation trace if not converged
2 participants