-
Notifications
You must be signed in to change notification settings - Fork 227
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
Chemical identity comparison for Molecules and Species #1329
Commits on May 17, 2019
-
Refactor some class properties using @Property decorator
More pythonic and prevents extra getter/setter functions from cluttering the namespace.
Configuration menu - View commit details
-
Copy full SHA for 3da3c0e - Browse repository at this point
Copy the full SHA 3da3c0eView commit details -
Refactor Molecule SMILES and InChI attributes
Allow instantiation using either SMILES or InChI Change SMILES and InChI to all lowercase for easier typing Make smiles and inchi read only properties that generate and save the respective identifiers to private attributes
Configuration menu - View commit details
-
Copy full SHA for db1e492 - Browse repository at this point
Copy the full SHA db1e492View commit details -
Configuration menu - View commit details
-
Copy full SHA for aeaf3b5 - Browse repository at this point
Copy the full SHA aeaf3b5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3594fc5 - Browse repository at this point
Copy the full SHA 3594fc5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 010513e - Browse repository at this point
Copy the full SHA 010513eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1b9884b - Browse repository at this point
Copy the full SHA 1b9884bView commit details -
Add strict argument for isomorphism comparison
For strict=False, ignores electrons (i.e. bond order, radicals, lone pairs, etc.) Only implemented for Molecule isomorphism, exceptions raised in other cases For atoms, strict argument is added to the `equivalent` method For bonds, strict argument is handled within vf2
Configuration menu - View commit details
-
Copy full SHA for 3d3473f - Browse repository at this point
Copy the full SHA 3d3473fView commit details -
Configuration menu - View commit details
-
Copy full SHA for da870ca - Browse repository at this point
Copy the full SHA da870caView commit details -
Remove generate_res argument from Species.isIsomorphic
Because its functionality is replaced by the strict argument
Configuration menu - View commit details
-
Copy full SHA for e36c78e - Browse repository at this point
Copy the full SHA e36c78eView commit details -
Rename isomorphic_species_lists to same_species_lists
Also add strict argument which is passed to isIsomorphic
Configuration menu - View commit details
-
Copy full SHA for 4422e9c - Browse repository at this point
Copy the full SHA 4422e9cView commit details -
Configuration menu - View commit details
-
Copy full SHA for f2a2296 - Browse repository at this point
Copy the full SHA f2a2296View commit details -
Refactor CERM.checkForExistingSpecies using strict=False isomorphism
Since this option allows us to compare resonance structures directly, we don't need to worry about nonreactive resonance structures or aromatic resonance structures. Also, the return value of checkForExistingSpecies is reduced to a single value, since returning whether or not the species was found is redundant with returning the species itself.
Configuration menu - View commit details
-
Copy full SHA for 75da1f3 - Browse repository at this point
Copy the full SHA 75da1f3View commit details -
Refactor product checking in __generateReactions
No need to ensure species - the reactions will always contain Molecules at this point, so either Molecule or Species objects are acceptable for the product list to compare with Aromatic resonance structure generation can be omitted by using the strict=False option, which neglects electrons during the isomorphism comparison
Configuration menu - View commit details
-
Copy full SHA for de012ad - Browse repository at this point
Copy the full SHA de012adView commit details -
Revise test for prod_resonance option for generating reactions
Remove checks that the product list is converted in place to Species objects, since that step was removed
Configuration menu - View commit details
-
Copy full SHA for 9e8a491 - Browse repository at this point
Copy the full SHA 9e8a491View commit details -
Add strict option to Graph.isMappingValid
Similar to strict option for isomorphism, setting strict=False ignores electrons and bond orders for the comparison, which is useful for comparing different resonance structures
Configuration menu - View commit details
-
Copy full SHA for 7b4604e - Browse repository at this point
Copy the full SHA 7b4604eView commit details -
Add strict argument to isIdentical methods
Of Molecule, Species, and Reaction, which is passed to Graph.isMappingValid
Configuration menu - View commit details
-
Copy full SHA for 9052975 - Browse repository at this point
Copy the full SHA 9052975View commit details -
Do not generate resonance structures for degeneracy determination
Instead, use the strict=False option to ignore resonance issues Change ensure_species to not generate resonance structures by default Add call to ensure_independent_atom_ids in addReverseAttribute because the changes to resonance structure generation means that products may not necessarily have proper atom IDs
Configuration menu - View commit details
-
Copy full SHA for 78f8a2d - Browse repository at this point
Copy the full SHA 78f8a2dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4084b1e - Browse repository at this point
Copy the full SHA 4084b1eView commit details -
Enable Species instantiation by SMILES or InChI argument
Add SMILES property and unit tests
Configuration menu - View commit details
-
Copy full SHA for 27baa4e - Browse repository at this point
Copy the full SHA 27baa4eView commit details -
Fix reaction degeneracy bug with keep_isomorphic argument
In certain situations, we would call ensure_species with keep_isomorphic=False, which would ultimately result in wrong degeneracy values. This fixes that oversight and makes sure that keep_isomorphic=True when generating reactions. A unit test is also added.
Configuration menu - View commit details
-
Copy full SHA for b3ff5c5 - Browse repository at this point
Copy the full SHA b3ff5c5View commit details