1 files changed, 5 insertions, 10 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractPrimitiveDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractPrimitiveDistanceFunction.java
index 7aefd19c..f28b54fa 100644
--- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractPrimitiveDistanceFunction.java
+++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractPrimitiveDistanceFunction.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
@@ -26,7 +26,6 @@ package de.lmu.ifi.dbs.elki.distance.distancefunction;
 import de.lmu.ifi.dbs.elki.database.query.distance.DistanceQuery;
 import de.lmu.ifi.dbs.elki.database.query.distance.PrimitiveDistanceQuery;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
-import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
 
 /**
  * AbstractDistanceFunction provides some methods valid for any extending class.
@@ -36,21 +35,17 @@ import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
  * @apiviz.excludeSubtypes
  * 
  * @param <O> the type of objects to compute the distances in between
- * @param <D> the type of Distance used
  */
-public abstract class AbstractPrimitiveDistanceFunction<O, D extends Distance<D>> implements PrimitiveDistanceFunction<O, D> {
+public abstract class AbstractPrimitiveDistanceFunction<O> implements PrimitiveDistanceFunction<O> {
   /**
-   * Provides an abstract DistanceFunction.
+   * Constructor.
    */
   public AbstractPrimitiveDistanceFunction() {
     // EMPTY
   }
 
   @Override
-  abstract public D distance(O o1, O o2);
-
-  @Override
-  abstract public D getDistanceFactory();
+  abstract public double distance(O o1, O o2);
 
   @Override
   public boolean isSymmetric() {
@@ -71,7 +66,7 @@ public abstract class AbstractPrimitiveDistanceFunction<O, D extends Distance<D>
    * @return Actual distance query.
    */
   @Override
-  public <T extends O> DistanceQuery<T, D> instantiate(Relation<T> relation) {
+  public <T extends O> DistanceQuery<T> instantiate(Relation<T> relation) {
     return new PrimitiveDistanceQuery<>(relation, this);
   }
 }
 \ No newline at end of file