summaryrefslogtreecommitdiff
path: root/src/de/lmu/ifi/dbs/elki/database/relation/ProxyView.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/database/relation/ProxyView.java')
-rw-r--r--src/de/lmu/ifi/dbs/elki/database/relation/ProxyView.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/database/relation/ProxyView.java b/src/de/lmu/ifi/dbs/elki/database/relation/ProxyView.java
index 1ae761f3..9937c8ee 100644
--- a/src/de/lmu/ifi/dbs/elki/database/relation/ProxyView.java
+++ b/src/de/lmu/ifi/dbs/elki/database/relation/ProxyView.java
@@ -25,12 +25,11 @@ package de.lmu.ifi.dbs.elki.database.relation;
import de.lmu.ifi.dbs.elki.data.type.SimpleTypeInformation;
import de.lmu.ifi.dbs.elki.database.Database;
-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.DBIDRef;
import de.lmu.ifi.dbs.elki.database.ids.DBIDUtil;
import de.lmu.ifi.dbs.elki.database.ids.DBIDs;
import de.lmu.ifi.dbs.elki.result.AbstractHierarchicalResult;
-import de.lmu.ifi.dbs.elki.utilities.iterator.IterableIterator;
-import de.lmu.ifi.dbs.elki.utilities.iterator.IterableUtil;
/**
* A virtual partitioning of the database. For the accepted DBIDs, access is
@@ -87,19 +86,19 @@ public class ProxyView<O> extends AbstractHierarchicalResult implements Relation
}
@Override
- public O get(DBID id) {
+ public O get(DBIDRef id) {
assert (idview.contains(id)) : "Accessing object not included in view.";
return inner.get(id);
}
-
+
@Override
- public void set(DBID id, O val) {
+ public void set(DBIDRef id, O val) {
assert (idview.contains(id)) : "Accessing object not included in view.";
inner.set(id, val);
}
@Override
- public void delete(DBID id) {
+ public void delete(DBIDRef id) {
throw new UnsupportedOperationException("Semantics of 'delete-from-virtual-partition' are not uniquely defined. Delete from IDs or from underlying data, please!");
}
@@ -109,8 +108,8 @@ public class ProxyView<O> extends AbstractHierarchicalResult implements Relation
}
@Override
- public IterableIterator<DBID> iterDBIDs() {
- return IterableUtil.fromIterable(idview);
+ public DBIDIter iterDBIDs() {
+ return idview.iter();
}
@Override