Commit Graph

12 Commits

Author SHA1 Message Date
David Cosgrove
3dcb6bebd0 Initial Rascal results sort the wrong way round on number of atoms and bonds. (#8258)
* Initial results sort the wrong way round on number of atoms and bonds.

* Improve sort for singleLargestFrag.

* Response to review - don't sort the fragment sets twice when opts.singleLargestFrag is true.

---------

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
2025-02-27 13:21:38 +01:00
David Cosgrove
d7ae07ac8c Rascal: Add option to specify minimum clique size directly. (#8248)
* Add option to specify minimum clique size directly.

* Make the minCliqueSize uint and default to 0.

* Brain-fade.

* Send timeout and 'too many bonds' message to BOOST_LOG rather than std::cout, std::cerr respectively.

---------

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
2025-02-27 13:14:28 +01:00
David Cosgrove
dbaa50f240 Rascal bond label error (#8199)
* Fix atom ordering in bond label.

* Response to review.

---------

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
2025-01-30 06:33:19 +01:00
David Cosgrove
1db4f6e4e1 Trim results after singleLargestFrag = true applied. (#8202)
* Trim results after singleLargestFrag = true applied.

* Fix sort.

---------

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
2025-01-30 06:32:03 +01:00
David Cosgrove
26fa79b89a Fix empty results bug. (#8099)
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
2024-12-19 09:55:19 +01:00
David Cosgrove
86b5335770 Allow fragments of aromatic rings to match in RascalMCES (#8088)
* Allow fragments of aromatic rings to match.

* Use existing code for checking bond is in ring.

---------

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
2024-12-19 09:54:23 +01:00
David Cosgrove
d44758ee5e Rascal match exact atom type (#7673)
* New option - exactAtomTypeMatch.

* Python wrapper.

* REQUIRE(res.size()) not CHECK.  If it fails, you get seg fault on subsequent tests otherwise.

* Change option name.
2024-09-16 04:45:18 +02:00
David Cosgrove
80381c61fd Rascal atom and bond equivalences (#7612)
* C++ implementation of equivalent atoms via SMARTS.

* Python wrapper.

* Tidy.

* Check for too many classes.

* Better handling of spaces in split.

* Pass string by reference.  Doh.

* Add ignoreBondOrders option.
2024-07-23 06:02:33 +02:00
David Cosgrove
b7e999bfd8 Rascal exactConnectionsMatch bug (#7359)
* Fix bug where different atom orders gave different MCES sizes.

* Update function description.

---------

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
2024-06-23 07:05:35 +02:00
David Cosgrove
29a166dff6 Add option for RASCAL to restrict atom matching to atoms of same degree (#7344)
* Add exactConnectionsMatch option.

* Better python test.

* Better C++ test.

---------

Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
2024-04-11 16:20:38 +02:00
Ric
8176f5c962 Fail CI builds on compiler warnings + some fixes (#6675)
* enable Werror on Mac and Linux

* do not fail on boost multiprecision pessimizing move

* fix eigen array_bounds warning

* Fix unused arg in Rascal MCS

* fix range-loop-construct warning in Rascal MCES

* fix sign mismatched comparison

* drop unused lambda capture

* allow FMCS timeout test more time under Debug (not a warning!)

* fix fwd declaration of struct RascalClusterOptions

* fix deallocator mismatch

* fix two minor leaks

* fix a real leak

* more minor leaks

* fix another real leak, plus some potential ones

* fix std::move preventing copy ellision

* allow longer run time for debug builds

* make maxBondMatchPairs and getLargestFragSize unsigned int

* make snake case camel case

* update to current master, fix new warnings

* update again and more fixes

* add #include <optional>

* fix char array deallocation

* update and fixes in Marvin writer

* unsigned int

* more copy ellision fixes

* more copy ellision fixes, and typos

* and some more
2023-09-02 04:38:45 +02:00
David Cosgrove
2dd9c5f3cd RASCAL MCES (#6568) 2023-08-27 13:51:49 +02:00