summaryrefslogtreecommitdiff
path: root/src/de/lmu/ifi/dbs/elki/datasource/DBIDRangeDatabaseConnection.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/datasource/DBIDRangeDatabaseConnection.java')
-rw-r--r--src/de/lmu/ifi/dbs/elki/datasource/DBIDRangeDatabaseConnection.java21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/datasource/DBIDRangeDatabaseConnection.java b/src/de/lmu/ifi/dbs/elki/datasource/DBIDRangeDatabaseConnection.java
index 2e7f59e7..2883a008 100644
--- a/src/de/lmu/ifi/dbs/elki/datasource/DBIDRangeDatabaseConnection.java
+++ b/src/de/lmu/ifi/dbs/elki/datasource/DBIDRangeDatabaseConnection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource;
This file is part of ELKI:
Environment for Developing KDD-Applications Supported by Index-Structures
- Copyright (C) 2013
+ Copyright (C) 2014
Ludwig-Maximilians-Universität München
Lehr- und Forschungseinheit für Datenbanksysteme
ELKI Development Team
@@ -23,12 +23,7 @@ package de.lmu.ifi.dbs.elki.datasource;
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import java.util.ArrayList;
-import java.util.List;
-
-import de.lmu.ifi.dbs.elki.data.type.TypeUtil;
-import de.lmu.ifi.dbs.elki.database.ids.DBID;
-import de.lmu.ifi.dbs.elki.database.ids.DBIDUtil;
+import de.lmu.ifi.dbs.elki.database.ids.DBIDFactory;
import de.lmu.ifi.dbs.elki.datasource.bundle.MultipleObjectsBundle;
import de.lmu.ifi.dbs.elki.utilities.documentation.Description;
import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
@@ -70,11 +65,7 @@ public class DBIDRangeDatabaseConnection implements DatabaseConnection {
@Override
public MultipleObjectsBundle loadData() {
MultipleObjectsBundle b = new MultipleObjectsBundle();
- List<DBID> ids = new ArrayList<>(count);
- for(int i = 0; i < count; i++) {
- ids.add(DBIDUtil.importInteger(start + i));
- }
- b.appendColumn(TypeUtil.DBID, ids);
+ b.setDBIDs(DBIDFactory.FACTORY.generateStaticDBIDRange(start, count));
return b;
}
@@ -109,13 +100,13 @@ public class DBIDRangeDatabaseConnection implements DatabaseConnection {
@Override
protected void makeOptions(Parameterization config) {
super.makeOptions(config);
- IntParameter startp = new IntParameter(START_ID, Integer.valueOf(0));
+ IntParameter startp = new IntParameter(START_ID, 0);
if(config.grab(startp)) {
- start = startp.getValue().intValue();
+ start = startp.intValue();
}
IntParameter countp = new IntParameter(COUNT_ID);
if(config.grab(countp)) {
- count = countp.getValue().intValue();
+ count = countp.intValue();
}
}