Skip to content

Improve steric-clash repair and add placement/repair tuning knobs - #549

Merged
rolan701 merged 8 commits into
mainfrom
steric-hindrance-updates
Aug 18, 2026
Merged

rolan701 merged 8 commits into
mainfrom
steric-hindrance-updates

Conversation

@rolan701

@rolan701 rolan701 commented Aug 18, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • Consolidates bad-state detection (overlap/ordering/ring-piercing) in generate_complex into shared _bad_state_summary/_hopeless helpers
  • Adds tunable knobs for beam-search placement (placement_beam_topk, placement_early_exit_score) and repair behavior (repair_ff_steps, max_ring_piercing_retries, bail_if_still_bad_after_repair)
  • run_sterics_check gains make_figure to skip plotting when only clash/severity data is needed
  • Fixes __main__ block to correctly unpack the tuple returned by generate_complex

Test plan

  • Run existing structure-generation tests to confirm no regression
  • Spot-check RuL6 complex generation with run_sterics=True and make_figure=False

Adds explicit control over beam-search placement, force-field repair
steps, and ring-piercing retry behavior in generate_complex, and
consolidates bad-state detection (overlap/ordering/ring-piercing)
into shared helpers. run_sterics_check gains make_figure to skip
plotting when only the clash/severity data is needed.
Comment thread molSimplify/Scripts/enhanced_structgen.py Fixed
Comment thread molSimplify/Scripts/enhanced_structgen.py Fixed
Comment thread molSimplify/Scripts/enhanced_structgen.py Fixed
pre-commit-ci Bot and others added 3 commits August 18, 2026 02:46
…lized local variable'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
…lized local variable'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Comment thread molSimplify/Scripts/enhanced_structgen.py Fixed
Comment thread molSimplify/Scripts/enhanced_structgen.py Fixed
rolan701 and others added 2 commits August 17, 2026 23:06
…lized local variable'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
…tiple times'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Comment thread molSimplify/Scripts/enhanced_structgen.py Fixed
rolan701 and others added 2 commits August 17, 2026 23:51
…tiple times'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Replace `float | None` (requires Python 3.10) with Optional[float] --
this also broke doctest collection under Python 3.8 (TypeError at
import time). Also initialize per_atom_ff_force/optimized2 with safe
fallbacks in enforce_metal_ligand_distances_and_optimize so the return
statement is always well-defined even when constrain/final_relax are
disabled, per CodeQL's possibly-unbound-variable alerts.
@codecov

codecov Bot commented Aug 18, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 33 lines in your changes missing coverage. Please review.
✅ Project coverage is 40.65%. Comparing base (5545cc8) to head (30c9a84).
⚠️ Report is 17 commits behind head on main.

Files with missing lines Patch % Lines
molSimplify/Scripts/enhanced_structgen.py 0.00% 33 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #549      +/-   ##
==========================================
+ Coverage   40.26%   40.65%   +0.38%     
==========================================
  Files          93       93              
  Lines       30325    30349      +24     
==========================================
+ Hits        12211    12339     +128     
+ Misses      18114    18010     -104     
Flag Coverage Δ
unittests 40.65% <0.00%> (+0.38%) ⬆️

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

☔ View full report in Codecov by Harness.
📢 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.

@rolan701
rolan701 merged commit db09e06 into main Aug 18, 2026
9 of 10 checks passed
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.

2 participants