pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-03 21:44:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

run clang-format with c++-11 style over that

Browse Source
This commit is contained in:
Greg Landrum
2017-04-22 17:19:10 +02:00
parent 7c0bb0b743
commit 915cf08faa
134 changed files with 917 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Code/GraphMol/Substruct/SubstructMatch.cpp
View File

@@ -413,9 +413,8 @@ unsigned int SubstructMatch(const ROMol &mol, const ROMol &query,
iter1 != pms.end(); ++iter1) {
MatchVectType matchVect;
matchVect.resize(nQueryAtoms);
for (const auto & iter2 : *iter1) {
matchVect[iter2.first] =
std::pair<int, int>(iter2.first, iter2.second);
for (const auto &iter2 : *iter1) {
matchVect[iter2.first] = std::pair<int, int>(iter2.first, iter2.second);
}
matches.push_back(matchVect);
}
@@ -528,7 +527,7 @@ unsigned int RecursiveMatcher(const ROMol &mol, const ROMol &query,
int rootIdx;
query.getProp(common_properties::_queryRootAtom, rootIdx);
bool found = false;
for (const auto & pairIter : *iter1) {
for (const auto &pairIter : *iter1) {
if (pairIter.first == static_cast<unsigned int>(rootIdx)) {
matches.push_back(pairIter.second);
found = true;
@@ -569,9 +568,8 @@ void MatchSubqueries(const ROMol &mol, QueryAtom::QUERYATOM_QUERY *query,
matchDone = true;
const RecursiveStructureQuery *orsq =
(const RecursiveStructureQuery *)subqueryMap[rsq->getSerialNumber()];
for (auto setIter =
orsq->beginSet();
setIter != orsq->endSet(); ++setIter) {
for (auto setIter = orsq->beginSet(); setIter != orsq->endSet();
++setIter) {
rsq->insert(*setIter);
}
// std::cerr<<" copying results for query serial number:
@@ -587,7 +585,7 @@ void MatchSubqueries(const ROMol &mol, QueryAtom::QUERYATOM_QUERY *query,
RecursiveMatcher(mol, *queryMol, matchStarts, useChirality,
subqueryMap, useQueryQueryMatches, locked);
if (res) {
for (int & matchStart : matchStarts) {
for (int &matchStart : matchStarts) {
rsq->insert(matchStart);
}
}
@@ -630,8 +628,7 @@ bool isToBeAddedToVector(std::vector<MatchVectType> &matches,
bool isToBeAdded = true;
MatchVectType mCopy = m;
std::sort(mCopy.begin(), mCopy.end(), matchCompare);
for (auto it = matches.end();
isToBeAdded && it != matches.begin();) {
for (auto it = matches.end(); isToBeAdded && it != matches.begin();) {
--it;
isToBeAdded = (it->size() != mCopy.size());
if (!isToBeAdded) {