This repository was archived by the owner on Jul 10, 2024. It is now read-only.
Open
Conversation
…antFix # Conflicts: # pom.xml # src/main/java/lychi/LyChIStandardizer.java
|
I merged with latest master and resolved all conflicts. All tests pass in java 8. I also bumped the version from 0.6 to 0.7.1 since the version of master is now 0.7.0 |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
This fix incorporates the fixes for graph invariant issues found in the following pull requests:
#18
#17
More information on those parts can be found in those individual pull requests. This particular change, however, mostly concerns a fix for issues like the following:
The above 2 structures currently get the same lychi-3. This happens because of the way layer-3 is generated, which is by walking the graph in a specific order specified by a modified label-agnostic graph invariant value. The issue is that the original graph invariant values for the atoms are based on the framework, but ties are broken by using the atom number (as discussed in a previous pull request). The tie breaking is actually not done as a strict tie breaker, but by multiplying the invariant number by the atomic numbers. This means that order can be shifted around for the same framework even when there is no framework symmetry involved. In the case above, the multiplying the nitrogen (7) by its graph invariant number ends up giving the same order of atom labels for both, which is how the lychi-3 is calculated.
This fix piggy-backs on the fix from pull 18, but decides to not try to preserve old Lychis, as that seems to not be possible while still fixing this issue. A new test was added to ensure that this works for this case, and a few other tests needed to be modified to not expect the exact lychi that it produced before.
CAUTION! This will change a VERY large portion of lychi values for structures. If this version is used, it can not be assumed compatible with any other lychi previously made.