Commit Graph

6024 Commits

Author SHA1 Message Date
Greg Landrum
89813494b7 undo that last change. try adding zlib from conda 2019-10-06 05:39:57 +02:00
Greg Landrum
67c7415c81 try using vcpkg to install zlib
no reason to think that this will actually work, but we can always try
2019-10-06 05:30:11 +02:00
Greg Landrum
76dcca2e17 Update vs_build_java.yml 2019-10-05 11:29:27 +02:00
greg landrum
2ef2b4c88d this builds for me on windows. Does it work on azure devops? 2019-10-05 10:46:11 +02:00
Greg Landrum
35b67b26e9 fix zlib linking? 2019-10-05 08:43:57 +02:00
Greg Landrum
b48840a32c typo 2019-10-05 08:25:06 +02:00
Greg Landrum
0d8e19f18e first attempt at a Azure DevOps windows java build 2019-10-05 08:23:52 +02:00
Ric
f5f9c50035 update coordgen (#2686) 2019-10-04 05:25:55 +02:00
Greg Landrum
49d247ea8c Fixes #2677 (#2687) 2019-10-03 18:07:26 -04:00
Greg Landrum
942c0b7f2a Adds additional capabilities to the minimal JS wrapper (#2676)
* add functions for ketcher

* support highlighting bonds from SSS

* add get_substruct_matches
2019-10-03 18:00:49 -04:00
Steve Roughley
710bdfa60b Added AtomComparator.AtomCompareAnyHeavyAtom and test cases to FMCS code (#2656)
* Added AtomComparator.AtomCompareAnyHeavyAtom and test cases to FMCS code

* Added AtomComparator.AtomCompareAnyHeavyAtom

* Added AtomComparator.AtomCompareAnyHeavyAtom - fixed test typo

* Added AtomComparator.AtomCompareAnyHeavyAtom and test cases to FMCS code (2)

* Added AtomComparator.AtomCompareAnyHeavyAtom - fixed test cases

* Added AtomComparator.AtomCompareAnyHeavyAtom and test cases

* Update Code/GraphMol/FMCS/FMCS.cpp

Co-Authored-By: Greg Landrum <greg.landrum@gmail.com>

* Reverted tabs to 4 spaces

* Update FMCS.cpp
2019-10-03 17:19:22 +02:00
Ric
b92c265348 update maeparser (#2682) 2019-10-03 17:15:07 +02:00
Brian Kelley
47264fe727 Allow Java to see RGroup labels in the std::map wrapper. (#2681) 2019-10-03 16:52:01 +02:00
Ric
bb3bdb01ea Fix some chirality issues in SMARTS writing/parsing (Issues #2565 & #2568) (#2570)
* forward doIsomericSmiles

* added test for #2565

* fix for my snippet

* update test with Greg's comments

* add braces for readability to MolMatchFinalCheckFunctor

* small refactors: abstract label checking, while/size, final check

* merge loops reading order of bonds -- all tests pass

* fix chiral-lead fragments, allow frags w. degree < 3

* add new test, update old

* add test, update old

* fix (inocuous) bug with ranks assignment in MolToSmarts

* start SMARTS with first non-chiral atom

* use smart pointers in test

* reenable doIsomericSmiles

* update patch for #2594

* remove faulty fragments matching

* review tests, remove wrong flip
2019-10-03 15:33:46 +02:00
Greg Landrum
b87c629e10 fix a problem with normalize, ringinfo, and fragments (#2685) 2019-10-03 15:28:33 +02:00
Dan N
ac5f25c18f 2666: Missing separator in CXSMILES with enhanced stereo (#2678)
Before this commit, if enhanced stereochemistry information was
added to a CXSMILES string as well as other information, the
separator would be missing. This made CXSMILES written by
RDKit unreadable if enhanced stereo information was present.
2019-10-03 04:47:57 +02:00
Greg Landrum
ab87b2f6f2 Fixes #2667 (#2669) 2019-10-02 15:33:51 -04:00
Greg Landrum
946458c08f add bond-selector info to SVGs (#2664)
* add bond-selector information to the SVG too

* changes in response to review
2019-10-02 15:30:37 -04:00
Paolo Tosco
22b0540cdd Fixes #2662 and #2663 (#2665)
* - fixes #2663 (The C++ MCS code generates ambiguous SMARTS strings)

* - fixes #2662 (C++ MCS code returns a null MCS between
methylcyclopentane and methylcyclohexane)
2019-10-01 16:25:46 +02:00
Marvin Steijaert
65a5f6030c Updated cartridge documentation (#2635)
* Updated cartridge documentation

Made examples compatible with latest chembl (25) and most recent conda versions of rdkit (2019.03.4.0, python 3.6.9) + rdkit-postgresql (2019.03.4.0)

* updated more query results

* updated more query results
2019-10-01 16:05:31 +02:00
Greg Landrum
5dfd67a22a Add new mol hashing code (#2636)
* copy in, get building, add some basic tests

* complete the testing
Except for regiosiomers, which do not work

* regioisomers work now

* backup commit; things work

* remove last of NM macros from hashfunctions.cpp

* remove last of NM macros from hashfunctions.cpp

* remove dependency on the abstraction layer

* typo

* start using namespaces
clang-format

* switch to using enums for the HashFunctions and StripTypes

* Add initial python wrapper (and tests)

* move the new hashing code to the MolHash library

still may want to revise the naming of this

* Setup deprecation of the older hashing code

* better release notes text

* change in response to review
2019-09-24 07:55:21 -04:00
sirbiscuit
ba7bd316f9 Get numpy include dir programmatically (#2653)
So far, the installation instructions for Linux rely on a specific 
python version in order to include numpy. Replace the hard-coded path 
with a call to numpy.get_include().
2019-09-23 20:48:20 +02:00
Brian Kelley
d55a2030cc Fixes #2647 (#2651)
* Fixes #2647

* Updated tests

* Fixes in response to review
2019-09-23 18:14:50 +02:00
Ric
d458e46548 update (#2652) 2019-09-22 08:19:25 +02:00
Greg Landrum
fc374a9622 Fixes: Atoms in non-standard valences not being properly written to mol blocks (#2646)
* Fixes a molblock writing problem
with undervalent atoms from the organic subset

* Fixes #2649

Also ensures that allenes are not written as crossed bonds
(which does not make sense at the moment anyway)

* clang-format run
2019-09-20 09:13:19 -04:00
Marc Wittke
ac4cf5fee6 emolecules link updated (#2638) 2019-09-18 09:48:29 +02:00
Brian Kelley
e5a57fae02 Dev/rgroup handle ties in symmetry matching (#2628)
* Better resolve ties in rgroup matches

* Break ties by choosing the permutation that adds the fewest rgroups

* Update aligned cores after tie breaking\nI think this results is more optimal

* Remove unused code

* Replace count with UsedLabels

* Remove whitespace

* Remove whitespace

* Remove redundant code and error message

* Revert test

* remove debug prints
2019-09-11 16:15:14 -04:00
Greg Landrum
576506206a draw zero-order bonds (#2630) 2019-08-28 18:11:12 -04:00
Greg Landrum
4361e9932d optimization of the MolStandardize code (#2621) 2019-08-28 18:08:29 -04:00
Greg Landrum
253f172353 Allow identification of chemistry problems (#2587)
* add AtomValenceException

* refactor a bit and add KekulizeException

* add copy ctor and copy() method

* add detectChemistryProblems

* add getType() method
want to be able to get the type of the exception without requiring doing a bunch of dynamic casts

* first pass at exception inheritance/translation
needs some cleanup and expansion, but this does pass all tests.

* cleanup and finish the python wrappers for the new exceptions

* make sure things are truly polymorphic

* wrap shared_ptrs of the new exception types

* expose DetectChemistryProblems()

* get the java wrappers building again

* transfer those changes to the c# wrapper

* add detectChemistryProblems()
and deal with the fun fun exception inheritance things that ensue

* response to review
2019-08-28 14:15:55 -07:00
Ric
574caeba57 Assign stereo bond labels in molecules read from SMARTS (#2623)
* move utility functions to RDKit::Chirality

* assign bond stereo labels from directions

* add a test

* some cleaning up
2019-08-23 14:07:46 -07:00
Brian Kelley
80f3390b0b Fix/github2611 (#2612)
* Fix CanonicalRankAtomsInFragment API, adds includeChirality, includeIsotopes

* Add testGithub2611

* Update python doc string

* Ensure isotopes are being ignored when requested

Co-Authored-By: Greg Landrum <greg.landrum@gmail.com>

* Need to use all atoms for test
2019-08-23 14:01:55 -07:00
Pat Lorton
dc1ccc3d9e Keep PDB info from Maestro files if available (#2619)
* Keep PDB info from Maestro files if available

* Add test and test_data for Maestro PDB data reading
2019-08-23 14:00:52 -07:00
Ric
df522d02aa E/Z and CIS/TRANS stereo bonds are incorrectly matched (#2596)
* add E/Z to CIS/TRANS translator

* use translator in matching

* add a test
2019-08-21 16:35:35 +02:00
Brian Kelley
269977f72c Automatically load the ipython extensions running in Jupyter (#2626)
* Automatically load the ipython extensions if we are running in an jupyter notebook

* Only activate inside the ZMQInteractiveShell
2019-08-21 14:03:38 +02:00
Greg Landrum
e7eca3a8a0 first pass at switching to a normal download (#2609)
The ExternalProject thing is just more trouble than it is worth
2019-08-19 13:45:25 -04:00
Greg Landrum
dc4e285ff8 Fixes #2603 (#2613) 2019-08-19 13:43:11 -04:00
Greg Landrum
6cc4e45801 Fixes #2614 (#2616) 2019-08-19 12:42:40 -04:00
Greg Landrum
8388ab7d7c raise ValueErrors when constructing streambuffs with the incorrect type. (#2592)
* First pass at enforcing streambuf types on object creation

* make this work on windows
2019-08-19 11:27:47 -04:00
Ric
79735d91d2 Bond stereo in reactions (#2553)
* Enable getStereoAtoms() for E/Z stereo bonds

* do not copy reactant bond directions to product & refactor

* new bond stereo mechanism

* update tests & add some more

* fix problems in E/Z getStereoAtoms()

* use make_iterator_range in Bonds.cpp

* backwards match, refactor, +1 test

* Apply suggestions from code review

Co-Authored-By: Greg Landrum <greg.landrum@gmail.com>

* Apply more suggestions, clang-format

* add comments, mixed pair stereo forwarding, tests; fix bug

* make Bond::getStereoAtoms threadsafe

* Revert "make Bond::getStereoAtoms threadsafe"

This reverts commit c5902d9dfb.

* Revert "Enable getStereoAtoms() for E/Z stereo bonds"

This reverts commit 9ef8c4d1f8.

* add back findStereoAtoms() to ReactionRunner

* add missing brace in conflict resolution
2019-08-18 07:10:50 +02:00
Ric
01fbec33ff Removal of redundant wildcards in SMARTS (Null Atom/Bond Query combination) (#2595)
* add nullQuery algebra

* update tests

* add header to CMake file

* add ownership notice to docstrings

* rename functions

* remove mergeNullQSecond

* fix function name

* Add comment about SMARTS changed to release notes
2019-08-15 14:37:17 +02:00
Dan N
784de0685b I accidentally added this file while working enhanced stereo in reactions (#2552)
It doesn't add any content or clarity, and should be deleted.
2019-08-15 13:51:48 +02:00
Ric
06f79666c1 Use the same criteria to flip chiral atoms in SMILES parsing/writing (Fixes #1028) (#2600)
* symmetrize SMILES read/write chirality flipping

* fix bad escape

* fix test ???

* add a test

* add mol in #1028

* fix sequence test: consider imp. valence in chiral flip decision

* restore Code/GraphMol/Wrap/rough_test.py
2019-08-15 07:47:27 +02:00
Dan N
e0f6119589 Adds MolFragmentToSmarts to generate smarts for a subset of a Molecule (#2594)
We have MolFragmentToSmiles already. But I think that when talking
about a fragment or part of a molecule, maybe SMARTS makes more
sense. If I see a SMILES string, I'll definitely think that
it should be a valid molecule, but I have no such
presumption about SMARTS.

Additionally, Schrodinger software sometimes generates SMARTS
for selection using a set of atoms picked in a GUI. It will
be useful to generate these SMARTS using RDKit.
2019-08-15 05:09:56 +02:00
Greg Landrum
7ffd863c9b A collection of bug fixes (#2608)
* Fixes #2602

* Fixes #2605

* Remove vestigial isEarlyAtom() definition in Kekulize.cpp

* Fixes #2606

* Fixes #2607

adds allowed valence 2 for Sn and Pb

* Fixes #2610

* update in response to review
2019-08-15 04:53:23 +02:00
Brian Kelley
99ba4871df Fix #2547 (#2548)
* Fix #2547

* Add c++ test
2019-08-12 15:56:11 +02:00
Ric
5b23830425 Fix to Issue #2023 (Canonizalizer assumed directed bond must be reversed) (#2598)
* fix

* update test, add mol from #2023
2019-08-12 11:52:59 +02:00
Anthony Gitter
cb64898b3d Add missing Wildman and Crippen logP reference (#2591) 2019-08-09 07:37:32 +02:00
Ric
696de2e187 fix typo (#2593) 2019-08-09 07:36:04 +02:00
Riccardo Vianello
f6beaa3f4b fix the inclusion path for the targets file (#2584) (#2589)
* fix the inclusion path for the targets file (#2584)

* minor cleanup
2019-08-08 10:10:19 +02:00