Commit Graph

86 Commits

Author SHA1 Message Date
Greg Landrum
7e6600f3be Fixes #2516 (#2519)
* RDStreams now installed properly

* skip Wrap directories if RDK_BUILD_PYTHON_WRAPPERS is not set

Fixes #2516
2019-06-28 09:57:00 -04:00
Greg Landrum
24f1737839 Remove a bunch of Python2-related warts (#2315)
* remove all of the "from __future__" imports

* remove the first batch of rdkit.six imports/uses

* next step of rdkit.six removal

* removing xrange, range, and some maps

* next round of removals

* next round of cleanups

* fix inchi test

* last bits of "from rdkit.six" are gone

* and the last of the six stuff is gone

* strange importlib problem
2019-03-06 20:43:49 -05:00
Ric
91008ff11d Address compile warnings & trivial improvements (#2097)
* Address compile warnings & trivial improvements

* revert unwanted initializers; use RDUNUSED_PARAM for unused params

* revert fix in testRDFcustom; marked with 'TO DO' comment
2018-10-12 06:39:32 -04:00
Susan Leung
956fdf268c Dev/GSOC2018_MolVS_Integration (#2002)
* short test file for MolVS standardize_sm

* short test file for MolVS fragment

* short test file for MolVS metals

* short test file for MolVS normalize

* short test file for MolVS reionize

* short test file for MolVS tautomer

* short test file for MolVS validate

* long test file for MolVS standardize smiles

* long test file for MolVS fragment

* long test file for MolVS metals

* long test file for MolVS normalize

* long test file for MolVS reionize

* long test file for MolVS tautomer

* long test file for MolVS validate

* Unit tests for MolVS steps

* dropping support for Python2

* molvs/__init__.py

* molvs/charge.py

* molvs/errors.py

* molvs/fragment.py

* molvs/metal.py

* molvs/normalize.py

* molvs/resonance.py

* molvs/standardize.py

* molvs/tautomer.py

* molvs/utils.py

* molvs/validate.py

* molvs/validations.py

* molvs/cli.py

* adapted and renamed molvs/cli.py to work within $RDBASE/Contrib/MolVS/

* setup MolStandardize directories, source with empty cleanup function, header, CMake files

* corrections to empty source, header and test1.cpp

* adding empty functions and initializers to MolStandardize

* empty Metal source, header and added test

* added most of Metal.cpp functionality and made some more tests

* empty functions and initializers to Normalize

* empty functions and initializers to Validate

* added most code for RDKitDefault mode, along with some tests

* restructure for abstract base class ValidateMethod

* written in isNoneValidation for MolVSValidation

* took out isNoneValidation, put in noAtomValidation, neutralValidation, isotopeValidation for MolVSValidation

* added in AllowedAtoms

* added in disallowedAtoms

* corrections to Validate

* added code for FragmentRemover

* extended fragment functionality to include choose largest fragment, added in tests for fragment catalog, fragment remover. Also added fragmentValidation method in MolStandardize

* added another test to testValidate test_fragment

* corrections to fragment

* corrections to Metal

* added code for Normalize

* added normalize member function to MolStandardize and added tests

* added multi fragment functionality to Normalize.cpp and additional tests

* TransformCatalog

* tests for Normalize.cpp

* first bit of cleanup

* added most of Charge functionality and some tests

* some corrections to Charge.cpp and some more tests to testCharge.cpp

* corrections to Charge.cpp

* start of Tautomer Enumerate with some tests

* added BondType option to Tautomer Enumeration

* correcting for some memory leakage

* a few alterations to formatting

* sorting out some memory leaks

* sorting out some memory leaks

* some corrections for PCS test set

* redo tests with updated RDKit

* fixing memory leak

* more fixes after 100kPCS set testing

* using tab as delimiter in CSVs rather than comma

* tutorial for MolStandardize

* still working on Tautomer enumeration

* deleted some empty tests

* starting writing tautomer canonicalize

* rename test_data -> data (the source still needs to be updated)

* automatic source reformatting

* adjust to directory rename

* move the fragment catalog test into the MolStandardize directory
do not create separate library for FragmentCatalog

* stop building separate libraries for the catalogs

* move the CleanupParameters into the MolStandardize namespace

* first pass at python wrapper

* move the py module to the correct dir;
add some python tests;
add standardizeSmiles to python wrapper

* disabling the compareMolVSTest since that requires command line arguments to run

* get this building on windows

* put the python lib in the right place

* further work on python wrapper for rdMolStandardize

* added get and set functions to Metal and wrapped them

* added get and set functions to Metal and wrapped them

* changed construstor of Reionizer class and input args for reionize, wrapped this default

* overload Reionizer constructor so user can input own AcidBaseFile from python

* added Uncharger class to Charge and added test for Uncharger

* wrapped Fragment, fixed some memory leakage, changed some args and return types, added some tests

* wrapped Normalized and changed how Normalizer class is initiated

* changing MolVSValidation structure so user can choose which MolVS submethod they want

* starting to write Wrap for Validate

* now it compiles with Wrap/Validate.cpp

* a couple refactorings around validate

* move the validate code into the rdMolStandardize module

* make sure a valid pointer is returned for standardizeSmiles

* rdMolStandardize.MolVSValidation done and tests added

* half way through AllowedAtomsValidation

* finished AllowedAtomsValidation and DisallowedAtomsValidation

* moved charge, fragment, metal, normalize into the rdMolStandardize module

* changed tutorial to use wrapped code

* added copyrights

* added copyrights

* move the data files

* modify source files to adjust to the move

* added validateSmiles functionality

* removed std::cout

* redid some of the 100k PCS tests

* working on the tutorial

* adding some documentation

* deleting some comment lines

* some changes after pull review

* More changes after pull review

* start of trying to make java wrap

* remove some warnings, add some questions

* additional warning removals, a bit more reporting

* some test cleanups

* enable testing of the java code
2018-09-28 11:24:25 +02:00
Greg Landrum
d5d29ab9c5 Update Readme.md (#2051) 2018-09-21 05:14:25 +01:00
Greg Landrum
e5056773be add clarifying statement about license (#1933) 2018-07-04 08:50:00 -07:00
Greg Landrum
3e1481a78c Make IFG license clear (#1932) 2018-06-25 13:07:26 +02:00
NadineSchneider
7d40fe6c8c Add a script for calculating chiral descriptors to Contrib (#1885)
* Add a script for calculating chiral descriptors to Contrib

* Revise chiral descriptor code based on comments of the pull request, add tests
2018-06-14 18:44:53 +02:00
Paolo Tosco
c08ea49bda - enable building DLLs on Windows (#1861)
* - enable building DLLs on Windows

* - export.h and test.h are now auto-generated by CMake
2018-05-16 08:42:41 +02:00
Greg Landrum
c0caeced39 IFG now works with py3, update release notes 2018-04-20 04:05:34 +02:00
guillaume godin
9d72e645fa Ifg contribution (#1813)
* ifg contribution

* ifg python file

* Delete settings.json

* Update README
2018-04-10 17:47:37 +02:00
iwatobipen
82ed7a16a2 Add Fast cluster script (#1683)
* add Fastcluster

* readme

* readme

* readme

* readme

* readme

* readme

* readme

* example

* Update README.md

These are just a few minor changes

* revise fastcluster

* revise code

* .gitignore

* revise code

* remove gitignore and revised sdf2smi.py with SmilesMolWriter
2018-01-21 07:18:38 +01:00
Axel Pahl
4c26511cb6 NP Likeness with confidence value (#1608)
* NP Likeness with confidence value
added a scoring variant with an additional confidence value between 0..1
that describes how many fragments of the tested compound were found in the model data set.

* fixed indentation

* added some documentation

* namedtuple, no rounding

* other changes to module as requested by reviewer
* replaced occurrences of sys.stderr.write by print
2017-11-15 06:43:41 +01:00
Greg Landrum
9dbfbab111 Fixes #1406 (#1408)
* Fixes #1406

* Fixes #1406
2017-05-08 08:02:58 +02:00
gedeck
bb707f9e02 Python 3 compatibility (issue #398) (#1192)
* Replace xrange with range or import from rdkit.six

* Remove use of string.lower

* The import of xrange in MolSurf added it to the Descriptors._descList
2016-12-16 08:11:28 +01:00
Greg Landrum
36cbc6f49b Merge pull request #1185 from NadineSchneider/RxnRoleAssignmentPaper_Sep2016
Rxn role assignment code
2016-11-29 15:52:04 +01:00
NadineSchneider
a47d2252ed Update README.txt 2016-11-28 10:17:10 +01:00
Brian Kelley
fa89438358 Dev/reaction enumeration (#1111)
* Adds C++ Enumeration Engine to the RDKit

* Adds Sanitization helpers, wrappers and tests

* Clang format

* Remove unused enumerationStateOnly flag

* Fixes docStrings to current API

* Adds doc strings

* Removes RGroupPosition, adds getPosition to EnumerationBase

* Fixes readability.

* Adds EnumerateLibraryBase::reset and getReaction

* Added getReagents method to EnumerateLibrary

* Make the tests have the same naming

* Need to save the initial state for resetting.

* Stupid case-insensitive file systems

* Moves ResetState to EnumerateLibraryBase

* Adds removeNonmatchingReagents helper

* Renames currentPosition to getPosition

* Adds Enumeration Toolkit tutorial

* Fixes Python3 serialization and enumerators

* Verified to run on python2 and 3

* Fixes integer issues on windows

* The number of enumeration should be unsigned.

* Adds deserialization constructor

* Moves boost_serialization to the end

* Deprecates Clone in favor of copy

* Update tests to use copy.copy not Clone

* Move RGROUPS and BBS into an EnumerationTypes namespace

* Make sure old pickles work

* Adds pickle for backwards compatibility

* Moves to uint64_t from size_t for public api

* Whups, accidentally used the binary archiver.

* Commits boost 1.55 serialization

* Makes serialization turnoffable Like Filter Catalog

* Fixes tests when serialization not available.  Adds more enumeration strategy tests

* Fixes a syntax error on some versions of python

* Fixes sanitizeRxn to actually make proper RGroup atoms

* Updates SanitizeRXN python API

* Updates Enumeration API to a parameter class - fixes reagent removal

* Adds a mess of tests

* Change stats to return a string.

* Exposes EvenPairSamplingStrategy Stats to python

* Fixes a crash bug in SanitizeRxn

* Adds better testing of the even pair sampling

* Fixes namespace

* One more try to fix gcc

* Enum classes are c++11 and a microsoft extension.

* Fix typo

* Fixes np.median for python3

* Fixes atom iterators

* Adds virtual tags to derived virtual functions (for clarity)

* Fixes size comparison issues

* Adds doc string

* Small cleanup (has no effect since flags aren’t used)

* fixes crash bug on windows

* get the tests working on windows

* Updates tutorial

* Adds Glare implementation to Contrib
2016-11-05 14:42:52 +01:00
gedeck
4580160e37 Replace has_key use in Python (#issue1042) (#1132)
* Replaced all uses of dict.has_key(key) in Python code - part 1

* Replaced all uses of dict.has_key(key) in Python code - part 1

* Replaced all uses of dict.has_key(key) in Python code - part 2 (sping)
2016-10-29 04:41:57 +02:00
gedeck
e9af48ffd7 Issue1071/yapf (#1078)
* Issue #1071: add yapf configuration file

* yapf formatting of Code directory

* yapf formatting of Contrib directory

* yapf formatting of Data directory

* yapf formatting of Docs directory

* yapf formatting of External directory

* yapf formatting of Projects directory

* yapf formatting of Regress directory

* yapf formatting of Scripts directory

* yapf formatting of Web directory

* yapf formatting of rdkit directory
2016-09-23 04:58:46 +02:00
Nadine Schneider
dd947a65c0 Add reaction role assignment functionality to the RDKit Contrib 2016-09-19 13:56:07 +02:00
Greg Landrum
67339cfa3b add python3 compatibility (#1057) 2016-09-09 15:15:57 +02:00
Richard Hall
9768025ffa added an implementation of the Gobbi Atom-Atom-Path (AAP) similarity metric (#1015) 2016-08-10 11:57:32 +02:00
Paolo Tosco
b35538599f - Added AMBER trajectory reader and relevant tests 2016-04-16 20:28:45 +01:00
Axel Pahl
a9d3d9966c * removed op alias 2016-03-05 18:10:25 +01:00
Axel Pahl
14f4f165c6 * made Python3 compatible
* modified load path for the publicnp.model file to enable import of the module from other locations
2016-03-04 14:28:49 +01:00
Matt Swain
97f6783f80 Fix ConformerParser to use const std::string &
In #627, `readAmberTrajectory` in ConformerParser.h is updated to use `const std::string &`. This updates the corresponding method in ConformerParser.cpp to match. I needed to do this to compile RDKit with contrib.
2016-01-19 14:06:45 +00:00
Greg Landrum
ad7c54aec7 first-pass python implementation of this 2015-12-02 17:43:24 +01:00
Greg Landrum
465dc2c5c7 Python3 compatibility fix for NPScore 2015-11-27 15:36:35 +01:00
Greg Landrum
2513e73465 merge mmpa branch 2015-10-30 04:45:58 +01:00
Greg Landrum
1cde397acb merge commit 2015-10-30 02:58:46 +01:00
Brian Kelley
6ebbeb3bd3 Major conversion of std::string API to const std::string & 2015-09-25 15:15:59 -04:00
Greg Landrum
26b3722e7b move SA_scorer over to using the C++ defns 2015-09-21 13:50:55 +02:00
Andrew Dalke
36299f16b2 removed bare except but did not test because I don't have the 'requests' library 2015-09-07 13:08:07 +02:00
Greg Landrum
f074551d04 fix a bug that wouldn't allow nspcore to be used like a library 2015-09-03 07:23:32 +02:00
Greg Landrum
3a850616b5 Add first version of Peter Ertl's natural-produce likeness score 2015-08-26 15:00:41 +02:00
Greg Landrum
e28ff48100 remove the outf parameter 2015-08-19 06:15:51 +02:00
Axel Pahl
c7778cb52c - changed sascorer.py to enable import from different location 2015-08-18 17:58:50 +02:00
Greg Landrum
d0ec392006 Fixes #564
Tested with the commands in readme.txt
2015-08-14 04:24:14 +02:00
Greg Landrum
98c4750bae Fixes #561
patch from Andrew Dalke
2015-08-14 04:12:39 +02:00
Greg Landrum
91f8c1e19d switch to using rdMMPA; note that this currently does *not* return the same results 2015-07-15 15:35:43 +02:00
Riccardo Vianello
95f60d21bc python3 portability fixes for pandas and the ipython notebook 2014-09-11 23:49:45 +02:00
Sereina Riniker
754f9c3e9f ConformerParser updated 2014-04-09 08:30:06 +02:00
Sereina Riniker
d54a35c8b4 option to build Contrib with RDKit added 2014-04-08 09:38:45 +02:00
Sereina Riniker
d333b047e4 ConformerParser updated 2014-04-08 09:03:32 +02:00
Sereina Riniker
56cd8e89fb ConformerParser updated 2014-04-07 17:02:32 +02:00
Sereina Riniker
b3a2a6fffb ConformerParser updated 2014-04-07 15:03:42 +02:00
Sereina Riniker
6c0d7ec564 ConformerParser updated 2014-04-07 13:54:11 +02:00
Sereina Riniker
6a67bb81d9 ConformerParser moved to Contrib 2014-04-07 12:59:13 +02:00
pzc
370f758a48 Train ChEMBL-based models 2014-02-03 16:29:40 +01:00