mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-04 21:54:27 +08:00
* short test file for MolVS standardize_sm * short test file for MolVS fragment * short test file for MolVS metals * short test file for MolVS normalize * short test file for MolVS reionize * short test file for MolVS tautomer * short test file for MolVS validate * long test file for MolVS standardize smiles * long test file for MolVS fragment * long test file for MolVS metals * long test file for MolVS normalize * long test file for MolVS reionize * long test file for MolVS tautomer * long test file for MolVS validate * Unit tests for MolVS steps * dropping support for Python2 * molvs/__init__.py * molvs/charge.py * molvs/errors.py * molvs/fragment.py * molvs/metal.py * molvs/normalize.py * molvs/resonance.py * molvs/standardize.py * molvs/tautomer.py * molvs/utils.py * molvs/validate.py * molvs/validations.py * molvs/cli.py * adapted and renamed molvs/cli.py to work within $RDBASE/Contrib/MolVS/ * setup MolStandardize directories, source with empty cleanup function, header, CMake files * corrections to empty source, header and test1.cpp * adding empty functions and initializers to MolStandardize * empty Metal source, header and added test * added most of Metal.cpp functionality and made some more tests * empty functions and initializers to Normalize * empty functions and initializers to Validate * added most code for RDKitDefault mode, along with some tests * restructure for abstract base class ValidateMethod * written in isNoneValidation for MolVSValidation * took out isNoneValidation, put in noAtomValidation, neutralValidation, isotopeValidation for MolVSValidation * added in AllowedAtoms * added in disallowedAtoms * corrections to Validate * added code for FragmentRemover * extended fragment functionality to include choose largest fragment, added in tests for fragment catalog, fragment remover. Also added fragmentValidation method in MolStandardize * added another test to testValidate test_fragment * corrections to fragment * corrections to Metal * added code for Normalize * added normalize member function to MolStandardize and added tests * added multi fragment functionality to Normalize.cpp and additional tests * TransformCatalog * tests for Normalize.cpp * first bit of cleanup * added most of Charge functionality and some tests * some corrections to Charge.cpp and some more tests to testCharge.cpp * corrections to Charge.cpp * start of Tautomer Enumerate with some tests * added BondType option to Tautomer Enumeration * correcting for some memory leakage * a few alterations to formatting * sorting out some memory leaks * sorting out some memory leaks * some corrections for PCS test set * redo tests with updated RDKit * fixing memory leak * more fixes after 100kPCS set testing * using tab as delimiter in CSVs rather than comma * tutorial for MolStandardize * still working on Tautomer enumeration * deleted some empty tests * starting writing tautomer canonicalize * rename test_data -> data (the source still needs to be updated) * automatic source reformatting * adjust to directory rename * move the fragment catalog test into the MolStandardize directory do not create separate library for FragmentCatalog * stop building separate libraries for the catalogs * move the CleanupParameters into the MolStandardize namespace * first pass at python wrapper * move the py module to the correct dir; add some python tests; add standardizeSmiles to python wrapper * disabling the compareMolVSTest since that requires command line arguments to run * get this building on windows * put the python lib in the right place * further work on python wrapper for rdMolStandardize * added get and set functions to Metal and wrapped them * added get and set functions to Metal and wrapped them * changed construstor of Reionizer class and input args for reionize, wrapped this default * overload Reionizer constructor so user can input own AcidBaseFile from python * added Uncharger class to Charge and added test for Uncharger * wrapped Fragment, fixed some memory leakage, changed some args and return types, added some tests * wrapped Normalized and changed how Normalizer class is initiated * changing MolVSValidation structure so user can choose which MolVS submethod they want * starting to write Wrap for Validate * now it compiles with Wrap/Validate.cpp * a couple refactorings around validate * move the validate code into the rdMolStandardize module * make sure a valid pointer is returned for standardizeSmiles * rdMolStandardize.MolVSValidation done and tests added * half way through AllowedAtomsValidation * finished AllowedAtomsValidation and DisallowedAtomsValidation * moved charge, fragment, metal, normalize into the rdMolStandardize module * changed tutorial to use wrapped code * added copyrights * added copyrights * move the data files * modify source files to adjust to the move * added validateSmiles functionality * removed std::cout * redid some of the 100k PCS tests * working on the tutorial * adding some documentation * deleting some comment lines * some changes after pull review * More changes after pull review * start of trying to make java wrap * remove some warnings, add some questions * additional warning removals, a bit more reporting * some test cleanups * enable testing of the java code
96 lines
3.1 KiB
C++
96 lines
3.1 KiB
C++
//
|
|
// Copyright (C) 2018 Susan H. Leung
|
|
//
|
|
// @@ 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 "Metal.h"
|
|
#include <GraphMol/SmilesParse/SmilesParse.h>
|
|
#include <GraphMol/SmilesParse/SmilesWrite.h>
|
|
#include <GraphMol/RDKitBase.h>
|
|
#include <GraphMol/Substruct/SubstructMatch.h>
|
|
|
|
#include <GraphMol/RDKitQueries.h>
|
|
#include <GraphMol/Substruct/SubstructMatch.h>
|
|
#include <GraphMol/Substruct/SubstructUtils.h>
|
|
|
|
using namespace std;
|
|
using namespace RDKit;
|
|
namespace RDKit {
|
|
class RWMol;
|
|
class ROMol;
|
|
|
|
namespace MolStandardize {
|
|
|
|
MetalDisconnector::MetalDisconnector()
|
|
: metal_nof(
|
|
SmartsToMol("[Li,Na,K,Rb,Cs,Fr,Be,Mg,Ca,Sr,Ba,Ra,Sc,Ti,V,Cr,Mn,Fe,Co,"
|
|
"Ni,Cu,Zn,Al,Ga,Y,Zr,Nb,Mo,Tc,Ru,Rh,Pd,Ag,Cd,In,Sn,Hf,Ta,"
|
|
"W,Re,Os,Ir,Pt,Au,Hg,Tl,Pb,Bi]~[N,O,F]")),
|
|
metal_non(SmartsToMol(
|
|
"[Al,Sc,Ti,V,Cr,Mn,Fe,Co,Ni,Cu,Zn,Y,Zr,Nb,Mo,Tc,Ru,Rh,Pd,Ag,Cd,Hf,Ta,"
|
|
"W,Re,Os,Ir,Pt,Au]~[B,C,Si,P,As,Sb,S,Se,Te,Cl,Br,I,At]")){
|
|
BOOST_LOG(rdInfoLog) << "Initializing MetalDisconnector\n";
|
|
};
|
|
|
|
MetalDisconnector::MetalDisconnector(const MetalDisconnector &other) {
|
|
metal_nof = other.metal_nof;
|
|
metal_non = other.metal_non;
|
|
};
|
|
|
|
MetalDisconnector::~MetalDisconnector(){};
|
|
|
|
ROMol *MetalDisconnector::getMetalNof() {return metal_nof.get();}
|
|
|
|
ROMol *MetalDisconnector::getMetalNon() {return metal_non.get();}
|
|
|
|
void MetalDisconnector::setMetalNof(const ROMol &mol) {
|
|
this->metal_nof = static_cast<ROMOL_SPTR>(new ROMol(mol));
|
|
}
|
|
|
|
void MetalDisconnector::setMetalNon(const ROMol &mol) {
|
|
this->metal_non = static_cast<ROMOL_SPTR>(new ROMol(mol));
|
|
}
|
|
|
|
ROMol *MetalDisconnector::disconnect(const ROMol &mol) {
|
|
auto *res = new RWMol(mol);
|
|
MetalDisconnector::disconnect(*res);
|
|
return static_cast<ROMol *>(res);
|
|
}
|
|
|
|
void MetalDisconnector::disconnect(RWMol &mol) {
|
|
BOOST_LOG(rdInfoLog) << "Running MetalDisconnector\n";
|
|
std::list<ROMOL_SPTR> metalList = {metal_nof, metal_non};
|
|
for (auto &query : metalList) {
|
|
std::vector<MatchVectType> matches;
|
|
unsigned int matched;
|
|
|
|
matched = SubstructMatch(mol, *query, matches);
|
|
|
|
for (size_t i = 0; i < matched; ++i) {
|
|
// disconnecting metal-R bond
|
|
int metal_idx = matches[i][0].second;
|
|
int non_idx = matches[i][1].second;
|
|
Bond *b = mol.getBondBetweenAtoms(metal_idx, non_idx);
|
|
double order = b->getBondTypeAsDouble();
|
|
mol.removeBond(metal_idx, non_idx);
|
|
|
|
// adjusting neighbouring charges
|
|
Atom *a1 = mol.getAtomWithIdx(metal_idx);
|
|
a1->setFormalCharge(a1->getFormalCharge() + int(order));
|
|
Atom *a2 = mol.getAtomWithIdx(non_idx);
|
|
a2->setFormalCharge(a2->getFormalCharge() - int(order));
|
|
BOOST_LOG(rdInfoLog) << "Removed covalent bond between "
|
|
<< a1->getSymbol() << " and " << a2->getSymbol() << "\n";
|
|
}
|
|
// std::cout << "After removing bond and charge adjustment: " <<
|
|
//MolToSmiles(mol) << std::endl;
|
|
}
|
|
MolOps::sanitizeMol(mol);
|
|
}
|
|
} // namespace MolStandardize
|
|
} // namespace RDKit
|