Import Upstream version 0.5.0

1 files changed, 7 insertions, 4 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/neighborhood/ExtendedNeighborhood.java b/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/neighborhood/ExtendedNeighborhood.java
index 9ee92d35..7a2fda52 100644
--- a/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/neighborhood/ExtendedNeighborhood.java
+++ b/src/de/lmu/ifi/dbs/elki/algorithm/outlier/spatial/neighborhood/ExtendedNeighborhood.java
@@ -29,6 +29,7 @@ import de.lmu.ifi.dbs.elki.database.datastore.DataStoreFactory;
 import de.lmu.ifi.dbs.elki.database.datastore.DataStoreUtil;
 import de.lmu.ifi.dbs.elki.database.datastore.WritableDataStore;
 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.DBIDs;
 import de.lmu.ifi.dbs.elki.database.ids.HashSetModifiableDBIDs;
@@ -132,15 +133,17 @@ public class ExtendedNeighborhood extends AbstractPrecomputedNeighborhood {
 
       // Expand multiple steps
       FiniteProgress progress = logger.isVerbose() ? new FiniteProgress("Expanding neighborhoods", database.size(), logger) : null;
-      for(final DBID id : database.iterDBIDs()) {
+      for(DBIDIter iter = database.iterDBIDs(); iter.valid(); iter.advance()) {
+        DBID id = iter.getDBID();
         HashSetModifiableDBIDs res = DBIDUtil.newHashSet(id);
         DBIDs todo = id;
         for(int i = 0; i < steps; i++) {
           ModifiableDBIDs ntodo = DBIDUtil.newHashSet();
-          for(final DBID oid : todo) {
-            DBIDs add = innerinst.getNeighborDBIDs(oid);
+          for(DBIDIter iter2 = todo.iter(); iter2.valid(); iter2.advance()) {
+            DBIDs add = innerinst.getNeighborDBIDs(iter2.getDBID());
             if(add != null) {
-              for(DBID nid : add) {
+              for(DBIDIter iter3 = add.iter(); iter.valid(); iter.advance()) {
+                DBID nid = iter3.getDBID();
                 if(res.contains(nid)) {
                   continue;
                 }