1 files changed, 12 insertions, 10 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java
index 832184f0..a3b4f4b5 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/projector/OPTICSProjector.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.visualization.projector;
  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,10 +27,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-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.result.AbstractHierarchicalResult;
 import de.lmu.ifi.dbs.elki.result.ResultUtil;
-import de.lmu.ifi.dbs.elki.result.optics.ClusterOrderResult;
 import de.lmu.ifi.dbs.elki.visualization.VisualizationTask;
 import de.lmu.ifi.dbs.elki.visualization.VisualizerContext;
 import de.lmu.ifi.dbs.elki.visualization.gui.overview.PlotItem;
@@ -41,24 +41,26 @@ import de.lmu.ifi.dbs.elki.visualization.projections.OPTICSProjection;
  * Projection for OPTICS plots.
  * 
  * @author Erich Schubert
+ * 
+ * @param <E> Cluster order entry type
  */
-public class OPTICSProjector<D extends Distance<D>> extends AbstractHierarchicalResult implements Projector {
+public class OPTICSProjector<E extends ClusterOrderEntry<?>> extends AbstractHierarchicalResult implements Projector {
   /**
    * Cluster order result
    */
-  private ClusterOrderResult<D> clusterOrder;
+  private ClusterOrderResult<E> clusterOrder;
 
   /**
    * OPTICS plot image
    */
-  private OPTICSPlot<D> plot = null;
+  private OPTICSPlot<E> plot = null;
 
   /**
    * Constructor.
    * 
    * @param co Cluster order
    */
-  public OPTICSProjector(ClusterOrderResult<D> co) {
+  public OPTICSProjector(ClusterOrderResult<E> co) {
     super();
     this.clusterOrder = co;
   }
@@ -77,7 +79,7 @@ public class OPTICSProjector<D extends Distance<D>> extends AbstractHierarchical
   public Collection<PlotItem> arrange() {
     List<PlotItem> col = new ArrayList<>(1);
     List<VisualizationTask> tasks = ResultUtil.filterResults(this, VisualizationTask.class);
-    if (tasks.size() > 0) {
+    if(tasks.size() > 0) {
       final PlotItem it = new PlotItem(4., 1., new OPTICSProjection<>(this));
       it.tasks = tasks;
       col.add(it);
@@ -90,7 +92,7 @@ public class OPTICSProjector<D extends Distance<D>> extends AbstractHierarchical
    * 
    * @return the cluster order
    */
-  public ClusterOrderResult<D> getResult() {
+  public ClusterOrderResult<E> getResult() {
     return clusterOrder;
   }
 
@@ -100,7 +102,7 @@ public class OPTICSProjector<D extends Distance<D>> extends AbstractHierarchical
    * @param context Context to use
    * @return Plot
    */
-  public OPTICSPlot<D> getOPTICSPlot(VisualizerContext context) {
+  public OPTICSPlot<E> getOPTICSPlot(VisualizerContext context) {
     if(plot == null) {
       plot = OPTICSPlot.plotForClusterOrder(clusterOrder, context);
     }