Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhanced Stereochemistry canonicalization errors #7041

Open
wants to merge 89 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
a0f37c2
atropisomer handling added
tadhurst-cdd Nov 13, 2023
1525a51
fixed non-used variables, linking directives
tadhurst-cdd Nov 13, 2023
4e5c03b
BOOST LIB start/stop fixes, linking fix
tadhurst-cdd Nov 13, 2023
217f1ce
Fixes for RDKIT CI errors
tadhurst-cdd Nov 13, 2023
9f55f6c
minimalLib fix
tadhurst-cdd Nov 13, 2023
f1f967c
changed vector<enum> for java builds
tadhurst-cdd Nov 14, 2023
8701c29
check for extra chars in CIP labeling
tadhurst-cdd Nov 14, 2023
cb479c2
removed wrong deprecated message
tadhurst-cdd Nov 14, 2023
217985b
fix ostrstream output error?
tadhurst-cdd Nov 14, 2023
ff8a5c9
restored _ChiralAtomRank to lowercase first letter
tadhurst-cdd Nov 15, 2023
5ea34e7
Merge branch 'master' into pr/atropisomers2
tadhurst-cdd Nov 15, 2023
21c3645
changes for merged master
tadhurst-cdd Nov 15, 2023
4c73e32
Fixed catch label for new Catch package
tadhurst-cdd Nov 15, 2023
1ed0228
update expected psql results
greglandrum Nov 17, 2023
11bbaae
get swig wrappers building
greglandrum Nov 17, 2023
a46feae
Merge pull request #8 from greglandrum/pr/atropisomers2
tadhurst-cdd Nov 17, 2023
83c3ce4
restore MolFileStereochem to FileParsers
tadhurst-cdd Nov 17, 2023
cfc8532
fix java wrapper for reapplyMolBlockWedging
tadhurst-cdd Nov 17, 2023
94efdf1
Merge branch 'master' into pr/atropisomers2
tadhurst-cdd Nov 27, 2023
0947e20
test changes
tadhurst-cdd Nov 27, 2023
d84cf33
Merge branch 'master' into pr/specialQueries
tadhurst-cdd Nov 27, 2023
57f3b44
some suggestions
greglandrum Nov 24, 2023
41055e8
move a couple functions out of Bond
greglandrum Nov 30, 2023
665e95f
Merge branch 'master' into pr/atropisomers2
tadhurst-cdd Nov 30, 2023
cef4c8a
Merge branch 'master' into pr/specialQueries
tadhurst-cdd Nov 30, 2023
ea560bc
Merge branch 'master' into pr/specialQueries
tadhurst-cdd Dec 1, 2023
612dca4
Merge branch 'master' into pr/atropisomers2
tadhurst-cdd Dec 1, 2023
0ed969b
merged master
tadhurst-cdd Dec 1, 2023
923b503
Merge branch 'master' into pr/atropisomers2
tadhurst-cdd Dec 1, 2023
195d0dc
Merge fixes
tadhurst-cdd Dec 1, 2023
07e373d
Renamed setStereoanyFromSquiggleBond
tadhurst-cdd Dec 1, 2023
29b7ddd
Merge pull request #9 from greglandrum/pr/atropisomers2
tadhurst-cdd Dec 1, 2023
50fd98a
Merge branch 'pr/atropisomers2' into pr/specialQueries
tadhurst-cdd Dec 5, 2023
54a8846
atropisomers in cdxml, rationalize atrop wedging, stereoGroups in dra…
tadhurst-cdd Dec 11, 2023
22bfe0f
Merge branch 'master' into pr/atropisomers2
tadhurst-cdd Dec 11, 2023
8b90336
Merge branch 'master' into pr/atropisomers2
tadhurst-cdd Dec 11, 2023
6e6f124
Merge branch 'pr/atropisomers2' of github.com:cdd/rdkit into pr/atrop…
tadhurst-cdd Dec 11, 2023
21f6fca
Merge branch 'master' into pr/specialQueries
tadhurst-cdd Dec 11, 2023
8ce9c5f
Merge branch 'pr/atropisomers2' into pr/specialQueries
tadhurst-cdd Dec 11, 2023
30d7648
changes from previous PR
tadhurst-cdd Dec 22, 2023
7350892
Iclude false chiral
tadhurst-cdd Dec 26, 2023
18dc96a
Merge branch 'pr/specialQueries' into psuedoChiralCanonError
tadhurst-cdd Dec 26, 2023
e2afd7d
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Jan 12, 2024
c0ee788
rigorous enhnced stereo canoncalization
tadhurst-cdd Jan 12, 2024
d9ed2aa
Added more tests and clenup
tadhurst-cdd Jan 12, 2024
6a1e41d
removed commented out code
tadhurst-cdd Jan 12, 2024
b522186
corrected init of SmilesWriteParams
tadhurst-cdd Jan 12, 2024
5519407
added MolFileStereoChem.h to the header files
tadhurst-cdd Jan 25, 2024
68ae843
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Jan 25, 2024
4889ed7
Renamed Rxn parser to MrvBlockToChemicalReaction
tadhurst-cdd Jan 25, 2024
852e30b
To make catch2 work, and match the checksum
tadhurst-cdd Jan 26, 2024
1adb9c9
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Feb 8, 2024
3227182
Fixed Structchecker errors
tadhurst-cdd Feb 21, 2024
d9da321
fix CI for DetermineBonds catch test
tadhurst-cdd Feb 29, 2024
83de56a
error in catch_test for CI
tadhurst-cdd Mar 1, 2024
979bab7
Allow custom smileWriteParams in GetMolLayers
tadhurst-cdd Mar 5, 2024
81f99f1
misnamed entry point
tadhurst-cdd Mar 5, 2024
4c8ca77
ReactionFromMrvString change name
tadhurst-cdd Mar 6, 2024
3dd825a
Merge branch 'pseudoChiralCanonError' of github.com:cdd/rdkit into ps…
tadhurst-cdd Mar 6, 2024
286b71d
remove adding writeParams to GetMolLayers
tadhurst-cdd Mar 6, 2024
ebf9846
make rigorous enhanced stereo the default, and fix tests
tadhurst-cdd Mar 18, 2024
456ef41
only one abs group no longer needs Rigorous Enhanced treatment
tadhurst-cdd Mar 19, 2024
8ee2fa2
changed string_view to string in catch test
tadhurst-cdd Mar 26, 2024
b555a93
Canonicalize Enhnaced Stereo only resturne unique smiles
tadhurst-cdd Mar 26, 2024
9459831
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Mar 27, 2024
d241af9
Now allows or and and groups together
tadhurst-cdd Apr 2, 2024
38f5f04
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Apr 2, 2024
c82e512
internal routines inside detail scope
tadhurst-cdd Apr 2, 2024
fcd837a
Merge branch 'pseudoChiralCanonError' of github.com:cdd/rdkit into ps…
tadhurst-cdd Apr 2, 2024
9f4e966
fix test error
tadhurst-cdd Apr 3, 2024
24a7b19
changed string back to string_view and fixed a CHECK
tadhurst-cdd Apr 4, 2024
ba110c9
Merge branch 'master' of github.com:cdd/rdkit
tadhurst-cdd Apr 12, 2024
531c525
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Apr 12, 2024
fe73bea
Fixes for PR review tests
tadhurst-cdd Apr 30, 2024
4674389
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Apr 30, 2024
a8fae14
Fix RDKit_Book.rst failure on build test
tadhurst-cdd Apr 30, 2024
d938eed
Merge branch 'pseudoChiralCanonError' of github.com:cdd/rdkit into ps…
tadhurst-cdd Apr 30, 2024
2d381f2
Merge branch 'master' of github.com:cdd/rdkit
tadhurst-cdd May 6, 2024
5b9b894
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd May 6, 2024
d68f6ef
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd May 13, 2024
514fad0
fix xqm sql test
tadhurst-cdd May 14, 2024
9bd54d0
Merge branch 'pseudoChiralCanonError' of github.com:cdd/rdkit into ps…
tadhurst-cdd May 14, 2024
f486447
Merge branch 'master' of github.com:cdd/rdkit
tadhurst-cdd May 15, 2024
b9f5ae6
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd May 15, 2024
b8f9c7d
updated expected files for cxsmiles_test
tadhurst-cdd May 15, 2024
e2b1f9f
Merge branch 'master' of github.com:cdd/rdkit
tadhurst-cdd Jun 3, 2024
ee714a4
Merge branch 'master' of github.com:cdd/rdkit
tadhurst-cdd Jun 3, 2024
1285d89
Merge branch 'master' into pseudoChiralCanonError
tadhurst-cdd Jun 3, 2024
53c7081
Fixed removal of atom attrs
tadhurst-cdd Jun 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion Code/GraphMol/CIPLabeler/Wrap/pyCIPLabelWrapTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from rdkit import Chem


