Skip to content

Fix 1-4 interpolation for core-dummy interactions#1856

Merged
IAlibay merged 16 commits intomainfrom
interpolation_fix
Apr 28, 2026
Merged

Fix 1-4 interpolation for core-dummy interactions#1856
IAlibay merged 16 commits intomainfrom
interpolation_fix

Conversation

@jthorton
Copy link
Copy Markdown
Collaborator

@jthorton jthorton commented Feb 23, 2026

This fixes the treatment of 1-4 interactions between core and dummy atoms and extensive tests to the hybrid topology factory to ensure they are handled correctly.

Checklist

  • All new code is appropriately documented (user-facing code must have complete docstrings).
  • Added a news entry, or the changes are not user-facing.
  • Ran pre-commit: you can run pre-commit locally or comment on this PR with pre-commit.ci autofix.

Manual Tests: these are slow so don't need to be run every commit, only before merging and when relevant changes are made (generally at reviewer-discretion).

Developers certificate of origin

@jthorton
Copy link
Copy Markdown
Collaborator Author

pre-commit.ci autofix

@jthorton
Copy link
Copy Markdown
Collaborator Author

The 4 tests introduced to show that 1-4 interactions between the core-dummy atoms has failed as expected https://github.com/OpenFreeEnergy/openfe/actions/runs/22312817357/job/64549319567?pr=1856#step:11:6546. Now turning on the setting by default which should fix the tests.

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 23, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 90.55%. Comparing base (82558ea) to head (0d3ad8d).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1856      +/-   ##
==========================================
- Coverage   94.72%   90.55%   -4.18%     
==========================================
  Files         216      216              
  Lines       19546    20480     +934     
==========================================
+ Hits        18515    18545      +30     
- Misses       1031     1935     +904     
Flag Coverage Δ
fast-tests 90.55% <100.00%> (?)
slow-tests ?

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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jthorton jthorton mentioned this pull request Feb 25, 2026
7 tasks
@hannahbaumann hannahbaumann self-assigned this Feb 26, 2026
@atravitz atravitz added this to the 1.11.0 milestone Apr 9, 2026
@IAlibay IAlibay self-assigned this Apr 21, 2026
Copy link
Copy Markdown
Contributor

@hannahbaumann hannahbaumann left a comment

Choose a reason for hiding this comment

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

Thanks @jthorton , lgtm! Thank you for adding all those thorough tests, I tried to go through all of them, but since it's so many I may have missed something, so it will be great to have another set of eyes on this!

Comment thread docs/guide/protocols/relativehybridtopology.rst Outdated
Comment thread docs/guide/protocols/relativehybridtopology.rst Outdated
Copy link
Copy Markdown
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

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

Just realising it's on the 1.11 milestone - going to put a block until the results come through. It's possible we won't be able to include it in this release (purely a "too many things to do before the free energy workshop")

@atravitz atravitz mentioned this pull request Apr 27, 2026
10 tasks
@IAlibay
Copy link
Copy Markdown
Member

IAlibay commented Apr 27, 2026

@IAlibay
Copy link
Copy Markdown
Member

IAlibay commented Apr 27, 2026

Copy link
Copy Markdown
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

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

This looks good to me, thanks! Could you just address @hannahbaumann's comments please?

Sorry it took so long for me to wrap my head around the exceptions stuff - it makes sense now.

Comment thread docs/guide/protocols/relativehybridtopology.rst Outdated
Comment thread docs/guide/protocols/relativehybridtopology.rst Outdated
Comment thread src/openfe/protocols/openmm_rfe/equil_rfe_settings.py
@jthorton
Copy link
Copy Markdown
Collaborator Author

pre-commit.ci autofix

Comment thread docs/guide/protocols/relativehybridtopology.rst Outdated
Comment thread news/interpolation_setting_update.rst Outdated
Copy link
Copy Markdown
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

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

Two very small things, otherwise lgtm! (edit: merged as discussed on slack)

Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown

No API break detected ✅

@IAlibay IAlibay merged commit 7bc31e1 into main Apr 28, 2026
10 checks passed
@IAlibay IAlibay deleted the interpolation_fix branch April 28, 2026 14:05
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.

4 participants