mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-04 21:54:27 +08:00
71932ee4f9
* 3D Descriptors Dragons * stripped down, not yet working * get this building on a non C++-11 compiler * move the python test to the python directory * move the python test to the python directory * add the python test * now at least those tests runn * warning comment * some basic refactoring and cleanup * get python wrapper "working" (completely untested) * fix Name * fixing AutoCorr & RDF * AutoCorr test added * RDF reviewed based on AutoCorr comments * fix Morse code * Morse reviewed * Correct Morse & start Getaway * correct MORSE test * start Getaway clean up * simplification of Whim * better * fix Getaway * fix RCON * merge repaired * adding Dragon 2D autocorrelations descriptors * fix the 3D autocorrelation descriptors based on the modification in Dragon. * Adding the 2D autocorrelation descriptors (no need of Eigen dependency for this one) * Adding 2D test case * IState … no idea for the moment * there is an error in 2D computation (memory error ???) * fix the IState for molecules with Hs * need to use getTotalNumHs(true) not getTotalNumHs() * also need to remove Hs in both dv and d! * fixing Rcov values I fix the Rcov values * fix Getaway * remove push_back * remove call to sum * improve tests * fix getaway * adding precision parameter to GETAWAY * adding rouding (1e-3) * fix WHIM * use void in declarations of function * update MolDescriptors link * remove print option in WHIM * fix python wrapper to 3D descriptors. - all modifications reduce computation time by a factor of 3! * final fix for Getaway * all output are fixed except the 2 first values due to clustering approach. * cluster cannot be fixed du tu float precision issue between Java & c++ * best fix of ITH and ISH * use the same algorithm as in Dragon 6 but there is still a deviation * remove std::move * std:move only works on c++ 11 * fixing issue based on Greg Comments * auto2D still not working on my env * update 3d test.py * auto 2D not working after the first loop test * tighten up the tests * change name * update, but still does not pass * make this run (though it does not work) * re-enable test3D * some cleanup * add GETAWAY test data. Note that the tests fail * fix the ATS and ATSC autocorrelation 2D Broto Moreau and Geary autocorrelation are not correct again a specificity of Dragon to compute them. The result are not consistant with Padel because we use the relative weigth not in Padel. * one minor change to get things to compile * fix the M & G matrix computation fix inversion in the computation of the equations for both M & G matrixes * update autocorr2d tests * 192 examples * fix issue in cluster 0.01 0.009 case this is not correct all the cases * update GETAWAY expected values to reflect the fact that we cannot reproduce the literature values exactly fix a leak in GETAWAY * fix the negative values in gamma this is strickly the implementation that we find in the book molecular descriptors for chemoinformatics (except the case where an atom is already in the axis in this case it should be added in the symetric list which is not the case in this implementation) * Update WHIM.cpp adding the axis atoms to the symetrical list * update WHIM tests * add AUTOCORR2D to MolDescriptors and the python wrappers * start adding tests * test the python versions of the new descriptors * update list of descriptors
91 lines
2.3 KiB
C++
91 lines
2.3 KiB
C++
// Created by Guillaume GODIN
|
|
// Copyright (C) 2012-2016 Greg Landrum
|
|
// @@ 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 <RDGeneral/Invariant.h>
|
|
#include <GraphMol/RDKitBase.h>
|
|
#include <GraphMol/FileParsers/MolSupplier.h>
|
|
#include <GraphMol/FileParsers/FileParsers.h>
|
|
#include <RDGeneral/RDLog.h>
|
|
#include <vector>
|
|
#include <algorithm>
|
|
#include <fstream>
|
|
#include <sstream>
|
|
|
|
#include <GraphMol/Descriptors/AUTOCORR2D.h>
|
|
|
|
void testautocorrelation() {
|
|
BOOST_LOG(rdErrorLog)
|
|
<< "----------------------------\nstart test autocorr2D\n";
|
|
|
|
std::string pathName = getenv("RDBASE");
|
|
|
|
std::string sdfName =
|
|
pathName + "/Code/GraphMol/Descriptors/test_data/PBF_egfr.sdf";
|
|
// std::string sdfName ="PBF_egfr.sdf";
|
|
|
|
RDKit::SDMolSupplier reader(sdfName, true, false);
|
|
|
|
std::string fName =
|
|
pathName + "/Code/GraphMol/Descriptors/test_data/auto2D.out";
|
|
// std::string fName = "auto2D.out";
|
|
|
|
std::ifstream instrm(fName.c_str());
|
|
|
|
std::string line;
|
|
std::vector<std::vector<std::string> > data;
|
|
|
|
while (std::getline(instrm, line)) {
|
|
std::string phrase;
|
|
std::vector<std::string> row;
|
|
std::stringstream ss(line);
|
|
while (std::getline(ss, phrase, '\t')) {
|
|
row.push_back(phrase);
|
|
}
|
|
data.push_back(row);
|
|
}
|
|
int nDone = 0;
|
|
while (!reader.atEnd()) {
|
|
RDKit::ROMol *m = reader.next();
|
|
TEST_ASSERT(m);
|
|
std::string nm;
|
|
m->getProp("_Name", nm);
|
|
|
|
std::vector<double> res2d;
|
|
|
|
RDKit::Descriptors::AUTOCORR2D(*m, res2d);
|
|
|
|
std::vector<std::string> myrow = data[nDone];
|
|
std::string inm = myrow[0];
|
|
|
|
TEST_ASSERT(inm == nm);
|
|
|
|
for (int i = 0; i < 192; i++) {
|
|
double ref = atof(myrow[i + 1].c_str());
|
|
|
|
if (abs(ref - res2d[i]) > 0.05) {
|
|
std::cout << "value mismatch: pos" << i << " " << inm << " " << ref
|
|
<< " " << res2d[i] << std::endl;
|
|
}
|
|
TEST_ASSERT(fabs(ref - res2d[i]) < 0.05);
|
|
}
|
|
|
|
res2d.clear();
|
|
res2d.resize(48);
|
|
delete m;
|
|
++nDone;
|
|
}
|
|
|
|
BOOST_LOG(rdErrorLog) << " done" << std::endl;
|
|
}
|
|
|
|
int main(int argc, char *argv[]) {
|
|
RDLog::InitLogs();
|
|
testautocorrelation();
|
|
}
|