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

Add support for multiple occurrences of design matrix #9583

Merged
merged 1 commit into from
Jan 14, 2025

Conversation

xjules
Copy link
Contributor

@xjules xjules commented Dec 18, 2024

Issue
Resolves #9532

Approach
All occurrences of design matrices will be merged into one upon initialization.

(Screenshot of new behavior in GUI if applicable)

  • PR title captures the intent of the changes, and is fitting for release notes.
  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.
  • Make sure unit tests pass locally after every commit (git rebase -i main --exec 'pytest tests/ert/unit_tests -n logical -m "not integration_test"')

When applicable

  • When there are user facing changes: Updated documentation
  • New behavior or changes to existing untested code: Ensured that unit tests are added (See Ground Rules).
  • Large PR: Prepare changes in small commits for more convenient review
  • Bug fix: Add regression test for the bug
  • Bug fix: Create Backport PR to latest release

Copy link

codspeed-hq bot commented Dec 18, 2024

CodSpeed Performance Report

Merging #9583 will not alter performance

Comparing xjules:mult_dm (7774b35) with main (4480295)

Summary

✅ 24 untouched benchmarks

@codecov-commenter
Copy link

codecov-commenter commented Dec 19, 2024

Codecov Report

Attention: Patch coverage is 92.30769% with 2 lines in your changes missing coverage. Please review.

Project coverage is 91.73%. Comparing base (4480295) to head (7774b35).

Files with missing lines Patch % Lines
src/ert/config/design_matrix.py 89.47% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9583   +/-   ##
=======================================
  Coverage   91.73%   91.73%           
=======================================
  Files         426      426           
  Lines       26542    26567   +25     
=======================================
+ Hits        24348    24372   +24     
- Misses       2194     2195    +1     
Flag Coverage Δ
cli-tests 39.82% <80.76%> (+0.04%) ⬆️
everest-models-test 34.12% <19.23%> (-0.02%) ⬇️
gui-tests 74.28% <19.23%> (-0.07%) ⬇️
integration-test 37.95% <19.23%> (-0.01%) ⬇️
performance-tests 51.54% <19.23%> (-0.04%) ⬇️
test 39.47% <19.23%> (-0.03%) ⬇️
unit-tests 74.23% <88.46%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

- Add merging strategy for multiple design matrices in the config
- Add ui tests for multi dm occurence
@xjules xjules added the release-notes:new-feature Automatically categorise as new feature in release notes label Jan 13, 2025
@xjules xjules requested a review from larsevj January 13, 2025 11:28
errors.append(ErrorInfo(f"Error when merging design matrices {exc}!"))

pc_other = dm_other.parameter_configuration[DESIGN_MATRIX_GROUP]
pc_self = self.parameter_configuration[DESIGN_MATRIX_GROUP]
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it due to mypy that we go via pc_self instead of just appending to self.parameter_configuration?

Copy link
Contributor

@larsevj larsevj left a comment

Choose a reason for hiding this comment

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

🚀

@xjules xjules merged commit 2491185 into equinor:main Jan 14, 2025
43 checks passed
@xjules xjules deleted the mult_dm branch January 14, 2025 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:new-feature Automatically categorise as new feature in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for multiple instances of DESIGN_MATRIX in the config
3 participants