Import Upstream version 0.6.5~20141030

1 files changed, 10 insertions, 10 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/data/FloatVector.java b/src/de/lmu/ifi/dbs/elki/data/FloatVector.java
index 6db8cd24..3b9316b0 100644
--- a/src/de/lmu/ifi/dbs/elki/data/FloatVector.java
+++ b/src/de/lmu/ifi/dbs/elki/data/FloatVector.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
@@ -27,20 +27,20 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import de.lmu.ifi.dbs.elki.math.linearalgebra.Vector;
-import de.lmu.ifi.dbs.elki.persistent.ByteArrayUtil;
-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.ArrayLikeUtil;
 import de.lmu.ifi.dbs.elki.utilities.datastructures.arraylike.NumberArrayAdapter;
+import de.lmu.ifi.dbs.elki.utilities.io.ByteArrayUtil;
+import de.lmu.ifi.dbs.elki.utilities.io.ByteBufferSerializer;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
 
 /**
- * A FloatVector is to store real values with lower memory requirements by using
- * float values.
+ * Vector type using {@code float[]} storage, thus needing approximately half as
+ * much memory as {@link DoubleVector}.
  * 
  * @author Elke Achtert
  */
-public class FloatVector extends AbstractNumberVector<Float> {
+public class FloatVector extends AbstractNumberVector {
   /**
    * Static factory instance.
    */
@@ -77,7 +77,7 @@ public class FloatVector extends AbstractNumberVector<Float> {
   }
 
   /**
-   * Provides a FloatVector consisting of the given float values.
+   * Create a FloatVector consisting of the given float values.
    * 
    * @param values the values to be set as values of the float vector
    */
@@ -143,13 +143,13 @@ public class FloatVector extends AbstractNumberVector<Float> {
    * 
    * @apiviz.has FloatVector
    */
-  public static class Factory extends AbstractNumberVector.Factory<FloatVector, Float> {
+  public static class Factory extends AbstractNumberVector.Factory<FloatVector> {
     @Override
-    public <A> FloatVector newFeatureVector(A array, ArrayAdapter<Float, A> adapter) {
+    public <A> FloatVector newFeatureVector(A array, ArrayAdapter<? extends Number, A> adapter) {
       int dim = adapter.size(array);
       float[] values = new float[dim];
       for(int i = 0; i < dim; i++) {
-        values[i] = adapter.get(array, i);
+        values[i] = adapter.get(array, i).floatValue();
       }
       return new FloatVector(values, true);
     }