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

Fix scaling reporting in Everest #8884

Merged
merged 3 commits into from
Oct 4, 2024
Merged

Fix scaling reporting in Everest #8884

merged 3 commits into from
Oct 4, 2024

Conversation

verveerpj
Copy link
Contributor

@verveerpj verveerpj commented Oct 4, 2024

Issue

  • Fixes an issue with the auto-scale option for controls: in absence of auto-scaling, auto-scale was still set in the ropt configuration (effectively doing nothing), which triggered unnecessary reporting of 'scaled results'.
  • Fix the tabular reporting in the presence of scaling. Previously controls were reported in scaled form, with an extra 'unscaled' table, while functions and constraints where reported unscaled with an extra 'scaled' column. Now controls are also reported unscaled, with an extra scaled column if needed, so all are consistent.

Approach

  • The auto-scaling of controls is fixed by detecting the case of no-scaling and making sure that no scaling settings are set in the ropt configuration.

  • The reporting of scaled/unscaled result was fixed in ropt, Everest needs only minor changes in the column definitions of the tabular reporting code. It requires an update of the dependency to ropt == 0.8.

  • 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

@verveerpj verveerpj added everest release-notes:bug-fix Automatically categorise as bug fix in release notes labels Oct 4, 2024
@verveerpj verveerpj self-assigned this Oct 4, 2024
@codecov-commenter
Copy link

codecov-commenter commented Oct 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.41%. Comparing base (d1c3a88) to head (4ec7b6b).

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8884      +/-   ##
==========================================
- Coverage   91.42%   91.41%   -0.01%     
==========================================
  Files         344      344              
  Lines       21120    21120              
==========================================
- Hits        19308    19306       -2     
- Misses       1812     1814       +2     
Flag Coverage Δ
cli-tests 39.61% <ø> (-0.01%) ⬇️
gui-tests 73.52% <ø> (-0.03%) ⬇️
performance-tests 50.14% <ø> (ø)
unit-tests 80.09% <ø> (ø)

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.

Copy link
Contributor

@DanSava DanSava left a comment

Choose a reason for hiding this comment

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

LGTM But with this the tests in bleeding will fail (once the everest tests and ert tests run together in komodo) without ropt[pandas] 0.8 in komodo-releases.

@verveerpj verveerpj merged commit 8fef8f4 into main Oct 4, 2024
57 checks passed
@verveerpj verveerpj deleted the everest-fixes branch October 4, 2024 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
everest release-notes:bug-fix Automatically categorise as bug fix in release notes
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants