Commit Graph

45 Commits

Author SHA1 Message Date
Greg Landrum
5bb4522810 Fix github1928 (#1946)
* add the failing test and some debugging info

* fixes #1928
Stop allowing rused-ring aromaticity if the rings share more than one bond
2018-07-14 12:32:38 -04:00
Greg Landrum
d9b06a733b Fixes #1936 (#1945)
* Fixes #1936
doctests of the book still need to be verified

* a fix that is related to #1940

* add test for what was actually reported
2018-07-05 11:53:54 -04:00
Boran Adas
8452ec59f9 Fix for issue #1730 (#1792)
* Fix for issue #1730

setAromaticity() now works even if there are aromatic atoms present and the relevat test case is added

* Removed setaromaticity flag
2018-03-25 06:38:34 +02:00
Greg Landrum
5c21c0ad67 Fixes #1703 (#1714)
* does not actually work

* all tests pass;
Fixes #1703

* make that a bit cleaner
2018-01-08 20:06:42 -05:00
Greg Landrum
ba12d98ad0 Removes ATOM/BOND_SPTR in boost::graph in favor of raw pointers (#1713)
* Removes ATOM/BOND_SPTR in boost::graph in favor of raw pointers

* Actually delete atoms and bonds...

* RWMol::clear now calls destroy to handle atom/bond deletion

* Changes broken Atom lookup for windows/gcc

* Adds tests for running with valgrind

* Adds test designed for valgrind and molecule deletions

* Removes RNG, actually tests bond deletions

* update swig wrappers

* deal with most recent changes on the main branch
2018-01-07 14:19:47 -05:00
Greg Landrum
a58f9bef8e Add an MDL aromaticity model (Fixes #1622) (#1693)
* backup

* Add a couple of more tests and an exclusion for triple bonds.

* expose the MDL aromaticity model to python and test it.

* exocyclic bonds should not “steal” electrons in the MDL model

* backup (partial) update for aromaticity model documentation

* add examples to testGithub1622 for aromatic and nonaromatic compounds

* updates to aromaticity model and docs based on additional information from @bannanc

* some additional examples from @bannanc

* add rule to allow exocyclic multiple bonds to disqualify an atom.

* minor doc update

* address some review comments
2017-12-21 08:39:49 -05:00
Greg Landrum
f6ced134f0 a number of other small changes from manually reviewing the PR 2017-04-22 17:24:57 +02:00
Greg Landrum
915cf08faa run clang-format with c++-11 style over that 2017-04-22 17:19:10 +02:00
Greg Landrum
7c0bb0b743 clang-tidy output 2017-04-22 17:09:24 +02:00
Greg Landrum
270f7b76e5 Partial support for reading CXSMILES (#1237)
* add a SmilesParserParams object to prepare for this

* add a SmilesParserParams object to prepare for this

* add tests for the SmilesParseParmas

* support name parsing, should it be the default?

* rename CXNSmiles to CXSmiles;
add a spirit parser for CXSmiles coordinate that is at least syntax correct

* abandon boost::spirit for now; crude atom token parser

* support params in smiles parser (not tested, may not build)

* can read coords and atom labels along with mol names; crude, but works

* read coordinate bonds

* remove some compiler warnings with VS2015

* remove a bunch of compiler warnings on windows

* remove more warnings on windows

* remove more warnings on windows

* backup commit: first pass at parsing query features

* radical spec parsing

* handle attachment points using atom mapping

* switch to a named property for atom labels

* fix handling of the "A" atom query

* add functions to construct A and Q queries (needs more work)

* fix a problem created while cleaning up warnings earlier

* add some additional convenience functions for making generic atoms.
Still need M and to recognize these while writing CXSMILES

* add M queries; update some tests

* fix a linux compile problem

* get the cxsmiles stuff working in python; basic testing

* support "M" in CXSMILES
2017-01-31 13:50:36 -05:00
Greg Landrum
452ed7156f Add support for a simplified aromaticity model. (#942)
* first pass

* Fixes #623

* fix a merge problem

* move the aromaticity perception to a helper fn

* python doc update

* replace setSimpleAromaticity() with a parameter to setAromaticity()

* add simple test for the custom aromaticity function
2016-06-17 17:48:20 -04:00
Greg Landrum
6a4a032e92 Fixes #518 2016-03-21 16:57:12 +01:00
kelley
5dbec2fe85 Adds rdcasts where appropriate 2015-11-29 17:52:27 -05:00
Greg Landrum
e08e0d16d8 first pass, using google style 2015-11-14 14:58:11 +01:00
Brian Kelley
daa7e62258 Fixes signed conversion issues (use rdcast) 2015-10-18 15:16:38 -04:00
Brian Kelley
5f59333a56 Silences unused parameters 2015-10-18 14:02:29 -04:00
Paolo Tosco
c6362c8930 - fixed indentation 2015-07-16 20:10:21 +01:00
Paolo Tosco
565819a97f - removed spurious debug code 2015-07-16 20:09:12 +01:00
Paolo Tosco
48396640c1 - fixed lack of tropylium/ciclopropenyl cation aromaticity perception
- added a test for allyl cation conjugation
- added a test for tropylium/ciclopropenyl cation aromaticity
2015-07-16 20:05:46 +01:00
Paolo Tosco
27ce1daa1c - fixes lack of conjugation detection on allyl cations and the like 2015-07-16 18:56:02 +01:00
Greg Landrum
74125f685c Fixes #443 2015-03-05 06:38:38 +01:00
Greg Landrum
4363ac9338 Fixes #432 2015-02-21 08:15:58 +01:00
Brian Kelley
95a92282d1 Dictionary access is saniztized and optimized.
o rdkit gains a RDKit::common_properties namespace that contains common string value properties

 o Dict.h and below gain getPropIfPresent that attempts to retrieve a property and returns
  true/false on success or failure.  This is used to optimize access.

 o rdkit learns how to pass property keys by reference, not value.

A new namespace has been added to RDKit, common_properties
that contains the std::string values for commonly used
properties.  This helps to avoid typos in string values
but also avoids a creation of std::strings from character
values.  All accessors (has/get/clear and getPropIfPresent) now pass
the key by reference.

Additionally, getPropIfPresent removes the double lookup
of hasProp/getProp which can be a significant speedup
in the smiles and smarts parsers (10-20%)
2015-01-15 12:23:29 -05:00
Greg Landrum
0f92877061 stop messing up aromaticity and hybridization;
all tests pass, but this is definitely not the most efficient thing.
2013-11-30 08:07:09 +01:00
Greg Landrum
86b9e6b089 Fixes #72 2013-08-25 06:36:10 +02:00
Greg Landrum
6555d2062f more changes connected to sf.net issue 249 2012-09-16 05:40:17 +00:00
Greg Landrum
de2126b641 optimization work 2012-04-15 06:19:22 +00:00
Greg Landrum
f3fbef45c5 update copyright statements 2010-09-26 17:04:37 +00:00
Greg Landrum
052ec66542 cleanups:
remove x bit from headers and sources;
remove a couple empty files from Code/GraphMol
2010-09-08 04:25:57 +00:00
Greg Landrum
b78abe26d6 fix and test sf.net issue 2787221 2009-05-05 12:54:41 +00:00
Greg Landrum
e05580e495 This is a sizeable one: change the way BGL is used so that atoms and bonds are stored as bundled properties
instead of using the property map interface.
A nice side-effect is that the wart of having to use property maps to loop over bonds or atom neighbors
is now gone.
This potentially breaks lots of client C++ code.
2009-02-11 20:19:25 +00:00
Greg Landrum
c0e1ffdc65 fix and test Issue2313979 2008-12-02 08:50:51 +00:00
Greg Landrum
cb6982e9e0 not done, this is a backup commit 2008-12-02 07:01:46 +00:00
Greg Landrum
fc6c2b2f9a fixes to issues 2196817 and 2208994 2008-10-30 06:56:39 +00:00
Greg Landrum
6d3a9f6fb3 Check in a bunch of changes to fix radical handling.
These are connected to issues 2093420, 2091890, and 2091839
this still needs more testing.
2008-09-23 06:02:02 +00:00
Greg Landrum
cd97b8035b refactor the new radical-handling code to add a getNumRadicalElectrons()
method to Atom
2008-09-04 18:09:54 +00:00
Greg Landrum
4702ed3e20 partial fixes (not thoroughly tested, needing more cleanup) for bug 2091839; this mainly has to do with fixing the treatment of radicals 2008-09-04 13:02:07 +00:00
Greg Landrum
3729140375 additional tests for sf.net bug 1934360.
fix and test bug 1940646.
a bit of refactoring of the aromaticity code
2008-04-12 13:49:04 +00:00
Greg Landrum
820749851b clean up the keulization code a bit; more can be done here
initial fix and test for sf.net bug 1934360. more tests needed,
so this is basically a backup commit
2008-04-11 19:49:31 +00:00
Greg Landrum
5400bafb7d support Se and Te as potentially aromatic atoms
(sf.net bug 1932365, http://sourceforge.net/tracker/index.php?func=detail&aid=1932365&group_id=160139&atid=814650 )
2008-04-06 06:11:58 +00:00
Greg Landrum
a788e29511 merge the changes from the CanonicalizerRework30Nov branch in.
The changes are revs 451:498.
2008-01-30 14:53:04 +00:00
Greg Landrum
8b4accb050 improve support for dummy atoms
this was sf.net feature request 1868217:
https://sourceforge.net/tracker/index.php?func=detail&aid=1868217&group_id=160139&atid=814653
2008-01-10 06:39:33 +00:00
Greg Landrum
7041ae233e handle the NoImplicit flag properly
update aromaticity to require unsaturation at single-atom donors
test the above two things
This is not necessarily completely stable, but all current tests pass
(once obvious changes have been made). We will just have to see where
the aromaticity changes cause trouble going forward.
2006-09-19 20:20:09 +00:00
Greg Landrum
5d03333c22 setup svn keywords (should have done this before import... grn) 2006-05-06 22:54:39 +00:00
Greg Landrum
75a79b6327 initial import 2006-05-06 22:20:08 +00:00