Resolve #523 2 Move always false condition hybrid=Sp to where oxnum==0 is tested.

johnmay · johnmay · commit cc82ecd8a197 · 2019-01-02T22:02:04.000Z
diff --git a/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/ALOGPDescriptor.java b/descriptor/qsarmolecular/src/main/java/org/openscience/cdk/qsar/descriptors/molecular/ALOGPDescriptor.java
@@ -1071,11 +1071,14 @@ else if (xCount == 2)
                 else if (xCount == 3)
                     return 54;
                 else if (xCount >= 4) return 55;
-            } else if (hybrid.equals("sp2")) return 47;
+            } else if (hybrid.equals("sp2")) {
+                return 47;
+            } else if (hybrid.equals("sp")) {
+                return 48;
+            }
         } else if (oxNum == 1 && hybrid.equals("sp3"))
             return 47;
-        else if ((oxNum == 2 && hybrid.equals("sp3")) || (oxNum == 1 && hybrid.equals("sp2"))
-                || (oxNum == 0 && hybrid.equals("sp")))
+        else if (oxNum == 2 && hybrid.equals("sp3") || oxNum == 1 && hybrid.equals("sp2"))
             return 48;
         else if ((oxNum == 3 && hybrid.equals("sp3")) || (oxNum >= 2 && hybrid.equals("sp2"))
                 || (oxNum >= 1 && hybrid.equals("sp"))) return 49;
