diff options
| author | Erich Schubert <erich@debian.org> | 2013-10-29 20:02:37 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 22:30:37 +0000 |
| commit | ec7f409f6e795bbcc6f3c005687954e9475c600c (patch) | |
| tree | fbf36c0ab791c556198b487ca40ae56ae5ab1ee5 /src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java | |
| parent | 974d4cf6d54cadc06258039f2cd0515cc34aeac6 (diff) | |
| parent | 8300861dc4c62c5567a4e654976072f854217544 (diff) | |
Import Debian changes 0.6.0~beta2-1
elki (0.6.0~beta2-1) unstable; urgency=low
* New upstream beta release.
* 3DPC extension is not yet included.
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java')
| -rw-r--r-- | src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java b/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java index 31e2431d..baa90829 100644 --- a/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java +++ b/src/de/lmu/ifi/dbs/elki/utilities/DatabaseUtil.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -58,6 +58,9 @@ import de.lmu.ifi.dbs.elki.utilities.pairs.Pair; * @author Erich Schubert * * @apiviz.landmark + * + * @apiviz.has RelationObjectIterator + * @apiviz.has CollectionFromRelation */ public final class DatabaseUtil { /** @@ -130,7 +133,7 @@ public final class DatabaseUtil { NumberVector.Factory<NV, ?> factory = RelationUtil.getNumberVectorFactory(relation); NV min = factory.newNumberVector(mins); NV max = factory.newNumberVector(maxs); - return new Pair<NV, NV>(min, max); + return new Pair<>(min, max); } /** @@ -261,7 +264,7 @@ public final class DatabaseUtil { * database */ public static SortedSet<ClassLabel> getClassLabels(Relation<? extends ClassLabel> database) { - SortedSet<ClassLabel> labels = new TreeSet<ClassLabel>(); + SortedSet<ClassLabel> labels = new TreeSet<>(); for (DBIDIter it = database.iterDBIDs(); it.valid(); it.advance()) { labels.add(database.get(it)); } @@ -305,7 +308,7 @@ public final class DatabaseUtil { * @return Superclass of all objects in the database */ public static <O> Class<?> getBaseObjectClassExpensive(Relation<O> database) { - List<Class<?>> candidates = new ArrayList<Class<?>>(); + List<Class<?>> candidates = new ArrayList<>(); DBIDIter iditer = database.iterDBIDs(); // empty database?! if (!iditer.valid()) { @@ -471,7 +474,7 @@ public final class DatabaseUtil { @Override public Iterator<O> iterator() { - return new DatabaseUtil.RelationObjectIterator<O>(db); + return new DatabaseUtil.RelationObjectIterator<>(db); } @Override |