remove duplicated parameter definitions in fragment_probes.param, protein-allhdg5-4.param and protein-CG-Martini-2-2.param#1590
remove duplicated parameter definitions in fragment_probes.param, protein-allhdg5-4.param and protein-CG-Martini-2-2.param#1590amjjbonvin wants to merge 12 commits into
fragment_probes.param, protein-allhdg5-4.param and protein-CG-Martini-2-2.param#1590Conversation
…aram file 19,110 DIHEdral entries were exact reverse-direction duplicates (A-B-C-D listed alongside D-C-B-A with identical parameters). Deduplicated by keeping only the first occurrence of each canonical atom-quadruple/parameter pair, reducing the file from 47,165 to 28,055 lines with no change in force-field content. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…am files Deduplicated reverse-direction parameter entries (A-B = B-A for BOND, A-B-C = C-B-A for ANGLE, A-B-C-D = D-C-B-A for DIHEDRAL) across three files: - protein-CG-Martini-2-2.param: removed 1470 ANGLE duplicates - fragment_probes.param: removed 41 DIHEDRAL duplicates - protein-allhdg5-4.param: removed 1 ANGLE + 2 DIHEDRAL duplicates All removed entries had identical parameters to their retained counterparts. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…/haddock3 into martini-param-cleanup
|
According to an analysis script, there are 1005 force field parameters that have changed after the cleanup. Among the 1005 changes, unique old parameters: unique new parameters: See the latest commit on https://github.com/sjdv1982/haddock3/tree/martini-param-cleanup for details. WARNING: analysis script is AI-generated, may contain nonsense. |
rvhonorato
left a comment
There was a problem hiding this comment.
this PR has +3 -20,633 line changes and two completely different scopes;
Cleaned up various param files in the cns/toppar directory, removing duplications.
This is lacking a proper justification, this code has been in production for many years and it's unclear how or why this potentially disrupting change is beneficial
Corrected the bug in
cgtoaa.cnsregarding the reading of the cg-to-aa restraints for the conversion from CG to AA
This is a proper bug with inverted logic and the fix is correct.
However these should not be in the same PR, changing 20+K lines together with a one line simple bugfix is bad practice, please open two separate PRs
|
Ok will do - but until then we have a broken CG code …
And if you read the info and issue you will understand why so many lines were removed - the reason for doing that is it avoids recompiling CNS because we hit the parameter limits
|
Looking at the timestamps the bug was introduced in 0d50d36 which was 59 days ago - meaning its broken for almost 2 months and I did not see any other issue being raised about it. You can decide if the urgency is worth breaking best-practices.
The issue states "Cleaning up will reduce the file sizes" Looking at the different in file sizes between the branches: It does not mention recompilation and parameter limits, please include this in the description. |
fragment_probes.param, protein-allhdg5-4.param and protein-CG-Martini-2-2.param
You are about to submit a new Pull Request. Before continuing make sure you read the contributing guidelines.
Checklist
CHANGELOG.mdis updated to incorporate new changesSummary of the Pull Request
cns/toppardirectory, removing duplications.The number of duplications was especially large for the Martini CG param file due to some previous scripted param generation.
Related Issues
#1589
Additional Info
For BONDs, A-B is equivalent to B-A
For ANGLEs, A-B-C is equivalent to C-B-A
For DIHEdrals: A-B-C-D is equivalent to D-C-B-A
Reducing the size of the number of parameters in the various force field by removing unnecessary duplications will avoid problems with parameter array sizes in CNS (which is the past required recompilation of the code)