Files
rdkit/Code/GraphMol/PeriodicTable.cpp
Ric a6b26253ff Fix (most of) mem problems (#2123)
* 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
2018-10-29 14:33:26 +00:00

99 lines
2.7 KiB
C++

// $Id$
//
// Copyright (C) 2001-2006 Rational Discovery LLC
//
// @@ 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.
//
#include "PeriodicTable.h"
#include <string>
#include <boost/tokenizer.hpp>
typedef boost::tokenizer<boost::char_separator<char>> tokenizer;
#include <sstream>
#include <locale>
#if RDK_BUILD_THREADSAFE_SSS
#include <mutexp>
#endif
namespace RDKit {
class std::unique_ptr<PeriodicTable> PeriodicTable::ds_instance = nullptr;
PeriodicTable::PeriodicTable() {
// it is assumed that the atomic atomData string constains atoms
// in sequence and no atoms are missing in between
byanum.clear();
byname.clear();
boost::char_separator<char> eolSep("\n");
tokenizer tokens(periodicTableAtomData, eolSep);
for (tokenizer::iterator token = tokens.begin(); token != tokens.end();
++token) {
if (*token != " ") {
atomicData adata(*token);
byanum.push_back(adata);
std::string enam = adata.Symbol();
byname[enam] = adata.AtomicNum();
}
}
unsigned int lidx = 0;
std::istringstream istr;
istr.imbue(std::locale("C"));
while (isotopesAtomData[lidx] != "" && isotopesAtomData[lidx] != "EOS") {
tokenizer lines(isotopesAtomData[lidx++], eolSep);
boost::char_separator<char> spaceSep(" \t");
for (tokenizer::iterator line = lines.begin(); line != lines.end();
++line) {
if (*line != " ") {
tokenizer tokens(*line, spaceSep);
tokenizer::iterator token = tokens.begin();
int anum;
istr.clear();
istr.str(*token);
istr >> anum;
atomicData &adata = byanum[anum];
++token;
if (token == tokens.end()) continue;
++token;
if (token == tokens.end()) continue;
unsigned int isotope;
istr.clear();
istr.str(*token);
istr >> isotope;
++token;
if (token == tokens.end()) continue;
double mass;
istr.clear();
istr.str(*token);
istr >> mass;
++token;
if (token == tokens.end()) continue;
double abundance;
istr.clear();
istr.str(*token);
istr >> abundance;
adata.d_isotopeInfoMap[isotope] = std::make_pair(mass, abundance);
}
}
}
}
void PeriodicTable::initInstance() { ds_instance = std::unique_ptr<PeriodicTable>(new PeriodicTable()); }
PeriodicTable *PeriodicTable::getTable() {
#if RDK_BUILD_THREADSAFE_SSS
static std::once_flag pt_init_once;
std::call_once(pt_init_once, initInstance);
#else
if (!ds_instance) initInstance();
#endif
return ds_instance.get();
}
} // end of namespace