Updated checking of indices which now are -1 if unset, instead of null

cdk · Aug 30, 2010 · cd8ccee · cd8ccee
1 parent 9c6c830
commit cd8ccee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/org/openscience/cdk/smsd/algorithm/vflib/VFlibSubStructureHandler.java b/src/main/org/openscience/cdk/smsd/algorithm/vflib/VFlibSubStructureHandler.java
@@ -253,7 +253,7 @@ private void setVFMappings(boolean RONP, IQuery query) {
                 }
                 Integer qIndex = Integer.valueOf(getReactantMol().getAtomNumber(qAtom));
                 Integer tIndex = Integer.valueOf(getProductMol().getAtomNumber(tAtom));
-                if (qIndex != null && tIndex != null) {
+                if (qIndex != -1 && tIndex != -1) {
                     atomatomMapping.put(qAtom, tAtom);
                     indexindexMapping.put(qIndex, tIndex);
                 } else {

diff --git a/src/main/org/openscience/cdk/smsd/algorithm/vflib/VFlibTurboHandler.java b/src/main/org/openscience/cdk/smsd/algorithm/vflib/VFlibTurboHandler.java
@@ -314,7 +314,7 @@ private void setMcGregorMappings(List<List<Integer>> mappings) throws CDKExcepti
                 Integer qIndex = mapping.get(index);
                 Integer tIndex = mapping.get(index + 1);
 
-                if (qIndex != null && tIndex != null) {
+                if (qIndex != -1 && tIndex != -1) {
                     atomatomMapping.put(qAtom, tAtom);
                     indexindexMapping.put(qIndex, tIndex);
                 } else {