1 files changed, 7 insertions, 14 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractDatabaseDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractDatabaseDistanceFunction.java
index 3bad6528..0c04bdd0 100644
--- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractDatabaseDistanceFunction.java
+++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/AbstractDatabaseDistanceFunction.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
@@ -25,7 +25,6 @@ package de.lmu.ifi.dbs.elki.distance.distancefunction;
 
 import de.lmu.ifi.dbs.elki.database.query.distance.AbstractDatabaseDistanceQuery;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
-import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
 
 /**
  * Abstract super class for distance functions needing a database context.
@@ -36,22 +35,16 @@ import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
  * @apiviz.excludeSubtypes
  * 
  * @param <O> the type of DatabaseObject to compute the distances in between
- * @param <D> the type of Distance used
  */
-public abstract class AbstractDatabaseDistanceFunction<O, D extends Distance<D>> implements DistanceFunction<O, D> {
+public abstract class AbstractDatabaseDistanceFunction<O> implements DistanceFunction<O> {
   /**
-   * Constructor, supporting
-   * {@link de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable} style
-   * classes.
+   * Constructor.
    */
   public AbstractDatabaseDistanceFunction() {
     super();
   }
 
   @Override
-  abstract public D getDistanceFactory();
-
-  @Override
   public boolean isMetric() {
     return false;
   }
@@ -66,11 +59,11 @@ public abstract class AbstractDatabaseDistanceFunction<O, D extends Distance<D>>
    * 
    * @author Erich Schubert
    */
-  abstract public static class Instance<O, D extends Distance<D>> extends AbstractDatabaseDistanceQuery<O, D> {
+  abstract public static class Instance<O> extends AbstractDatabaseDistanceQuery<O> {
     /**
      * Parent distance
      */
-    DistanceFunction<? super O, D> parent;
+    DistanceFunction<? super O> parent;
     
     /**
      * Constructor.
@@ -78,13 +71,13 @@ public abstract class AbstractDatabaseDistanceFunction<O, D extends Distance<D>>
      * @param database Database
      * @param parent Parent distance
      */
-    public Instance(Relation<O> database, DistanceFunction<? super O, D> parent) {
+    public Instance(Relation<O> database, DistanceFunction<? super O> parent) {
       super(database);
       this.parent = parent;
     }
 
     @Override
-    public DistanceFunction<? super O, D> getDistanceFunction() {
+    public DistanceFunction<? super O> getDistanceFunction() {
       return parent;
     }
   }