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

Additions for #327 - Enable DesignCosts in WeightedCost #413

Merged
merged 54 commits into from
Aug 1, 2024

Conversation

BradyPlanden
Copy link
Member

@BradyPlanden BradyPlanden commented Jul 18, 2024

Description

This PR implements the following:

  • Integrates DesignCost class into WeightedCost structure with support for sharing a single problem class
  • Adds error checking for different problem class, with updates to optimiser.minimising
  • Retains or updates variable names for clarity / alignment across the codebase
  • Adds integration tests for WeightedCost with design and fitting problems

Issue reference

Fixes #327

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.

Base automatically changed from 327-weighted-cost to develop July 22, 2024 09:54
@NicolaCourtier NicolaCourtier linked an issue Jul 22, 2024 that may be closed by this pull request
# 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
Copy link

codecov bot commented Jul 22, 2024

Codecov Report

Attention: Patch coverage is 99.13793% with 1 line in your changes missing coverage. Please review.

Project coverage is 98.24%. Comparing base (8dca6d1) to head (1bedcd7).
Report is 560 commits behind head on develop.

Files with missing lines Patch % Lines
pybop/problems/design_problem.py 94.11% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #413      +/-   ##
===========================================
- Coverage    98.28%   98.24%   -0.04%     
===========================================
  Files           46       46              
  Lines         2907     2910       +3     
===========================================
+ Hits          2857     2859       +2     
- Misses          50       51       +1     

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

@BradyPlanden BradyPlanden changed the title Suggestions for #327 Additions for #327 - Enable DesignCosts in WeightedCost Jul 22, 2024
Copy link
Member

@NicolaCourtier NicolaCourtier left a comment

Choose a reason for hiding this comment

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

I made some changes to clarify when each problem should be evaluated. Please check and see what you think! I also updated the output messages in spme_max_energy.py.

Happy to discuss further if you like, or proceed with this version.

@BradyPlanden
Copy link
Member Author

Hi @NicolaCourtier - I've made a few updates, happy to discuss if you see anything worriesome, otherwise I'll merge :)

@NicolaCourtier NicolaCourtier self-requested a review August 1, 2024 08:52
Copy link
Member

@NicolaCourtier NicolaCourtier left a comment

Choose a reason for hiding this comment

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

Please just amend the attribute description, otherwise looks good to me, thanks!

pybop/costs/_weighted_cost.py Outdated Show resolved Hide resolved
pybop/costs/_weighted_cost.py Show resolved Hide resolved
# Conflicts:
#	pybop/costs/_likelihoods.py
#	pybop/costs/_weighted_cost.py
#	pybop/costs/base_cost.py
#	pybop/costs/design_costs.py
@BradyPlanden
Copy link
Member Author

Decreased coverage due to flaky test is fixed in #411. Merging as is.

@BradyPlanden BradyPlanden merged commit 5b163ae into develop Aug 1, 2024
29 of 30 checks passed
@BradyPlanden BradyPlanden deleted the 327b-weighted-cost branch August 1, 2024 16:43
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.

Add a WeightedCost class
2 participants