Skip to content

Commit 3e7dbb9

Browse files
committed
Simplified oxNum, central atom is always a carbon so any of the hetero atoms is okay. Wow forgot about "destroyBondOrder", definitely not clear it simply "unboxed" the enum to a number!
1 parent 6abe4be commit 3e7dbb9

File tree

1 file changed

+2
-10
lines changed
  • descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular

1 file changed

+2
-10
lines changed

descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/ALOGPDescriptor.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,16 +1455,8 @@ else if (bj.getOrder() == IBond.Order.TRIPLE) {
14551455

14561456
for (int j = 0; j <= ca2.size() - 1; j++) {
14571457
IAtom ca2j = (IAtom) ca2.get(j);
1458-
1459-
// // F,O,Cl,Br,N
1460-
1461-
// if (s.equals("F") || s.equals("O") || s.equals("Cl")
1462-
// || s.equals("Br") || s.equals("N") || s.equals("S"))
1463-
1464-
if (ap.getNormalizedElectronegativity(ca2j.getSymbol()) > 1) {
1465-
oxNum += BondManipulator.destroyBondOrder(atomContainer.getBond(ca0, ca2j).getOrder());
1466-
}
1467-
1458+
if (isHetero(ca2j))
1459+
oxNum += atomContainer.getBond(ca0, ca2j).getOrder().numeric();
14681460
}
14691461

14701462
if (hybrid.equals("sp3") && oxNum == 1) {

0 commit comments

Comments
 (0)