-
Notifications
You must be signed in to change notification settings - Fork 142
fix(structure): reject atom-to-self bonds in BondList and chem_comp_bond writer #884
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
Open
haoyu-haoyu
wants to merge
2
commits into
biotite-dev:main
Choose a base branch
from
haoyu-haoyu:fix/bondlist-no-self-bond
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+67
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -1179,6 +1179,15 @@ def _set_intra_residue_bonds(array, atom_site): | |||||||||
| # Take the residue name from the first atom index, as the residue | ||||||||||
| # name is the same for both atoms, since we have only intra bonds | ||||||||||
| comp_id = array.res_name[bond_array[:, 0]] | ||||||||||
| # Two distinct atom indices sharing the same (res_name, atom_name) | ||||||||||
| # annotations would surface in chem_comp_bond as a self-bond on the | ||||||||||
| # chemical component, which is structurally invalid. | ||||||||||
| if np.any(atom_id_1 == atom_id_2): | ||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This condition as it is would also pass, if two different resides (different |
||||||||||
| raise BadStructureError( | ||||||||||
| "Structure contains bonded atoms sharing the same " | ||||||||||
| "(res_name, atom_name) annotations, which cannot be " | ||||||||||
| "written to chem_comp_bond without producing a self-bond" | ||||||||||
|
Comment on lines
+1187
to
+1189
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. More concise message.
Suggested change
|
||||||||||
| ) | ||||||||||
| _, unique_indices = np.unique( | ||||||||||
| np.stack([comp_id, atom_id_1, atom_id_2], axis=-1), axis=0, return_index=True | ||||||||||
| ) | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As explained above, I would move remove the
bond.pyxpart of this PR