14 files changed, 54 insertions, 52 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractFullProjection.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractFullProjection.java
index 5f698192..4a0273ca 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractFullProjection.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractFullProjection.java
@@ -8,7 +8,7 @@ import de.lmu.ifi.dbs.elki.math.scales.LinearScale;
  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
@@ -52,7 +52,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return vector in scaled space
    */
   @Override
-  public Vector projectDataToScaledSpace(NumberVector<?> data) {
+  public Vector projectDataToScaledSpace(NumberVector data) {
     final int dim = data.getDimensionality();
     Vector vec = new Vector(dim);
     double[] ds = vec.getArrayRef();
@@ -86,7 +86,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return relative vector in scaled space
    */
   @Override
-  public Vector projectRelativeDataToScaledSpace(NumberVector<?> data) {
+  public Vector projectRelativeDataToScaledSpace(NumberVector data) {
     final int dim = data.getDimensionality();
     Vector vec = new Vector(dim);
     double[] ds = vec.getArrayRef();
@@ -120,7 +120,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return vector in rendering space
    */
   @Override
-  public Vector projectDataToRenderSpace(NumberVector<?> data) {
+  public Vector projectDataToRenderSpace(NumberVector data) {
     return projectScaledToRender(projectDataToScaledSpace(data));
   }
 
@@ -142,7 +142,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return relative vector in rendering space
    */
   @Override
-  public Vector projectRelativeDataToRenderSpace(NumberVector<?> data) {
+  public Vector projectRelativeDataToRenderSpace(NumberVector data) {
     return projectRelativeScaledToRender(projectRelativeDataToScaledSpace(data));
   }
 
@@ -166,7 +166,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return vector in data space
    */
   @Override
-  public <NV extends NumberVector<?>> NV projectScaledToDataSpace(Vector v, NumberVector.Factory<NV, ?> factory) {
+  public <NV extends NumberVector> NV projectScaledToDataSpace(Vector v, NumberVector.Factory<NV>  factory) {
     final int dim = v.getDimensionality();
     Vector vec = v.copy();
     double[] ds = vec.getArrayRef();
@@ -185,7 +185,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return vector in data space
    */
   @Override
-  public <NV extends NumberVector<?>> NV projectRenderToDataSpace(Vector v, NumberVector.Factory<NV, ?> prototype) {
+  public <NV extends NumberVector> NV projectRenderToDataSpace(Vector v, NumberVector.Factory<NV>  prototype) {
     final int dim = v.getDimensionality();
     Vector vec = projectRenderToScaled(v);
     double[] ds = vec.getArrayRef();
@@ -206,7 +206,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return relative vector in data space
    */
   @Override
-  public <NV extends NumberVector<?>> NV projectRelativeScaledToDataSpace(Vector v, NumberVector.Factory<NV, ?> prototype) {
+  public <NV extends NumberVector> NV projectRelativeScaledToDataSpace(Vector v, NumberVector.Factory<NV>  prototype) {
     final int dim = v.getDimensionality();
     Vector vec = v.copy();
     double[] ds = vec.getArrayRef();
@@ -225,7 +225,7 @@ public abstract class AbstractFullProjection extends AbstractProjection implemen
    * @return relative vector in data space
    */
   @Override
-  public <NV extends NumberVector<?>> NV projectRelativeRenderToDataSpace(Vector v, NumberVector.Factory<NV, ?> prototype) {
+  public <NV extends NumberVector> NV projectRelativeRenderToDataSpace(Vector v, NumberVector.Factory<NV>  prototype) {
     final int dim = v.getDimensionality();
     Vector vec = projectRelativeRenderToScaled(v);
     double[] ds = vec.getArrayRef();
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractProjection.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractProjection.java
index a1629d77..21fb6d56 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractProjection.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractProjection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractSimpleProjection.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractSimpleProjection.java
index ea93dbda..d188eb85 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractSimpleProjection.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/AbstractSimpleProjection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/AffineProjection.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/AffineProjection.java
index f29c1d50..3e9bfcbb 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/AffineProjection.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/AffineProjection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
@@ -173,7 +173,7 @@ public class AffineProjection extends AbstractFullProjection implements Projecti
   }
 
   @Override
-  public double[] fastProjectDataToRenderSpace(NumberVector<?> data) {
+  public double[] fastProjectDataToRenderSpace(NumberVector data) {
     return fastProjectScaledToRenderSpace(fastProjectDataToScaledSpace(data));
   }
 
@@ -184,7 +184,7 @@ public class AffineProjection extends AbstractFullProjection implements Projecti
   }
 
   @Override
-  public double[] fastProjectDataToScaledSpace(NumberVector<?> data) {
+  public double[] fastProjectDataToScaledSpace(NumberVector data) {
     // FIXME: implement with less objects?
     return projectDataToScaledSpace(data).getArrayRef();
   }
@@ -222,7 +222,7 @@ public class AffineProjection extends AbstractFullProjection implements Projecti
   }
 
   @Override
-  public double[] fastProjectRelativeDataToRenderSpace(NumberVector<?> data) {
+  public double[] fastProjectRelativeDataToRenderSpace(NumberVector data) {
     // FIXME: implement with less objects?
     return fastProjectRelativeScaledToRenderSpace(projectRelativeDataToScaledSpace(data).getArrayRef());
   }
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/CanvasSize.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/CanvasSize.java
index c53e62dd..21e0cb39 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/CanvasSize.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/CanvasSize.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/FullProjection.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/FullProjection.java
index e715e859..c5f3e492 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/FullProjection.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/FullProjection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
@@ -75,7 +75,7 @@ public interface FullProjection extends Projection {
    * @param data vector in data space
    * @return vector in scaled space
    */
-  Vector projectDataToScaledSpace(NumberVector<?> data);
+  Vector projectDataToScaledSpace(NumberVector data);
 
   /**
    * Project a data vector from data space to scaled space.
@@ -91,7 +91,7 @@ public interface FullProjection extends Projection {
    * @param data relative vector in data space
    * @return relative vector in scaled space
    */
-  Vector projectRelativeDataToScaledSpace(NumberVector<?> data);
+  Vector projectRelativeDataToScaledSpace(NumberVector data);
 
   /**
    * Project a relative data vector from data space to scaled space.
@@ -107,7 +107,7 @@ public interface FullProjection extends Projection {
    * @param data vector in data space
    * @return vector in rendering space
    */
-  Vector projectDataToRenderSpace(NumberVector<?> data);
+  Vector projectDataToRenderSpace(NumberVector data);
 
   /**
    * Project a data vector from data space to rendering space.
@@ -125,7 +125,7 @@ public interface FullProjection extends Projection {
    * @param factory Object factory
    * @return vector in data space
    */
-  <NV extends NumberVector<?>> NV projectScaledToDataSpace(Vector v, NumberVector.Factory<NV, ?> factory);
+  <NV extends NumberVector> NV projectScaledToDataSpace(Vector v, NumberVector.Factory<NV>  factory);
 
   /**
    * Project a vector from rendering space to data space.
@@ -135,7 +135,7 @@ public interface FullProjection extends Projection {
    * @param prototype Object factory
    * @return vector in data space
    */
-  <NV extends NumberVector<?>> NV projectRenderToDataSpace(Vector v, NumberVector.Factory<NV, ?> prototype);
+  <NV extends NumberVector> NV projectRenderToDataSpace(Vector v, NumberVector.Factory<NV>  prototype);
 
   /**
    * Project a relative data vector from data space to rendering space.
@@ -143,7 +143,7 @@ public interface FullProjection extends Projection {
    * @param data relative vector in data space
    * @return relative vector in rendering space
    */
-  Vector projectRelativeDataToRenderSpace(NumberVector<?> data);
+  Vector projectRelativeDataToRenderSpace(NumberVector data);
 
   /**
    * Project a relative data vector from data space to rendering space.
@@ -161,7 +161,7 @@ public interface FullProjection extends Projection {
    * @param prototype Object factory
    * @return relative vector in data space
    */
-  <NV extends NumberVector<?>> NV projectRelativeScaledToDataSpace(Vector v, NumberVector.Factory<NV, ?> prototype);
+  <NV extends NumberVector> NV projectRelativeScaledToDataSpace(Vector v, NumberVector.Factory<NV>  prototype);
 
   /**
    * Project a relative vector from rendering space to data space.
@@ -171,5 +171,5 @@ public interface FullProjection extends Projection {
    * @param prototype Object factory
    * @return relative vector in data space
    */
-  <NV extends NumberVector<?>> NV projectRelativeRenderToDataSpace(Vector v, NumberVector.Factory<NV, ?> prototype);
+  <NV extends NumberVector> NV projectRelativeRenderToDataSpace(Vector v, NumberVector.Factory<NV>  prototype);
 }
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/OPTICSProjection.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/OPTICSProjection.java
index 13409ee0..e0032144 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/OPTICSProjection.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/OPTICSProjection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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,10 +23,10 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
+import de.lmu.ifi.dbs.elki.algorithm.clustering.optics.ClusterOrderEntry;
+import de.lmu.ifi.dbs.elki.algorithm.clustering.optics.ClusterOrderResult;
 import de.lmu.ifi.dbs.elki.math.scales.LinearScale;
 import de.lmu.ifi.dbs.elki.result.AbstractHierarchicalResult;
-import de.lmu.ifi.dbs.elki.result.optics.ClusterOrderResult;
 import de.lmu.ifi.dbs.elki.visualization.VisualizerContext;
 import de.lmu.ifi.dbs.elki.visualization.opticsplot.OPTICSPlot;
 import de.lmu.ifi.dbs.elki.visualization.projector.OPTICSProjector;
@@ -36,19 +36,21 @@ import de.lmu.ifi.dbs.elki.visualization.projector.OPTICSProjector;
  * consistency in the visualizer API.
  * 
  * @author Erich Schubert
+ * 
+ * @param <E> Cluster order entry type
  */
-public class OPTICSProjection<D extends Distance<D>> extends AbstractHierarchicalResult implements Projection {
+public class OPTICSProjection<E extends ClusterOrderEntry<?>> extends AbstractHierarchicalResult implements Projection {
   /**
    * The projector we were generated from.
    */
-  OPTICSProjector<D> projector;
+  OPTICSProjector<E> projector;
 
   /**
    * Constructor.
-   *
+   * 
    * @param opticsProjector OPTICS projector
    */
-  public OPTICSProjection(OPTICSProjector<D> opticsProjector) {
+  public OPTICSProjection(OPTICSProjector<E> opticsProjector) {
     super();
     this.projector = opticsProjector;
   }
@@ -79,7 +81,7 @@ public class OPTICSProjection<D extends Distance<D>> extends AbstractHierarchica
    * @param context Context to use
    * @return Plot
    */
-  public OPTICSPlot<D> getOPTICSPlot(VisualizerContext context) {
+  public OPTICSPlot<E> getOPTICSPlot(VisualizerContext context) {
     return projector.getOPTICSPlot(context);
   }
 
@@ -88,7 +90,7 @@ public class OPTICSProjection<D extends Distance<D>> extends AbstractHierarchica
    * 
    * @return Cluster oder result.
    */
-  public ClusterOrderResult<D> getResult() {
+  public ClusterOrderResult<E> getResult() {
     return projector.getResult();
   }
 }
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection.java
index d141838e..991c5605 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection1D.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection1D.java
index a5f5e7e9..47487efc 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection1D.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection1D.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
@@ -48,7 +48,7 @@ public interface Projection1D extends Projection {
    * @param data vector in data space
    * @return vector in rendering space
    */
-  public double fastProjectDataToRenderSpace(NumberVector<?> data);
+  public double fastProjectDataToRenderSpace(NumberVector data);
 
   /**
    * Project a vector from scaled space to rendering space.
@@ -72,7 +72,7 @@ public interface Projection1D extends Projection {
    * @param data vector in data space
    * @return vector in rendering space
    */
-  public double fastProjectRelativeDataToRenderSpace(NumberVector<?> data);
+  public double fastProjectRelativeDataToRenderSpace(NumberVector data);
 
   /**
    * Project a vector from scaled space to rendering space.
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection2D.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection2D.java
index 1a8b1952..d9c9ff0e 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection2D.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/Projection2D.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
@@ -52,7 +52,7 @@ public interface Projection2D extends Projection {
    * @param data vector in data space
    * @return vector in rendering space
    */
-  public double[] fastProjectDataToRenderSpace(NumberVector<?> data);
+  public double[] fastProjectDataToRenderSpace(NumberVector data);
 
   /**
    * Project a data vector from data space to scaled space.
@@ -68,7 +68,7 @@ public interface Projection2D extends Projection {
    * @param data vector in data space
    * @return vector in scaled space
    */
-  public double[] fastProjectDataToScaledSpace(NumberVector<?> data);
+  public double[] fastProjectDataToScaledSpace(NumberVector data);
 
   /**
    * Project a vector from scaled space to rendering space.
@@ -93,7 +93,7 @@ public interface Projection2D extends Projection {
    * @param prototype Prototype to create vector from
    * @return vector in data space
    */
-  // public <V extends NumberVector<?>> V fastProjectRenderToDataSpace(double[] data, V prototype);
+  // public <V extends NumberVector> V fastProjectRenderToDataSpace(double[] data, V prototype);
 
   /**
    * Project a vector from rendering space to scaled space.
@@ -117,7 +117,7 @@ public interface Projection2D extends Projection {
    * @param data vector in data space
    * @return vector in rendering space
    */
-  public double[] fastProjectRelativeDataToRenderSpace(NumberVector<?> data);
+  public double[] fastProjectRelativeDataToRenderSpace(NumberVector data);
 
   /**
    * Project a vector from scaled space to rendering space.
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/ProjectionParallel.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/ProjectionParallel.java
index 576c3290..c3344726 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/ProjectionParallel.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/ProjectionParallel.java
@@ -166,7 +166,7 @@ public interface ProjectionParallel extends Projection {
    * @param v Input vector
    * @return Vector with reordering, inversions and scales applied.
    */
-  public double[] fastProjectDataToRenderSpace(NumberVector<?> v);
+  public double[] fastProjectDataToRenderSpace(NumberVector v);
 
   /**
    * Project the value of a single axis to its display value
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple1D.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple1D.java
index 97ac38cc..6a812bf9 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple1D.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple1D.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
@@ -55,7 +55,7 @@ public class Simple1D extends AbstractSimpleProjection implements Projection1D {
   }
 
   @Override
-  public double fastProjectDataToRenderSpace(NumberVector<?> data) {
+  public double fastProjectDataToRenderSpace(NumberVector data) {
     return (scales[dnum].getScaled(data.doubleValue(dnum)) - 0.5) * SCALE;
   }
 
@@ -70,7 +70,7 @@ public class Simple1D extends AbstractSimpleProjection implements Projection1D {
   }
 
   @Override
-  public double fastProjectRelativeDataToRenderSpace(NumberVector<?> data) {
+  public double fastProjectRelativeDataToRenderSpace(NumberVector data) {
     return (data.doubleValue(dnum) - 0.5) * SCALE;
   }
 
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple2D.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple2D.java
index 9b27af5a..2d7033d2 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple2D.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/Simple2D.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projections;
  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
@@ -66,7 +66,7 @@ public class Simple2D extends AbstractSimpleProjection implements Projection2D {
   }
 
   @Override
-  public double[] fastProjectDataToRenderSpace(NumberVector<?> data) {
+  public double[] fastProjectDataToRenderSpace(NumberVector data) {
     double x = (scales[dim1].getScaled(data.doubleValue(dim1)) - 0.5) * SCALE;
     double y = (scales[dim2].getScaled(data.doubleValue(dim2)) - 0.5) * -SCALE;
     return new double[] { x, y };
@@ -83,7 +83,7 @@ public class Simple2D extends AbstractSimpleProjection implements Projection2D {
   }
 
   @Override
-  public double[] fastProjectDataToScaledSpace(NumberVector<?> data) {
+  public double[] fastProjectDataToScaledSpace(NumberVector data) {
     final int dim = data.getDimensionality();
     double[] ds = new double[dim];
     for(int d = 0; d < dim; d++) {
@@ -141,7 +141,7 @@ public class Simple2D extends AbstractSimpleProjection implements Projection2D {
   }
 
   @Override
-  public double[] fastProjectRelativeDataToRenderSpace(NumberVector<?> data) {
+  public double[] fastProjectRelativeDataToRenderSpace(NumberVector data) {
     double x = scales[dim1].getRelativeScaled(data.doubleValue(dim1)) * SCALE;
     double y = scales[dim2].getRelativeScaled(data.doubleValue(dim2)) * -SCALE;
     return new double[] { x, y };
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projections/SimpleParallel.java b/src/de/lmu/ifi/dbs/elki/visualization/projections/SimpleParallel.java
index 6b07895d..55c86d26 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projections/SimpleParallel.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projections/SimpleParallel.java
@@ -215,7 +215,7 @@ public class SimpleParallel extends BasicResult implements ProjectionParallel {
   }
 
   @Override
-  public double[] fastProjectDataToRenderSpace(NumberVector<?> data) {
+  public double[] fastProjectDataToRenderSpace(NumberVector data) {
     double[] v = new double[visDims];
     for(int j = 0, o = 0; j < scales.length; j++) {
       if(isDimHidden(j)) {