Commit Graph

76 Commits

Author SHA1 Message Date
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
Paolo Tosco
a5699d9000 FMCS fix for Windows DLLs (#1030)
* - Fixed a bug which prevented FMCS to work correctly on Windows when
  linking to DLLs

* - removed spurious debugging info
- fixed function name

* - correct fix for the pyFMCS issue

* - the already existing macro RDKIT_WRAP_DECL is used in lieu of
  RDFMCS_DLLIMPORT
2016-08-17 04:58:34 +02:00
Paolo Tosco
dd871c3536 Modifications to enable building with MinGW compilers (#960)
* - added -DBOOST_SYSTEM_NO_DEPRECATED to definitions for MINGW builds
- modified a few #ifdef's to discriminate better between MINGW and MSVC
- added a ios::binary to Code/GraphMol/FileParsers/testMolSupplier.cpp
  (I already had to add some of those in the past to avoid the CR+LF issues on Windows)
- modified Code/GraphMol/FMCS/MaximumCommonSubgraph.cpp and
  Code/GraphMol/FMCS/FMCS.h because checking the function pointer does not
  work with DLLs as the function pointer changes upon different calls
- builds under MinGW with -DRDK_USE_BOOST_SERIALIZATION=OFF and
  RDK_BUILD_THREADSAFE_SSS=OFF

* - added the possibility to define MSVC_RUNTIME_DLL to point to the
  absolute path of an appropriate MSVC runtime DLL to enable
  multi-threaded builds with MinGW
- modified C++ and Python tests of the multi-threaded conformation
  embedder as under 32-bit MinGW lower numeric precision introduces minimal
  coordinate differences with result in ~1-kcal energy difference.
  Therefore the energy criterion has been made more lenient, and a
  coordinate MSD criterion has been introduce to compare substantial
  identity of conformations

* - reverted Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py and Code/GraphMol/DistGeomHelpers/testDgeomHelpers.cpp
  to the upstream/master version
2016-06-25 09:12:40 +02:00
Doliath Gavid
1729c90748 Fix crazy out of range dereference 2016-04-12 19:42:24 -04:00
Greg Landrum
9d1e7b73dc normalize line endings on testFMCS_Unit.cpp 2016-01-20 08:51:44 -05:00
Alexander Savelyev
66c52aa701 fmcs: fix fmcs for chiral sub queries #688 2015-12-17 17:17:40 +03:00
Doliath Gavid
e5dbeaeb09 Use sets instead of and map. Minor comments cleanup. 2015-11-18 23:55:57 -05:00
Greg Landrum
e08e0d16d8 first pass, using google style 2015-11-14 14:58:11 +01:00
Greg Landrum
e37296d7c7 post review 2015-11-14 08:08:14 +01:00
Brian Kelley
633ac22b51 Silences unused params and casting issues 2015-10-18 21:16:17 -04:00
Brian Kelley
54311dff9c Suppresses warnings in tests 2015-10-18 16:09:58 -04:00
Brian Kelley
5abca9473c Moves -1 magic number into const unsigned int (warning suppression) 2015-10-18 16:09:05 -04: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
Brian Kelley
403a3d6b7c Suppresses Boost warnings 2015-10-18 13:41:03 -04:00
Brian Kelley
a146c3826a Remove unused variables/functions and register keyword 2015-10-18 10:01:00 -04:00
Alexander Savelyev
11105660c8 fmcs: fixes #631 with chiralirty 2015-10-07 14:40:31 +03:00
Greg Landrum
f724a477db test the problem 2015-10-03 07:55:12 +02:00
Greg Landrum
e6414e772a release the GIL before MCS 2015-08-28 15:59:33 +02:00
Greg Landrum
56d1e78b3b cleanup the python->C++ call; add support for the seed argument; add a test for the seed argument 2015-08-25 14:40:24 +02:00
Alexander Savelyev
e331a57791 fmcs: implement adding an initial seed structure 2015-08-25 14:21:04 +03:00
Greg Landrum
ab5224a449 Merge branch 'mol_hash_and_fmcs_Feb2015'
Fixes #481
2015-04-18 06:13:09 +02:00
Alexander Savelyev
5fc0e5fd1d fmcs: add default parameters for AtomCompare and BondCompare 2015-04-17 18:27:54 +03:00
Alexander Savelyev
654ae2b682 issue #481 was fixed 2015-04-17 18:27:26 +03:00
Riccardo Vianello
72576ba4e1 install missing Graph.h header file 2015-04-12 17:43:42 +02:00
Alexander Savelyev
b0177a4ea1 restore java and python wrappers. New parameter (matchChiralTag) was added. New function findFMCS_P() receives json parameters 2015-04-10 16:24:58 +03:00
Alexander Savelyev
ec6ecdd3bc request notes were fixed. chirality algorithm was slighlty improved 2015-04-06 19:53:19 +03:00
Alexander Savelyev
c6be709dad fix fmcs comparator functions 2015-03-30 18:26:48 +03:00
Alexander Savelyev
dc208b0829 chirality flag was implemented for fmcs() function 2015-03-30 18:17:57 +03:00
Greg Landrum
7c26af1358 remove an overloading ambiguity 2015-02-17 06:29:48 +01:00
Greg Landrum
403c83a73e Add initial (not yet complete) support for parsing JSON to MCS parameters.
Make it explicit that the MCSParameters argument to findMCS is optional
2015-02-17 04:13:49 +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
3c529cdca0 add a test of running FMCS multi-threaded mode 2014-12-17 06:18:37 +01:00
Greg Landrum
7cb35fd5a4 Fixes #397 2014-12-09 06:39:33 +01:00
Greg Landrum
85a631466a disable building of FMCSTest, which only works on a few systems, and remove a bunch of compiler warnings for when it is built 2014-11-03 13:47:46 +01:00
Alexander Savelyev
cece0acaba fmcs: use the zero bond type instead of other 2014-10-30 17:07:28 +03:00
Greg Landrum
1d48ff888f get the windows build working again 2014-09-30 04:20:27 +01:00
Greg Landrum
484d89ffc8 remove some compile problems 2014-08-24 16:32:59 +02:00
Greg Landrum
0480778575 add some docs 2014-08-24 07:01:41 +02:00
Greg Landrum
ec4980a14a disable two very long running tests 2014-08-15 04:45:41 +02:00
Alexander Savelyev
51e886d89d fmcs cosmetic changes. code clean-up. unit tests 2014-08-14 22:11:44 +04:00
Greg Landrum
a02b7227f3 support the matchValences argument from python 2014-08-09 07:12:46 +02:00
Greg Landrum
4c1c5498f9 remove some compiler warnings; possible minor optimization 2014-08-09 07:12:24 +02:00
Greg Landrum
7a2687e0c1 reformat code 2014-07-22 03:34:19 +02:00
Greg Landrum
1f53093b41 add a test for any atom matches 2014-07-07 12:41:21 +02:00
Greg Landrum
0ddfa00147 update to assertEqual (no reason to dig the python3 hole any deeper 2014-07-01 06:20:21 +02:00
Greg Landrum
f4da8d91d8 support completeRingsOnly and ringMatchesRingOnly from Python 2014-07-01 06:19:40 +02:00
Greg Landrum
c9b91cd744 code formatting changes (indentation and untabify) 2014-07-01 05:48:51 +02:00
Greg Landrum
38d9f00f84 merge 2014-06-28 15:02:52 +02:00
Greg Landrum
150c963630 fix a build problem 2014-06-28 15:01:13 +02:00