Import Upstream version 0.6.5~20141030

1 files changed, 6 insertions, 6 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/data/OneDimensionalDoubleVector.java b/src/de/lmu/ifi/dbs/elki/data/OneDimensionalDoubleVector.java
index 3412c835..d440b5e1 100644
--- a/src/de/lmu/ifi/dbs/elki/data/OneDimensionalDoubleVector.java
+++ b/src/de/lmu/ifi/dbs/elki/data/OneDimensionalDoubleVector.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data;
  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
@@ -24,9 +24,9 @@ package de.lmu.ifi.dbs.elki.data;
  */
 
 import de.lmu.ifi.dbs.elki.math.linearalgebra.Vector;
-import de.lmu.ifi.dbs.elki.persistent.ByteBufferSerializer;
 import de.lmu.ifi.dbs.elki.utilities.datastructures.arraylike.ArrayAdapter;
 import de.lmu.ifi.dbs.elki.utilities.datastructures.arraylike.NumberArrayAdapter;
+import de.lmu.ifi.dbs.elki.utilities.io.ByteBufferSerializer;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
 
 /**
@@ -36,7 +36,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
  * 
  * @author Erich Schubert
  */
-public class OneDimensionalDoubleVector extends AbstractNumberVector<Double> {
+public class OneDimensionalDoubleVector extends AbstractNumberVector {
   /**
    * Static factory instance.
    */
@@ -92,11 +92,11 @@ public class OneDimensionalDoubleVector extends AbstractNumberVector<Double> {
    * 
    * @apiviz.has OneDimensionalDoubleVector
    */
-  public static class Factory extends AbstractNumberVector.Factory<OneDimensionalDoubleVector, Double> {
+  public static class Factory extends AbstractNumberVector.Factory<OneDimensionalDoubleVector> {
     @Override
-    public <A> OneDimensionalDoubleVector newFeatureVector(A array, ArrayAdapter<Double, A> adapter) {
+    public <A> OneDimensionalDoubleVector newFeatureVector(A array, ArrayAdapter<? extends Number, A> adapter) {
       assert (adapter.size(array) == 1) : "Incorrect dimensionality for 1-dimensional vector.";
-      return new OneDimensionalDoubleVector(adapter.get(array, 0));
+      return new OneDimensionalDoubleVector(adapter.get(array, 0).doubleValue());
     }
 
     @Override