1 files changed, 10 insertions, 9 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/algorithm/clustering/OPTICS.java b/src/de/lmu/ifi/dbs/elki/algorithm/clustering/OPTICS.java
index 2244b07b..04b57081 100644
--- a/src/de/lmu/ifi/dbs/elki/algorithm/clustering/OPTICS.java
+++ b/src/de/lmu/ifi/dbs/elki/algorithm/clustering/OPTICS.java
@@ -31,6 +31,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.QueryUtil;
 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.DistanceResultPair;
@@ -142,22 +143,22 @@ public class OPTICS<O, D extends Distance<D>> extends AbstractDistanceBasedAlgor
     if(getDistanceFunction() instanceof PrimitiveDoubleDistanceFunction && DoubleDistance.class.isInstance(epsilon)) {
       // Optimized codepath for double-based distances. Avoids Java
       // boxing/unboxing.
-      for(DBID id : relation.iterDBIDs()) {
-        if(!processedIDs.contains(id)) {
+      for(DBIDIter iditer = relation.iterDBIDs(); iditer.valid(); iditer.advance()) {
+        if(!processedIDs.contains(iditer)) {
           // We need to do some ugly casts to be able to run the optimized version, unfortunately.
           @SuppressWarnings("unchecked")
           final ClusterOrderResult<DoubleDistance> doubleClusterOrder = ClusterOrderResult.class.cast(clusterOrder);
           @SuppressWarnings("unchecked")
           final RangeQuery<O, DoubleDistance> doubleRangeQuery = RangeQuery.class.cast(rangeQuery);
           final DoubleDistance depsilon = DoubleDistance.class.cast(epsilon);
-          expandClusterOrderDouble(doubleClusterOrder, database, doubleRangeQuery, id, depsilon, progress);
+          expandClusterOrderDouble(doubleClusterOrder, database, doubleRangeQuery, iditer.getDBID(), depsilon, progress);
         }
       }
     }
     else {
-      for(DBID id : relation.iterDBIDs()) {
-        if(!processedIDs.contains(id)) {
-          expandClusterOrder(clusterOrder, database, rangeQuery, id, epsilon, progress);
+      for(DBIDIter iditer = relation.iterDBIDs(); iditer.valid(); iditer.advance()) {
+        if(!processedIDs.contains(iditer)) {
+          expandClusterOrder(clusterOrder, database, rangeQuery, iditer.getDBID(), epsilon, progress);
         }
       }
     }
@@ -194,7 +195,7 @@ public class OPTICS<O, D extends Distance<D>> extends AbstractDistanceBasedAlgor
         D coreDistance = last.getDistance();
 
         for(DistanceResultPair<D> neighbor : neighbors) {
-          if(processedIDs.contains(neighbor.getDBID())) {
+          if(processedIDs.contains(neighbor)) {
             continue;
           }
           D reachability = DistanceUtil.max(neighbor.getDistance(), coreDistance);
@@ -234,7 +235,7 @@ public class OPTICS<O, D extends Distance<D>> extends AbstractDistanceBasedAlgor
           double coreDistance = ((DoubleDistanceResultPair) last).getDoubleDistance();
 
           for(DistanceResultPair<DoubleDistance> neighbor : neighbors) {
-            if(processedIDs.contains(neighbor.getDBID())) {
+            if(processedIDs.contains(neighbor)) {
               continue;
             }
             double reachability = Math.max(((DoubleDistanceResultPair) neighbor).getDoubleDistance(), coreDistance);
@@ -247,7 +248,7 @@ public class OPTICS<O, D extends Distance<D>> extends AbstractDistanceBasedAlgor
           double coreDistance = last.getDistance().doubleValue();
 
           for(DistanceResultPair<DoubleDistance> neighbor : neighbors) {
-            if(processedIDs.contains(neighbor.getDBID())) {
+            if(processedIDs.contains(neighbor)) {
               continue;
             }
             double reachability = Math.max(neighbor.getDistance().doubleValue(), coreDistance);