11 Commits

Author SHA1 Message Date
Greg Landrum
21225e63b3 Move some more tests over to catch2 (#9058)
* move testSubstructMatch to catch2

* modernization

* modernization

* switch to catch2

* modernize

* convert to catch2

* update

* move to catch

* please be quiet

* move to catch2

* changes in response to review

---------

Co-authored-by: = <=>
2026-01-24 07:03:04 +01:00
Paolo Tosco
ac19430d1f Code cleanup, minor refactoring and typos (#7742)
* - code cleanup, minor refactoring and typos

* changes in response to the review

---------

Co-authored-by: ptosco <paolo.tosco@novartis.com>
2024-08-23 12:48:50 +02:00
Gareth Jones
a383b9e1dd Refactor RGD moving function implementations from header to source files (#5958)
* Create implementations for functions defined in header files

* Fix testRGroupInternals.cpp include

* Add windows dll export to RGroupData

* Fix swig wrappers

* Remove unused RGroupData constructor

* Fix RGD CMakeLists.txt
2023-01-20 15:01:45 +01:00
Greg Landrum
1f4584b2ca run clang_format (#5676) 2022-11-01 04:14:26 +01:00
Gareth Jones
750ae51368 Improved RGD fingerprint score (#5233)
* RGD fingerprint scoring improvements

* RGD fingerprint scoring improvements

* Remove testGeminalRGroups from testRGroupInternals

* Changed from code review

* Remove unnecessary comment

Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
2022-05-03 14:44:33 +02:00
Eisuke Kawashima
11532089de Run clang-format against cpp (#4358) 2021-10-20 04:25:27 +02:00
Paolo Tosco
823bc93d04 Major speed-up of RGD scoring (#4544)
* speed up scoring of permutations by clever caching of already settled
matches rather than recomputing scores for all matches every time
process() is called

* changes in response to review

* changes in response to review

Co-authored-by: Paolo Tosco <paolo.tosco@novartis.com>
2021-09-30 09:31:49 -04:00
Brian Kelley
98237b8ade Fixes #3924 (#3941)
* Fixes #3924
The scoring function was not taking into account empty rgroups which biased certain
arrangements of rgroups that didn't have an rgroup at every position.

* Change in response to review

* Rigger the no_rgroup into EMPTY_RGROUP

* Remove Fix Me label from the geminal rgroup test

* add testUserMatchTypesDefaultScore to test default score on user types

* Fix scoring RGroups with split attachments [*:1]O.[*:1]N.

* Test both scoring functions for testMutipleCoreRelabellingIssues and testUnprocessedMapping

* Update testRGroupInternals.cpp

remove a couple obsolete comments as suggested in review

Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
2021-03-19 06:22:36 +01:00
Gareth Jones
a6ee6ae537 Tests for RGD default function failures (#3926)
* Tests for default function failures

* Revert tests

* Fix linker matches in the case that they span multiple rgroups

* Change to test required by linker fix

* Update based on Brian's changes

* get windows dll builds working

Co-authored-by: Brian Kelley <fustigator@gmail.com>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
2021-03-16 13:36:52 -04:00
Gareth Jones
e3085bf8bc Fix GA delegating to exhaustive search for simple systems (#3934) 2021-03-16 04:32:33 +01:00
Gareth Jones
ec5a172886 R group symmetry (#3565)
* Exploration

* Initial work on GA fro Rgroup Symmetry

* GA for rgroup decomp and fingerprint rgroup symmetry scoring

* Continuing development

* Exploration

* Initial work on GA fro Rgroup Symmetry

* GA for rgroup decomp and fingerprint rgroup symmetry scoring

* Continuing development

* Further development

* Continued tweaks

* Function rename

* Continued tweaks

* Bug fix for variance calculation

* Copyright notices. Remove Eigen dependency. RdKit logging.  Clock fix.

* Changes to fix build failures

* Fixes for Windows dynamic DLL build

* Included GA export.h file

* Fixed RGroupDecomp CMakeLists.txt

* Notebooks working, GGroup labelling bug fixed

* Fix windows build.  More options for example GA program

* More bugs found and tests adjusted

* Fixed Python rgroup test

* Trivial change to trigger CI

* OSX java and windows build fixes

* Windows DLL fix

* Fix segmentation error

* proposed change

* Possible fix for segmentation fault

* CR fixes

* CR fixes

* CR fixes

* Recreates molecules from rgroups where possible

Co-authored-by: greg landrum <greg.landrum@gmail.com>
Co-authored-by: Brian Kelley <fustigator@gmail.com>
2021-01-05 09:27:33 -05:00