class TestCase(unittest.TestCase):

def testLabelAtomsList(self):
Expand Down
2 changes: 1 addition & 1 deletion Code/GraphMol/CIPLabeler/catch_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ TEST_CASE("AssignMandP", "[accurateCIP]") {
"C1(N2C(C)=CC=C2Br)=C(C)C(C)=C(N2C(C)=CC=C2Br)C(C)=C1C |(-0.0002,1.5403,;-0.0002,3.0805,;-1.334,3.8508,;-2.6678,3.0807,;-1.334,5.391,;1.3338,5.391,;1.3338,3.8508,;2.6676,3.0807,;-1.3338,0.7702,;-2.6678,1.5403,;-1.3338,-0.7702,;-2.6678,-1.5401,;-0.0002,-1.5403,;-0.0002,-3.0805,;1.3338,-3.8508,;2.6676,-3.0805,;1.3338,-5.391,;-1.334,-5.391,;-1.334,-3.8508,;-2.6678,-3.0805,;1.3338,-0.7702,;2.6678,-1.5403,;1.3338,0.7702,;2.6678,1.5404,),wU:1.6,13.14|",
"0-1=m:12-13=m:");
}
SECTION("psuedo") {
SECTION("pseudo") {
testOneAtropIomerMandP(
"N1(n2c(C)ccc2Br)C(=O)[C@H](C)[C@H](C)C1=O |(-11.1517,1.8306,;-11.1517,3.3708,;-12.4855,4.1411,;-13.8193,3.371,;-12.4855,5.6813,;-9.8177,5.6813,;-9.8177,4.1411,;-8.4839,3.371,;-12.3975,0.9252,;-13.8622,1.4011,;-11.9217,-0.5394,;-12.8269,-1.7852,;-10.3817,-0.5394,;-9.4765,-1.7852,;-9.9059,0.9252,;-8.4413,1.4011,),wU:0.8,10.11,12.13|",
"0-1=p:");
Expand Down
2 changes: 1 addition & 1 deletion Code/GraphMol/CIPLabeler/rules/Rule5New.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int Rule5New::compare(const Edge *a, const Edge *b) const {
fillPairs(bEnd, listSB);
int cmpR = listRA.compareTo(listRB);
int cmpS = listSA.compareTo(listSB);
// -2/+2 for psuedo-asymetric
// -2/+2 for pseudo-asymetric
// -1/+1 if not (e.g. the R > R and S > S lists)
if (cmpR < 0) {
return cmpS < 0 ? -1 : -2;
Expand Down
2 changes: 0 additions & 2 deletions Code/GraphMol/Chirality.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3196,8 +3196,6 @@ void assignChiralTypesFrom3D(ROMol &mol, int confId, bool replaceExistingTags) {
}

for (auto atom : mol.atoms()) {
// see if only the explicitly wedged atoms are to be used

// if we aren't replacing existing tags and the atom is already tagged,
// punt:
if (!replaceExistingTags && atom->getChiralTag() != Atom::CHI_UNSPECIFIED) {
Expand Down
19 changes: 17 additions & 2 deletions Code/GraphMol/DetermineBonds/catch_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,15 @@ TEST_CASE("Determine Connectivity") {
std::string smiles = mol->getProp<std::string>("_FileComments");
std::unique_ptr<RWMol> orig(SmilesToMol(smiles));
REQUIRE(orig);
SmilesWriteParams params = {false, false, true, false, false, false, -1};
SmilesWriteParams params;
params.doIsomericSmiles = false;
params.doKekule = false;
params.canonical = true;
params.allBondsExplicit = false;
params.allHsExplicit = false;
params.doRandom = false;
params.rootedAtAtom = -1;

std::string canonSmiles = MolToSmiles(*orig, params);
int charge = MolOps::getFormalCharge(*orig);

Expand Down Expand Up @@ -180,7 +188,14 @@ TEST_CASE("Determine Connectivity") {
std::string smiles = mol->getProp<std::string>("_FileComments");
std::unique_ptr<RWMol> orig(SmilesToMol(smiles));
REQUIRE(orig);
SmilesWriteParams params = {false, false, true, false, false, false, -1};
SmilesWriteParams params;
params.doIsomericSmiles = false;
params.doKekule = false;
params.canonical = true;
params.allBondsExplicit = false;
params.allHsExplicit = false;
params.doRandom = false;
params.rootedAtAtom = -1;
std::string canonSmiles = MolToSmiles(*orig, params);
int charge = MolOps::getFormalCharge(*orig);

Expand Down
2 changes: 1 addition & 1 deletion Code/GraphMol/FileParsers/file_parsers_catch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6276,7 +6276,7 @@ TEST_CASE("MaeWriter basic testing", "[mae][MaeWriter][writer]") {
auto ctBlockStart = mae.find("f_m_ct");
REQUIRE(ctBlockStart != std::string::npos);

std::string_view ctBlock(&mae[ctBlockStart]);
std::string ctBlock(&mae[ctBlockStart]);

CHECK(ctBlock == MaeWriter::getText(*mol));
}
Expand Down
3 changes: 2 additions & 1 deletion Code/GraphMol/MarvinParse/MarvinParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ class MarvinCMLReader {
~MarvinCMLReader(){};

std::unique_ptr<RWMol> parseMolecule(boost::property_tree::ptree molTree,
bool sanitize = false, bool removeHs = false) {
bool sanitize = false,
bool removeHs = false) {
boost::property_tree::ptree molSection;

try {
Expand Down