diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/datasource/bundle')
9 files changed, 14 insertions, 14 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleMeta.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleMeta.java index 28354bd4..442c00e8 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleMeta.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleMeta.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleReader.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleReader.java index a2a3fb7e..4f57cac8 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleReader.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleReader.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 @@ -115,8 +115,8 @@ public class BundleReader implements BundleStreamSource { final int nummeta = buffer.getInt(); assert (nummeta > 0); meta = new BundleMeta(nummeta); - sers = new ArrayList<ByteBufferSerializer<?>>(nummeta); - data = new ArrayList<Object>(nummeta); + sers = new ArrayList<>(nummeta); + data = new ArrayList<>(nummeta); for (int i = 0; i < nummeta; i++) { try { @SuppressWarnings("unchecked") diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleStreamSource.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleStreamSource.java index 8b831846..cbac6134 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleStreamSource.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleStreamSource.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleWriter.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleWriter.java index 7efbd592..4b7c4a3d 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleWriter.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/BundleWriter.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/MultipleObjectsBundle.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/MultipleObjectsBundle.java index c3e99a83..02a24996 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/MultipleObjectsBundle.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/MultipleObjectsBundle.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 @@ -55,7 +55,7 @@ public class MultipleObjectsBundle implements ObjectBundle { */ public MultipleObjectsBundle() { this.meta = new BundleMeta(); - this.columns = new ArrayList<List<?>>(); + this.columns = new ArrayList<>(); } /** @@ -232,7 +232,7 @@ public class MultipleObjectsBundle implements ObjectBundle { bundle.meta.add(smeta.get(i)); } for(int i = bundle.metaLength(); i < smeta.size(); i++) { - List<Object> data = new ArrayList<Object>(bundle.dataLength() + 1); + List<Object> data = new ArrayList<>(bundle.dataLength() + 1); bundle.appendColumn(smeta.get(i), data); } continue; diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/ObjectBundle.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/ObjectBundle.java index 56966dcf..fbf88f3d 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/ObjectBundle.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/ObjectBundle.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/SingleObjectBundle.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/SingleObjectBundle.java index 8a61426d..f0db03f7 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/SingleObjectBundle.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/SingleObjectBundle.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 @@ -50,7 +50,7 @@ public class SingleObjectBundle implements ObjectBundle { * Constructor. */ public SingleObjectBundle() { - this(new BundleMeta(), new ArrayList<Object>(5)); + this(new BundleMeta(), new ArrayList<>(5)); } /** diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/StreamFromBundle.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/StreamFromBundle.java index 971478da..de683b30 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/StreamFromBundle.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/StreamFromBundle.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.datasource.bundle; 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 diff --git a/src/de/lmu/ifi/dbs/elki/datasource/bundle/package-info.java b/src/de/lmu/ifi/dbs/elki/datasource/bundle/package-info.java index 0b2cbad9..8834e40b 100644 --- a/src/de/lmu/ifi/dbs/elki/datasource/bundle/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/datasource/bundle/package-info.java @@ -7,7 +7,7 @@ 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 |