Fix bitwise 'and' operators to logical ones

cdk · Oct 13, 2018 · 1cd0a7a · 1cd0a7a
1 parent 156b407
commit 1cd0a7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ain/java/org/openscience/cdk/qsar/descriptors/molecular/FragmentComplexityDescriptor.java b/...ain/java/org/openscience/cdk/qsar/descriptors/molecular/FragmentComplexityDescriptor.java
@@ -123,7 +123,7 @@ public DescriptorValue calculate(IAtomContainer container) {
             if (!container.getAtom(i).getSymbol().equals("H")) {
                 a++;
             }
-            if (!container.getAtom(i).getSymbol().equals("H") & !container.getAtom(i).getSymbol().equals("C")) {
+            if (!container.getAtom(i).getSymbol().equals("H") && !container.getAtom(i).getSymbol().equals("C")) {
                 h++;
             }
         }

diff --git a/...c/main/java/org/openscience/cdk/qsar/descriptors/molecular/LargestPiSystemDescriptor.java b/...c/main/java/org/openscience/cdk/qsar/descriptors/molecular/LargestPiSystemDescriptor.java
@@ -179,7 +179,7 @@ public DescriptorValue calculate(IAtomContainer container) {
                     || Math.abs(container.getAtom(i).getFormalCharge()) >= 1
                     || container.getAtom(i).getFlag(CDKConstants.ISAROMATIC)
                     || container.getAtom(i).getSymbol().equals("N") || container.getAtom(i).getSymbol().equals("O"))
-                    & !container.getAtom(i).getFlag(CDKConstants.VISITED)) {
+                    && !container.getAtom(i).getFlag(CDKConstants.VISITED)) {
                 //logger.debug("...... -> Accepted");
                 startSphere = new ArrayList<IAtom>();
                 path = new ArrayList<IAtom>();