1 files changed, 5 insertions, 7 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/PrimitiveDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/PrimitiveDistanceFunction.java
index 8d293e9a..09951177 100644
--- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/PrimitiveDistanceFunction.java
+++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/PrimitiveDistanceFunction.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.distance.distancefunction;
  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,7 +24,6 @@ package de.lmu.ifi.dbs.elki.distance.distancefunction;
  */
 
 import de.lmu.ifi.dbs.elki.data.type.SimpleTypeInformation;
-import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
 
 /**
  * Primitive distance function that is defined on some kind of object.
@@ -34,9 +33,8 @@ import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
  * @apiviz.landmark
  * 
  * @param <O> input object type
- * @param <D> distance result type
  */
-public interface PrimitiveDistanceFunction<O, D extends Distance<?>> extends DistanceFunction<O, D> {
+public interface PrimitiveDistanceFunction<O> extends DistanceFunction<O> {
   /**
    * Computes the distance between two given DatabaseObjects according to this
    * distance function.
@@ -46,8 +44,8 @@ public interface PrimitiveDistanceFunction<O, D extends Distance<?>> extends Dis
    * @return the distance between two given DatabaseObjects according to this
    *         distance function
    */
-  D distance(O o1, O o2);
-  
+  double distance(O o1, O o2);
+
   @Override
-  SimpleTypeInformation<? super O> getInputTypeRestriction();  
+  SimpleTypeInformation<? super O> getInputTypeRestriction();
 }
 \ No newline at end of file