Commit Graph

91 Commits

Author SHA1 Message Date
Greg Landrum
9f103a9913 Allow components of the MolStandardize code to be initialized from streams (#2385)
* Fixes #2383 (tests coming in the next commit)
Minor typo fix
Fixes a "bug" in one of the default transforms

* Adds support for directly providing normalization parameter data
instead of requiring the use of a text file.

* allow fragment removers to be initialized with string data

* remove unicode

* allow the reionizer to be initialized from a stream
2019-04-03 04:48:05 +02:00
John Mayfield
da60d20aca Patch/pains updates (#2272)
* Correct typo in thiophene_E pattern, !H0,!H1 is "always true" should be !H0!H1

* Errors in ring closure translation from original SLN.

* Make queries agnostic to aromaticity model.

* Redundant recursive SMARTS

* More queries that benefit from optional aromaticity.

* Update the (.in) files from previous commit.

* Update thiaz_ene_A inline with CSV file.
2019-03-18 13:42:31 -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
Greg Landrum
0aff90751a change bogus "3D" to "2D" in a test file (#2319)
we raise a warning about this now
2019-03-06 16:06:15 -05: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
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
Greg Landrum
1692914b6e Fixes #525 2015-10-28 06:01:46 +01:00
Greg Landrum
14558020c2 get the DbCLI tests working on windows 2015-10-26 07:25:11 +01:00
Paolo Tosco
076831aa31 - removed d_ceMapTmp and d_ceMap from ResonanceMolSupplier
(they both were temporary data structures and there was
  no real reason for them to be there, especially in view
  of a possible code parallelization)
- converted most uint64_t to unsigned int since they weren't
  really necessary
- fixed a couple of compilation warnings
2015-10-25 21:50:20 +00:00
Paolo Tosco
517de5b5d8 - Fixed a few glitches which caused the build to fail on Windows
- added a few tests for ResonanceMolSupplier
2015-10-24 01:18:10 +01:00
Paolo Tosco
72de596280 - implemented correct resonance structure sorting for degenerate cases
- moved classes that do not need being exposed in Resonance.h to Resonance.cpp
- added the ALLOW_CHARGE_SEPARATION flag: now by default charge
  separation structures are not displayed if there's at least one
  structure with no charge separation
- TODO
  * add SWIG wrappers
  * add a few test tp resMolSupplierTest.cpp
2015-10-23 18:41:53 +01:00
Paolo Tosco
6ccda75d77 - fixed a problem when selecting maxStructs = 0 2015-10-21 20:27:02 +01:00
Greg Landrum
ec62708484 fix NodeLib 2015-10-20 06:40:45 -04:00
Greg Landrum
9f0fb8f688 fix VLib (not yet NodeLib) 2015-10-20 05:00:54 -04:00
Greg Landrum
6e65e2c46c get Dbase tests running 2015-10-20 04:39:40 -04:00
Greg Landrum
b8eef71598 get the DataStructs tests running 2015-10-20 04:36:06 -04:00
Greg Landrum
35a99ac0c5 typo 2015-09-21 18:01:51 +02:00
Greg Landrum
e2487ffe79 update a PAINS based on input from Simon Saubern 2015-08-26 04:59:52 +02:00
Greg Landrum
0a16b3ad32 Merge branch 'master' into Sheridan_fps 2015-08-22 17:49:24 +02:00
Greg Landrum
9f4e543f9c add some tests 2015-08-06 13:36:42 +02:00
Greg Landrum
e52ae4902d update the docs a bit 2015-08-06 13:36:34 +02:00
Greg Landrum
e916171537 fix a few more SMARTS based on the pubchem tests 2015-08-06 13:13:57 +02:00
Greg Landrum
bae063d050 lost a quotation mark somewhere along the way 2015-08-06 13:13:32 +02:00
Greg Landrum
3af4039127 update another PAINS 2015-08-04 13:26:48 +02:00
Greg Landrum
b4151e421c update another PAINS 2015-08-04 13:24:55 +02:00
Greg Landrum
bf74c50716 update another PAINS 2015-08-04 10:10:53 +02:00
Greg Landrum
4cbafab058 update another PAINS 2015-08-04 10:09:36 +02:00
Greg Landrum
6f27bce9e6 update another PAINS 2015-08-04 10:07:59 +02:00
Greg Landrum
3de6700171 update another PAINS 2015-08-04 10:06:03 +02:00
Greg Landrum
75abf1153e update another PAINS 2015-08-04 10:02:54 +02:00
Greg Landrum
f4d59d4b5c update another PAINS 2015-08-04 10:00:20 +02:00
Greg Landrum
2ab9c3ceb0 update another PAINS 2015-08-04 09:59:31 +02:00
Greg Landrum
a3cb636fcd update another PAINS 2015-08-04 09:54:35 +02:00
Greg Landrum
adc95dc691 update another PAINS 2015-08-04 09:52:03 +02:00
Greg Landrum
e886fcf622 update another PAINS 2015-08-04 09:50:30 +02:00
Greg Landrum
4d75269e91 update another PAINS 2015-08-04 09:48:42 +02:00
Greg Landrum
13d8d037c4 update another PAINS 2015-08-04 09:46:47 +02:00
Greg Landrum
d242ad63b0 update another PAINS 2015-08-04 09:44:40 +02:00
Greg Landrum
c722a2b0bb update another PAINS 2015-08-04 09:41:44 +02:00
Greg Landrum
b11f2e47a0 update another PAINS 2015-08-04 09:39:21 +02:00
Greg Landrum
624ea90b9e update another PAINS 2015-08-04 09:25:13 +02:00
Greg Landrum
584eb76e42 update another PAINS 2015-08-04 09:11:12 +02:00
Greg Landrum
671413027f update another PAINS 2015-08-03 17:21:16 +02:00
Greg Landrum
47c5095e29 update another PAINS 2015-08-03 17:17:08 +02:00
Greg Landrum
0ea53c6283 update another PAINS 2015-08-03 17:10:33 +02:00
Greg Landrum
16e9b3cbef update another PAINS 2015-08-03 16:54:38 +02:00
Greg Landrum
40374393f2 update another PAINS 2015-08-03 16:44:44 +02:00
Greg Landrum
3daf634b40 update another PAINS 2015-08-03 16:43:05 +02:00
Greg Landrum
74827cdc62 update another PAINS 2015-08-03 15:03:16 +02:00
Greg Landrum
78a51ab6f4 update another PAINS 2015-08-03 15:01:46 +02:00