mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-04 21:54:27 +08:00
* do not use new on loggers * del pointers in testDistGeom * Update Dict hasNonPOD status on bulk update * delete new Dicts in memtest1.cpp * fixes in MolSuppliers and testFMCS * PeriodicTable singleton as unique_ptr * fix EEM_arrays leak * fix leaks in testPBF * fix ParamCollection leak in test UFF * fix leaks in MMFF * clear prop dict before read in in pickler * fix leaks in testFreeSASA * fix leaks in test3D * modernize Dict.h & SmilesParse.cpp * fix leaks in testQuery * fix leaks in testCrystalFF * fix leaks in cxsmilesTest * fix leaks in Catalog & mol cat test * fix leaks in ShapeUtils & tests * fix leaks in testSubgraphs1 * fix leaks testFingerprintGenerators * fix leaks in Catalog/FilterCatalog * fix leaks in graphmolqueryTest * these changes reduce bison parse leaks * fixed leaks in testChirality.cpp * fix leaks + 2 tests in testMolWriter * fix 4m leaks in substructLibraryTest * small improvements to molTautomerTest; still leaks * fix leaks in testRGroupDecomp * fix leaks in test; parser still leaks * fix leaks in itertest * fix 4m leaks in testDepictor * fixes in smatest; still leaking due to parser * fixes in testSLNParse; still leaking due to parser * flex/bison: always add atoms with ownership; smarts error cleanup * fix leaks in testReaction * fix leaks in testSubstructMatch * fix leaks in resMolSupplierTest * fix leaks in testChemTransforms + bug in ChemTransforms * fix leaks in testPickler * fix leaks in testMolTransform * fix leaks in testFragCatalog * fix leak in testSLNParse. Still leaks due to Smiles * fixed most leaks in testMolSupplier * pre bison fix * fix some atom & bond parse problems; others still fail * bison smiles & smarts, atoms & bonds more or less fixed * fix leaks in molopstest.cpp * fix leaks in testFingerprints, MACCS.cpp & AtomPairs.cpp * fix leaks in moldraw2Dtest1 * fix leaks in testDescriptors * fix leaks in testInchi * fix leaks in testUFFForceFieldHelpers * fix leaks in hanoiTest & new_canon.h * fix leaks in testMMFFForceField * fix leaks in graphmolTest1 * fix leaks in testMMFFForceFieldHelpers * fix leaks in testDistGeomHelpers * fix leaks in testMolAlign * initialize occupancy & temp facto with default values * fix leak in TautomerTransform * updated suppressions * fix testStructChecker * fix logging & py tests * fix TautomerTransform class/struct issue * remove misplaced delete in testSLNParse * deinit in testAvalonLib1 * fix Avalon-triggered(?) bug in StructChecker/Pattern.cpp * fix random testMolWriter/Supplier fails - diversify output file names to avoid clashing. - unify Writers close/destruct behavior. - flushing/closing in tests. * use reset in FFs Params.cpp * comments on testMMFFForceField * unrequired 'if's added to mol suppliers * correct cast in FilterCatalog.h * use unique_ptr in MACCS Patterns * remove unrequred if in new_canon * update & move suppressions
124 lines
3.5 KiB
C++
124 lines
3.5 KiB
C++
// $Id$
|
|
//
|
|
// Copyright (C) 2006 Greg Landrum
|
|
//
|
|
#include <RDGeneral/test.h>
|
|
#include <GraphMol/RDKitBase.h>
|
|
#include <GraphMol/RDKitQueries.h>
|
|
#include <RDGeneral/RDLog.h>
|
|
#include <GraphMol/SmilesParse/SmilesParse.h>
|
|
#include <GraphMol/SmilesParse/SmilesWrite.h>
|
|
|
|
#include "MolCatalog.h"
|
|
#include "MolCatalogEntry.h"
|
|
#include "MolCatalogParams.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <iostream>
|
|
#include <fstream>
|
|
|
|
#include <GraphMol/FileParsers/MolSupplier.h>
|
|
#include <RDGeneral/types.h>
|
|
#include <RDGeneral/FileParseException.h>
|
|
#include <DataStructs/BitVects.h>
|
|
|
|
using namespace RDKit;
|
|
|
|
void test1() {
|
|
BOOST_LOG(rdInfoLog) << ">>------------- Test 1" << std::endl;
|
|
|
|
// MolCatalogParams are currently unused, so testing is easy:
|
|
auto *mparams = new MolCatalogParams();
|
|
std::string pkl = mparams->Serialize();
|
|
TEST_ASSERT(pkl.empty());
|
|
|
|
auto *mcat = new MolCatalog(mparams);
|
|
delete mparams;
|
|
|
|
TEST_ASSERT(mcat->getNumEntries() == 0);
|
|
TEST_ASSERT(mcat->getFPLength() == 0);
|
|
|
|
MolCatalogEntry *entry;
|
|
std::string smi;
|
|
RWMol *mol;
|
|
|
|
mol = SmilesToMol("c1ccc(O)cc1C(=O)O");
|
|
entry = new MolCatalogEntry(mol);
|
|
TEST_ASSERT(entry->getMol() == mol);
|
|
entry->setDescription("top");
|
|
TEST_ASSERT(entry->getDescription() == "top");
|
|
entry->setOrder(0);
|
|
TEST_ASSERT(entry->getOrder() == 0);
|
|
|
|
mcat->addEntry(entry);
|
|
TEST_ASSERT(mcat->getNumEntries() == 1);
|
|
TEST_ASSERT(mcat->getFPLength() == 1);
|
|
TEST_ASSERT(mcat->getEntryWithBitId(0) == entry);
|
|
|
|
mol = SmilesToMol("O");
|
|
entry = new MolCatalogEntry(mol);
|
|
entry->setDescription("child1");
|
|
entry->setOrder(1);
|
|
mcat->addEntry(entry);
|
|
|
|
mol = SmilesToMol("C(=O)O");
|
|
entry = new MolCatalogEntry(mol);
|
|
entry->setDescription("child2");
|
|
entry->setOrder(1);
|
|
mcat->addEntry(entry);
|
|
|
|
TEST_ASSERT(mcat->getNumEntries() == 3);
|
|
TEST_ASSERT(mcat->getFPLength() == 3);
|
|
|
|
TEST_ASSERT(mcat->getEntryWithBitId(0)->getMol()->getNumAtoms() == 10);
|
|
TEST_ASSERT(mcat->getEntryWithBitId(1)->getMol()->getNumAtoms() == 1);
|
|
TEST_ASSERT(mcat->getEntryWithBitId(2)->getMol()->getNumAtoms() == 3);
|
|
|
|
TEST_ASSERT(mcat->getDownEntryList(0).size() == 0);
|
|
TEST_ASSERT(mcat->getDownEntryList(1).size() == 0);
|
|
TEST_ASSERT(mcat->getDownEntryList(2).size() == 0);
|
|
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(0).size() == 1);
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(1).size() == 2);
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(2).size() == 0);
|
|
|
|
mcat->addEdge(0, 1);
|
|
mcat->addEdge(0, 2);
|
|
|
|
TEST_ASSERT(mcat->getDownEntryList(0).size() == 2);
|
|
TEST_ASSERT(mcat->getDownEntryList(1).size() == 0);
|
|
TEST_ASSERT(mcat->getDownEntryList(2).size() == 0);
|
|
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(0).size() == 1);
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(1).size() == 2);
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(2).size() == 0);
|
|
|
|
pkl = mcat->Serialize();
|
|
delete mcat;
|
|
|
|
mcat = new MolCatalog(pkl);
|
|
TEST_ASSERT(mcat->getNumEntries() == 3);
|
|
TEST_ASSERT(mcat->getFPLength() == 3);
|
|
TEST_ASSERT(mcat->getDownEntryList(0).size() == 2);
|
|
TEST_ASSERT(mcat->getDownEntryList(1).size() == 0);
|
|
TEST_ASSERT(mcat->getDownEntryList(2).size() == 0);
|
|
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(0).size() == 1);
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(1).size() == 2);
|
|
TEST_ASSERT(mcat->getEntriesOfOrder(2).size() == 0);
|
|
|
|
TEST_ASSERT(mcat->getEntryWithBitId(0)->getMol()->getNumAtoms() == 10);
|
|
TEST_ASSERT(mcat->getEntryWithBitId(1)->getMol()->getNumAtoms() == 1);
|
|
TEST_ASSERT(mcat->getEntryWithBitId(2)->getMol()->getNumAtoms() == 3);
|
|
|
|
delete mcat;
|
|
|
|
BOOST_LOG(rdInfoLog) << "<<-------------- Done" << std::endl;
|
|
}
|
|
|
|
int main() {
|
|
RDLog::InitLogs();
|
|
test1();
|
|
return 0;
|
|
}
|