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

Fix #3365 (#3366)

Browse Source 
* Fixes #3365

* update expected inchi results

Note that this actually increases the number of failures with one of the tests.
That's because I believe the expected InChIs to be wrong and these new results to be correct.
This commit is contained in:
Greg Landrum
2020-08-27 01:10:15 +02:00
committed by GitHub
parent 1a3ce773cf
commit c259a81e01
3 changed files with 82 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
External/INCHI-API/inchi.cpp vendored
View File

@@ -1828,19 +1828,24 @@ std::string MolToInchi(const ROMol& mol, ExtraInchiReturnValues& rv,
// charge
inchiAtoms[i].charge = atom->getFormalCharge();
// radical
if (atom->getNumRadicalElectrons()) {
inchiAtoms[i].radical = atom->getNumRadicalElectrons() + 1;
} else {
inchiAtoms[i].radical = 0;
}
// number of iso H
inchiAtoms[i].num_iso_H[0] = -1;
inchiAtoms[i].num_iso_H[1] = 0;
inchiAtoms[i].num_iso_H[2] = 0;
inchiAtoms[i].num_iso_H[3] = 0;
// radical
inchiAtoms[i].radical = 0;
if (atom->getNumRadicalElectrons()) {
// the direct specification of radicals in InChI is tricky since they use
// the MDL representation (singlet, double, triplet) and we just have the
// number of unpaired electrons. Instead we set the number of implicit Hs
// here, that together with the atom identity and charge should be
// sufficient
inchiAtoms[i].num_iso_H[0] = atom->getTotalNumHs();
} else {
}
// convert tetrahedral chirality info to Stereo0D
if (atom->getChiralTag() != Atom::CHI_UNSPECIFIED ||
atom->hasProp("molParity")) {

65
External/INCHI-API/test.cpp vendored
View File

@@ -509,7 +509,6 @@ void testGithubIssue562() {
TEST_ASSERT(m->getAtomWithIdx(0)->getNoImplicit() == true);
std::string oinchi = MolToInchi(*m, tmp);
TEST_ASSERT(oinchi == inchi);
delete m;
@@ -721,12 +720,69 @@ M END
BOOST_LOG(rdInfoLog) << "done" << std::endl;
}
void testGithub3365() {
BOOST_LOG(rdErrorLog) << "-------------------------------------" << std::endl;
BOOST_LOG(rdInfoLog)
<< "testing github #3365: problems with high radical counts" << std::endl;
{
auto m = "[C]"_smiles;
TEST_ASSERT(m);
TEST_ASSERT(m->getAtomWithIdx(0)->getNumRadicalElectrons() == 4);
ExtraInchiReturnValues tmp;
std::string inchi = MolToInchi(*m, tmp);
TEST_ASSERT(inchi == "InChI=1S/C");
}
{
auto m = "[CH]"_smiles;
TEST_ASSERT(m);
TEST_ASSERT(m->getAtomWithIdx(0)->getNumRadicalElectrons() == 3);
ExtraInchiReturnValues tmp;
std::string inchi = MolToInchi(*m, tmp);
TEST_ASSERT(inchi == "InChI=1S/CH/h1H");
}
{
auto m = "[CH2]"_smiles;
TEST_ASSERT(m);
TEST_ASSERT(m->getAtomWithIdx(0)->getNumRadicalElectrons() == 2);
ExtraInchiReturnValues tmp;
std::string inchi = MolToInchi(*m, tmp);
TEST_ASSERT(inchi == "InChI=1S/CH2/h1H2");
}
{
auto m = "[CH3]"_smiles;
TEST_ASSERT(m);
TEST_ASSERT(m->getAtomWithIdx(0)->getNumRadicalElectrons() == 1);
ExtraInchiReturnValues tmp;
std::string inchi = MolToInchi(*m, tmp);
TEST_ASSERT(inchi == "InChI=1S/CH3/h1H3");
}
{
auto m = "C[SH](C)=O"_smiles;
TEST_ASSERT(m);
TEST_ASSERT(m->getAtomWithIdx(1)->getNumRadicalElectrons() == 1);
ExtraInchiReturnValues tmp;
std::string inchi = MolToInchi(*m, tmp);
TEST_ASSERT(inchi == "InChI=1S/C2H7OS/c1-4(2)3/h4H,1-2H3");
}
{
auto m = "C[SH](C)(O)O"_smiles;
TEST_ASSERT(m);
TEST_ASSERT(m->getAtomWithIdx(1)->getNumRadicalElectrons() == 1);
ExtraInchiReturnValues tmp;
std::string inchi = MolToInchi(*m, tmp);
TEST_ASSERT(inchi == "InChI=1S/C2H9O2S/c1-5(2,3)4/h3-5H,1-2H3");
}
BOOST_LOG(rdInfoLog) << "done" << std::endl;
}
//-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//
//-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
int main() {
RDLog::InitLogs();
#if 1
#if 0
testGithubIssue3();
testGithubIssue8();
testGithubIssue40();
@@ -735,9 +791,10 @@ int main() {
testGithubIssue296();
testMultiThread();
testGithubIssue437();
testGithubIssue562();
testGithubIssue614();
testGithubIssue1572();
#endif
testMolBlockToInchi();
#endif
testGithubIssue562();
testGithub3365();
}

13
rdkit/Chem/UnitTestInchi.py
View File

@@ -129,6 +129,11 @@ class TestCase(unittest.TestCase):
ref_inchi = inchi_db[m.GetProp('PUBCHEM_COMPOUND_CID')]
x, y = MolToInchi(m), ref_inchi
if x != y:
# print("---------------")
# print(m.GetProp('PUBCHEM_COMPOUND_CID'))
# print(MolToSmiles(m))
# print(y)
# print(x)
if re.search(r'.[1-9]?ClO4', x) is not None:
reasonable += 1
continue
@@ -162,9 +167,9 @@ class TestCase(unittest.TestCase):
fmt = "\n{0}InChI write Summary: {1} identical, {2} suffix variance, {3} reasonable{4}"
print(fmt.format(COLOR_GREEN, same, diff, reasonable, COLOR_RESET))
self.assertEqual(same, 1164)
self.assertEqual(same, 1162)
self.assertEqual(diff, 0)
self.assertEqual(reasonable, 17)
self.assertEqual(reasonable, 19)
def test1InchiReadPubChem(self):
for f in self.dataset.values():
@@ -250,9 +255,9 @@ class TestCase(unittest.TestCase):
same += 1
fmt = "\n{0}InChI read Summary: {1} identical, {2} variance, {3} reasonable variance{4}"
print(fmt.format(COLOR_GREEN, same, diff, reasonable, COLOR_RESET))
self.assertEqual(same, 628)
self.assertEqual(same, 684)
self.assertEqual(diff, 0)
self.assertEqual(reasonable, 553)
self.assertEqual(reasonable, 497)
def test2InchiOptions(self):
m = MolFromSmiles("CC=C(N)C")