1 files changed, 9 insertions, 11 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/database/query/distance/PrimitiveDistanceQuery.java b/src/de/lmu/ifi/dbs/elki/database/query/distance/PrimitiveDistanceQuery.java
index ab3046ed..92125ae7 100644
--- a/src/de/lmu/ifi/dbs/elki/database/query/distance/PrimitiveDistanceQuery.java
+++ b/src/de/lmu/ifi/dbs/elki/database/query/distance/PrimitiveDistanceQuery.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.database.query.distance;
  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
@@ -26,7 +26,6 @@ package de.lmu.ifi.dbs.elki.database.query.distance;
 import de.lmu.ifi.dbs.elki.database.ids.DBIDRef;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
 import de.lmu.ifi.dbs.elki.distance.distancefunction.PrimitiveDistanceFunction;
-import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
 
 /**
  * Run a database query in a database context.
@@ -37,13 +36,12 @@ import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
  * @apiviz.uses PrimitiveDistanceFunction
  * 
  * @param <O> Database object type.
- * @param <D> Distance result type.
  */
-public class PrimitiveDistanceQuery<O, D extends Distance<D>> extends AbstractDistanceQuery<O, D> {
+public class PrimitiveDistanceQuery<O> extends AbstractDistanceQuery<O> {
   /**
    * The distance function we use.
    */
-  final protected PrimitiveDistanceFunction<? super O, D> distanceFunction;
+  final protected PrimitiveDistanceFunction<? super O> distanceFunction;
 
   /**
    * Constructor.
@@ -51,32 +49,32 @@ public class PrimitiveDistanceQuery<O, D extends Distance<D>> extends AbstractDi
    * @param relation Representation to use.
    * @param distanceFunction Our distance function
    */
-  public PrimitiveDistanceQuery(Relation<? extends O> relation, PrimitiveDistanceFunction<? super O, D> distanceFunction) {
+  public PrimitiveDistanceQuery(Relation<? extends O> relation, PrimitiveDistanceFunction<? super O> distanceFunction) {
     super(relation);
     this.distanceFunction = distanceFunction;
   }
 
   @Override
-  public D distance(DBIDRef id1, DBIDRef id2) {
+  public double distance(DBIDRef id1, DBIDRef id2) {
     O o1 = relation.get(id1);
     O o2 = relation.get(id2);
     return distance(o1, o2);
   }
 
   @Override
-  public D distance(O o1, DBIDRef id2) {
+  public double distance(O o1, DBIDRef id2) {
     O o2 = relation.get(id2);
     return distance(o1, o2);
   }
 
   @Override
-  public D distance(DBIDRef id1, O o2) {
+  public double distance(DBIDRef id1, O o2) {
     O o1 = relation.get(id1);
     return distance(o1, o2);
   }
 
   @Override
-  public D distance(O o1, O o2) {
+  public double distance(O o1, O o2) {
     if(o1 == null) {
       throw new UnsupportedOperationException("This distance function can only be used for object instances.");
     }
@@ -87,7 +85,7 @@ public class PrimitiveDistanceQuery<O, D extends Distance<D>> extends AbstractDi
   }
 
   @Override
-  public PrimitiveDistanceFunction<? super O, D> getDistanceFunction() {
+  public PrimitiveDistanceFunction<? super O> getDistanceFunction() {
     return distanceFunction;
   }
 }
\ No newline at end of file