1 files changed, 4 insertions, 15 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/similarityfunction/SimilarityFunction.java b/src/de/lmu/ifi/dbs/elki/distance/similarityfunction/SimilarityFunction.java
index 0e3f4ce6..2dc28ff0 100644
--- a/src/de/lmu/ifi/dbs/elki/distance/similarityfunction/SimilarityFunction.java
+++ b/src/de/lmu/ifi/dbs/elki/distance/similarityfunction/SimilarityFunction.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.distance.similarityfunction;
  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,22 +26,18 @@ package de.lmu.ifi.dbs.elki.distance.similarityfunction;
 import de.lmu.ifi.dbs.elki.data.type.TypeInformation;
 import de.lmu.ifi.dbs.elki.database.query.similarity.SimilarityQuery;
 import de.lmu.ifi.dbs.elki.database.relation.Relation;
-import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance;
-import de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable;
 
 /**
  * Interface SimilarityFunction describes the requirements of any similarity
  * function.
  * 
- * @author Elke Achtert
+ * @author Erich Schubert
  * 
  * @apiviz.landmark
- * @apiviz.has Distance
  * 
  * @param <O> object type
- * @param <D> distance type
  */
-public interface SimilarityFunction<O, D extends Distance<?>> extends Parameterizable {
+public interface SimilarityFunction<O> {
   /**
    * Is this function symmetric?
    * 
@@ -55,17 +51,10 @@ public interface SimilarityFunction<O, D extends Distance<?>> extends Parameteri
   TypeInformation getInputTypeRestriction();
 
   /**
-   * Get a distance factory.
-   * 
-   * @return distance factory
-   */
-  D getDistanceFactory();
-
-  /**
    * Instantiate with a representation to get the actual similarity query.
    * 
    * @param relation Representation to use
    * @return Actual distance query.
    */
-  public <T extends O> SimilarityQuery<T, D> instantiate(Relation<T> relation);
+  public <T extends O> SimilarityQuery<T> instantiate(Relation<T> relation);
 }
 \ No newline at end of file