1 files changed, 11 insertions, 11 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/algorithm/clustering/SNNClustering.java b/src/de/lmu/ifi/dbs/elki/algorithm/clustering/SNNClustering.java
index 7c3a13c9..ae612b2a 100644
--- a/src/de/lmu/ifi/dbs/elki/algorithm/clustering/SNNClustering.java
+++ b/src/de/lmu/ifi/dbs/elki/algorithm/clustering/SNNClustering.java
@@ -37,6 +37,7 @@ import de.lmu.ifi.dbs.elki.data.type.TypeUtil;
 import de.lmu.ifi.dbs.elki.database.Database;
 import de.lmu.ifi.dbs.elki.database.ids.ArrayModifiableDBIDs;
 import de.lmu.ifi.dbs.elki.database.ids.DBID;
+import de.lmu.ifi.dbs.elki.database.ids.DBIDIter;
 import de.lmu.ifi.dbs.elki.database.ids.DBIDUtil;
 import de.lmu.ifi.dbs.elki.database.ids.ModifiableDBIDs;
 import de.lmu.ifi.dbs.elki.database.query.similarity.SimilarityQuery;
@@ -154,9 +155,9 @@ public class SNNClustering<O> extends AbstractAlgorithm<Clustering<Model>> imple
     noise = DBIDUtil.newHashSet();
     processedIDs = DBIDUtil.newHashSet(relation.size());
     if(relation.size() >= minpts) {
-      for(DBID id : snnInstance.getRelation().iterDBIDs()) {
+      for(DBIDIter id = snnInstance.getRelation().iterDBIDs(); id.valid(); id.advance()) {
         if(!processedIDs.contains(id)) {
-          expandCluster(snnInstance, id, objprog, clusprog);
+          expandCluster(snnInstance, id.getDBID(), objprog, clusprog);
           if(processedIDs.size() == relation.size() && noise.size() == 0) {
             break;
           }
@@ -168,7 +169,7 @@ public class SNNClustering<O> extends AbstractAlgorithm<Clustering<Model>> imple
       }
     }
     else {
-      for(DBID id : snnInstance.getRelation().iterDBIDs()) {
+      for(DBIDIter id = snnInstance.getRelation().iterDBIDs(); id.valid(); id.advance()) {
         noise.add(id);
         if(objprog != null && clusprog != null) {
           objprog.setProcessed(noise.size(), logger);
@@ -202,9 +203,9 @@ public class SNNClustering<O> extends AbstractAlgorithm<Clustering<Model>> imple
    */
   protected ArrayModifiableDBIDs findSNNNeighbors(SimilarityQuery<O, IntegerDistance> snnInstance, DBID queryObject) {
     ArrayModifiableDBIDs neighbors = DBIDUtil.newArray();
-    for(DBID id : snnInstance.getRelation().iterDBIDs()) {
-      if(snnInstance.similarity(queryObject, id).compareTo(epsilon) >= 0) {
-        neighbors.add(id);
+    for(DBIDIter iditer = snnInstance.getRelation().iterDBIDs(); iditer.valid(); iditer.advance()) {
+      if(snnInstance.similarity(queryObject, iditer).compareTo(epsilon) >= 0) {
+        neighbors.add(iditer);
       }
     }
     return neighbors;
@@ -237,7 +238,7 @@ public class SNNClustering<O> extends AbstractAlgorithm<Clustering<Model>> imple
 
     // try to expand the cluster
     ModifiableDBIDs currentCluster = DBIDUtil.newArray();
-    for(DBID seed : seeds) {
+    for(DBIDIter seed = seeds.iter(); seed.valid(); seed.advance()) {
       if(!processedIDs.contains(seed)) {
         currentCluster.add(seed);
         processedIDs.add(seed);
@@ -253,7 +254,8 @@ public class SNNClustering<O> extends AbstractAlgorithm<Clustering<Model>> imple
       ArrayModifiableDBIDs neighborhood = findSNNNeighbors(snnInstance, o);
 
       if(neighborhood.size() >= minpts) {
-        for(DBID p : neighborhood) {
+        for(DBIDIter iter = neighborhood.iter(); iter.valid(); iter.advance()) {
+          DBID p = iter.getDBID();
           boolean inNoise = noise.contains(p);
           boolean unclassified = !processedIDs.contains(p);
           if(inNoise || unclassified) {
@@ -283,9 +285,7 @@ public class SNNClustering<O> extends AbstractAlgorithm<Clustering<Model>> imple
       resultList.add(currentCluster);
     }
     else {
-      for(DBID id : currentCluster) {
-        noise.add(id);
-      }
+      noise.addDBIDs(currentCluster);
       noise.add(startObjectID);
       processedIDs.add(startObjectID);
     }