Commit Graph

26 Commits

Author SHA1 Message Date
Greg Landrum
ec366c1ab7 Dev/pvs studio cleanups2 (#2877)
* a round of cleanups courtesy of PVS studio

* add a test to make sure that a warning is a false alarm

* bug fix

* Fix a UFF bug

* more PVS studio cleanups

* next round of PVS studio cleanups

* completely remove the chances for that bug

* changes in response to review

* add an additional test
+ a bit of reformatting that snuck in
2020-01-22 15:10:58 +01:00
Paolo Tosco
c6503e9f8e Use query molecule rather than ambiguous SMARTS for MCS matching (#2759)
* - MatchFusedRings does not imply CompleteRingsOnly anymore

* - use a more specific query molecule rather than an ambiguous SMARTS string in MCSResult

* - changes in response to review
2019-12-16 04:57:54 +01:00
Paolo Tosco
ab021aa960 Add consideration of ring fusion to the MCS algorithm (#2731)
* - Adds consideration of ring fusion to the MCS algorithm

* - removed some commented out lines
2019-10-25 04:35:10 +02: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
Greg Landrum
2602ea6de8 A bit of not-particularly-related cleanup 2019-04-24 14:30:54 +02:00
Greg Landrum
50d2328251 Fixes #2034 (#2035)
* Fixes #2034

* update release notes to describe that
2018-09-17 06:50:54 +02:00
Greg Landrum
2738c35178 Fixes #1903 (#1971)
* Fixes #1903

* update SWIG bindings too
2018-07-25 09:14:17 +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
4001b2ba0e Add the option to match formal charges to FMCS (#1311)
* very basics of charge checking in

* add the new parameters to the python wrapper. more testing please

* Additional testing.

* update which unittest methods are used
2017-02-28 08:49:28 -05: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
Greg Landrum
e08e0d16d8 first pass, using google style 2015-11-14 14:58:11 +01:00
Alexander Savelyev
e331a57791 fmcs: implement adding an initial seed structure 2015-08-25 14:21:04 +03: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
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
Greg Landrum
7cb35fd5a4 Fixes #397 2014-12-09 06:39:33 +01:00
Alexander Savelyev
51e886d89d fmcs cosmetic changes. code clean-up. unit tests 2014-08-14 22:11:44 +04:00
Greg Landrum
7a2687e0c1 reformat code 2014-07-22 03:34:19 +02:00
Greg Landrum
c9b91cd744 code formatting changes (indentation and untabify) 2014-07-01 05:48:51 +02:00
Savelyev Alexander
604ee4c675 bug with empty MCS was fixed. MT stub 2014-05-12 21:39:55 +04:00
Alexander Savelyev
ddba1b3650 fast match was implemented for FMCS. cosmetic changes 2014-04-29 15:34:21 +04:00
Greg Landrum
24a9689f45 dos2unix run 2014-04-07 09:27:07 +02:00
Greg Landrum
a5f5247d32 add initial implementation for testing 2014-04-03 05:07:47 +02:00