1 files changed, 53 insertions, 21 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/database/ids/integer/IntegerArrayStaticDBIDs.java b/src/de/lmu/ifi/dbs/elki/database/ids/integer/IntegerArrayStaticDBIDs.java
index b617b4c4..ef4aee94 100644
--- a/src/de/lmu/ifi/dbs/elki/database/ids/integer/IntegerArrayStaticDBIDs.java
+++ b/src/de/lmu/ifi/dbs/elki/database/ids/integer/IntegerArrayStaticDBIDs.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.database.ids.integer;
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2011
+ Copyright (C) 2012
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team
@@ -24,22 +24,22 @@ package de.lmu.ifi.dbs.elki.database.ids.integer;
  */
 
 import java.util.AbstractList;
-import java.util.Collection;
+import java.util.Arrays;
 import java.util.Iterator;
 
-import de.lmu.ifi.dbs.elki.database.ids.ArrayDBIDs;
+import de.lmu.ifi.dbs.elki.database.ids.ArrayStaticDBIDs;
 import de.lmu.ifi.dbs.elki.database.ids.DBID;
 import de.lmu.ifi.dbs.elki.database.ids.DBIDFactory;
-
+import de.lmu.ifi.dbs.elki.database.ids.DBIDIter;
 
 /**
  * Static (no modifications allowed) set of Database Object IDs.
  * 
  * @author Erich Schubert
  * 
- * @apiviz.composedOf IntegerDBID
+ * @apiviz.has IntegerDBID
  */
-public class IntegerArrayStaticDBIDs extends AbstractList<DBID> implements ArrayDBIDs {
+public class IntegerArrayStaticDBIDs extends AbstractList<DBID> implements ArrayStaticDBIDs {
   /**
    * The actual storage.
    */
@@ -59,7 +59,12 @@ public class IntegerArrayStaticDBIDs extends AbstractList<DBID> implements Array
   public Iterator<DBID> iterator() {
     return new Itr();
   }
-  
+
+  @Override
+  public DBIDIter iter() {
+    return new DBIDItr();
+  }
+
   /**
    * Iterator class.
    * 
@@ -77,7 +82,7 @@ public class IntegerArrayStaticDBIDs extends AbstractList<DBID> implements Array
 
     @Override
     public DBID next() {
-      DBID ret = DBIDFactory.FACTORY.importInteger(ids[off]);
+      DBID ret = new IntegerDBID(ids[off]);
       off++;
       return ret;
     }
@@ -88,22 +93,49 @@ public class IntegerArrayStaticDBIDs extends AbstractList<DBID> implements Array
     }
   }
 
+  /**
+   * DBID iterator in ELKI/C style.
+   * 
+   * @author Erich Schubert
+   * 
+   * @apiviz.exclude
+   */
+  protected class DBIDItr implements DBIDIter {
+    int pos = 0;
+
+    @Override
+    public boolean valid() {
+      return pos < ids.length;
+    }
+
+    @Override
+    public void advance() {
+      pos++;
+    }
+
+    @Override
+    public int getIntegerID() {
+      return ids[pos];
+    }
+
+    @Override
+    public DBID getDBID() {
+      return new IntegerDBID(ids[pos]);
+    }
+
+  }
+
   @Override
   public int size() {
     return ids.length;
   }
-  
-  /*
-   * "Contains" operations
-   */
+
   @Override
-  public boolean contains(Object o) {
-    if(o instanceof DBID) {
-      int oid = ((DBID) o).getIntegerID();
-      for(int i = 0; i < ids.length; i++) {
-        if(ids[i] == oid) {
-          return true;
-        }
+  public boolean contains(DBID o) {
+    final int oid = o.getIntegerID();
+    for(int i = 0; i < ids.length; i++) {
+      if(ids[i] == oid) {
+        return true;
       }
     }
     return false;
@@ -132,7 +164,7 @@ public class IntegerArrayStaticDBIDs extends AbstractList<DBID> implements Array
   }
 
   @Override
-  public Collection<DBID> asCollection() {
-    return this;
+  public int binarySearch(DBID key) {
+    return Arrays.binarySearch(ids, key.getIntegerID());
   }
 }
\ No newline at end of file