mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-06 22:39:55 +08:00
- Switched from dynamic to static allocation for an instance of `MCSParameters` - Switched to using `auto` where possible - Added a few `CHECK_INVARIANT` where appropriate before dereferencing pointers - Moved some inline comments to the previous line to improve readability - Added a early check for `CompleteRingsOnly` in `checkBondRingMatch()` to improve computational efficiency - Removed `RingMatchTableSet` entirely as 1) it is unnecessary since its functionality is already provided by `RingInfo` 2) it abused the `userData` pointer. This allows cleaning up and simplifying the code, particularly the Python wrappers which had a significant amount of added complexity to support it - Removed all the code that was deprecated several releases ago - Reimplemented ringFusionCheck() from scratch to address several bug reports; also switched from std::set to boost::dynamic_bitset for better efficiency - Replaced boost::tie with boost::make_iterator_range - Modernized `for` loops where possible - Removed entirely the QueryRings structure as its functionality is already available in RingInfo - Removed entirely the _DFS() function since the same algorithm can be implemented in a simpler and more efficient way using RingInfo (from 2m28.441s to 2m9.859s for the same task) - Replaced std::vector<bool> with boost::dynamic_bitset - Replaced C-style casts with C++ casts - Replaced some size_t with unsigned int - Refactored checkIfRingsAreClosed() such that checkNoLoneRingAtoms() is not needed anymore - Added a test for slow runtimes with CompleteRingsOnly - Setting Timeout to 0 means no timeout, as it should be - Removed unused `steps` variable from `MaximumCommonSubgraph::growSeeds` - Storing both Atom and Bond pointers and their indices on Seed and MCS data structures is time-consuming and a potential source of incons istencies; storing pointers is sufficient - Promoted `MaximumCommonSubgraph::match` from `private` to `public` - `NewBonds` was declared `mutable`, but `Seed::fillNewBonds()` was incorrectly declared as `non-const`, which caused the need for an ugly (and unnecessary) `const_cast`. I have now removed the `const_cast` and correctly declared functions that alter `NewBonds` as `const`, since `NewBonds` is explicitly `mut able` - Removed some useless random scoping that was peppering the MCS code - Removed a significant amount of duplicate code from the Python wrappers by inheriting from a base `PyMCSWrapper` class - Fixed #6082 - Fixed #5510 - Fixed #5457 - Fixed #5440 - Fixed #5411 - Fixed #3965 - Fixed #6578 Co-authored-by: ptosco <paolo.tosco@novartis.com>
128 lines
4.3 KiB
C++
128 lines
4.3 KiB
C++
//
|
|
// Copyright (C) Greg Landrum 2007-2017
|
|
//
|
|
// @@ All Rights Reserved @@
|
|
// This file is part of the RDKit.
|
|
// The contents are covered by the terms of the BSD license
|
|
// which is included in the file license.txt, found at the root
|
|
// of the RDKit source tree.
|
|
//
|
|
|
|
#define NO_IMPORT_ARRAY
|
|
#include <RDBoost/python.h>
|
|
#include <RDBoost/Wrap.h>
|
|
|
|
#include <GraphMol/RDKitBase.h>
|
|
#include <RDGeneral/types.h>
|
|
|
|
namespace python = boost::python;
|
|
|
|
namespace {
|
|
using namespace RDKit;
|
|
python::object atomRings(const RingInfo *self) {
|
|
python::list res;
|
|
for (const auto &ring : self->atomRings()) {
|
|
res.append(python::tuple(ring));
|
|
}
|
|
return python::tuple(res);
|
|
}
|
|
python::object bondRings(const RingInfo *self) {
|
|
python::list res;
|
|
for (const auto &ring : self->bondRings()) {
|
|
res.append(python::tuple(ring));
|
|
}
|
|
return python::tuple(res);
|
|
}
|
|
python::object atomMembers(const RingInfo *self, unsigned int idx) {
|
|
return python::tuple(self->atomMembers(idx));
|
|
}
|
|
python::object bondMembers(const RingInfo *self, unsigned int idx) {
|
|
return python::tuple(self->bondMembers(idx));
|
|
}
|
|
python::object atomRingSizes(const RingInfo *self, unsigned int idx) {
|
|
return python::tuple(self->atomRingSizes(idx));
|
|
}
|
|
python::object bondRingSizes(const RingInfo *self, unsigned int idx) {
|
|
return python::tuple(self->bondRingSizes(idx));
|
|
}
|
|
|
|
#ifdef RDK_USE_URF
|
|
python::object atomRingFamilies(const RingInfo *self) {
|
|
python::list res;
|
|
for (const auto &ring : self->atomRingFamilies()) {
|
|
res.append(python::tuple(ring));
|
|
}
|
|
return python::tuple(res);
|
|
}
|
|
python::object bondRingFamilies(const RingInfo *self) {
|
|
python::list res;
|
|
for (const auto &ring : self->bondRingFamilies()) {
|
|
res.append(python::tuple(ring));
|
|
}
|
|
return python::tuple(res);
|
|
}
|
|
#endif
|
|
|
|
void addRing(RingInfo *self, python::object atomRing, python::object bondRing) {
|
|
unsigned int nAts = python::extract<unsigned int>(atomRing.attr("__len__")());
|
|
unsigned int nBnds =
|
|
python::extract<unsigned int>(bondRing.attr("__len__")());
|
|
if (nAts != nBnds) {
|
|
throw_value_error("list sizes must match");
|
|
}
|
|
if (!self->isInitialized()) {
|
|
self->initialize();
|
|
}
|
|
INT_VECT aring(nAts);
|
|
INT_VECT bring(nAts);
|
|
for (unsigned int i = 0; i < nAts; ++i) {
|
|
aring[i] = python::extract<int>(atomRing[i])();
|
|
bring[i] = python::extract<int>(bondRing[i])();
|
|
}
|
|
self->addRing(aring, bring);
|
|
}
|
|
} // namespace
|
|
|
|
namespace RDKit {
|
|
std::string classDoc = "contains information about a molecule's rings\n";
|
|
|
|
struct ringinfo_wrapper {
|
|
static void wrap() {
|
|
python::class_<RingInfo>("RingInfo", classDoc.c_str(), python::no_init)
|
|
.def("IsAtomInRingOfSize", &RingInfo::isAtomInRingOfSize)
|
|
.def("MinAtomRingSize", &RingInfo::minAtomRingSize)
|
|
.def("AreAtomsInSameRing", &RingInfo::areAtomsInSameRing)
|
|
.def("AreAtomsInSameRingOfSize", &RingInfo::areAtomsInSameRingOfSize)
|
|
.def("IsBondInRingOfSize", &RingInfo::isBondInRingOfSize)
|
|
.def("MinBondRingSize", &RingInfo::minBondRingSize)
|
|
.def("AreBondsInSameRing", &RingInfo::areBondsInSameRing)
|
|
.def("AreBondsInSameRingOfSize", &RingInfo::areBondsInSameRingOfSize)
|
|
.def("NumAtomRings", &RingInfo::numAtomRings)
|
|
.def("NumBondRings", &RingInfo::numBondRings)
|
|
.def("NumRings", &RingInfo::numRings)
|
|
.def("IsRingFused", &RingInfo::isRingFused)
|
|
.def("AreRingsFused", &RingInfo::areRingsFused)
|
|
.def("NumFusedBonds", &RingInfo::numFusedBonds)
|
|
.def("AtomRings", atomRings)
|
|
.def("BondRings", bondRings)
|
|
.def("AtomMembers", atomMembers)
|
|
.def("BondMembers", bondMembers)
|
|
.def("AtomRingSizes", atomRingSizes)
|
|
.def("BondRingSizes", bondRingSizes)
|
|
#ifdef RDK_USE_URF
|
|
.def("NumRingFamilies", &RingInfo::numRingFamilies)
|
|
.def("NumRelevantCycles", &RingInfo::numRelevantCycles)
|
|
.def("AtomRingFamilies", atomRingFamilies)
|
|
.def("BondRingFamilies", bondRingFamilies)
|
|
.def("AreRingFamiliesInitialized",
|
|
&RingInfo::areRingFamiliesInitialized)
|
|
#endif
|
|
.def("AddRing", addRing,
|
|
(python::arg("self"), python::arg("atomIds"),
|
|
python::arg("bondIds")),
|
|
"Adds a ring to the set. Be very careful with this operation.");
|
|
};
|
|
};
|
|
} // namespace RDKit
|
|
void wrap_ringinfo() { RDKit::ringinfo_wrapper::wrap(); }
|