1 files changed, 11 insertions, 6 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/ManhattanHashFunctionFamily.java b/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/ManhattanHashFunctionFamily.java
index a117c44c..6a68f763 100644
--- a/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/ManhattanHashFunctionFamily.java
+++ b/src/de/lmu/ifi/dbs/elki/index/lsh/hashfamilies/ManhattanHashFunctionFamily.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.index.lsh.hashfamilies;
  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,7 @@ package de.lmu.ifi.dbs.elki.index.lsh.hashfamilies;
 import de.lmu.ifi.dbs.elki.distance.distancefunction.DistanceFunction;
 import de.lmu.ifi.dbs.elki.distance.distancefunction.minkowski.ManhattanDistanceFunction;
 import de.lmu.ifi.dbs.elki.math.linearalgebra.randomprojections.CauchyRandomProjectionFamily;
-import de.lmu.ifi.dbs.elki.utilities.RandomFactory;
+import de.lmu.ifi.dbs.elki.math.random.RandomFactory;
 import de.lmu.ifi.dbs.elki.utilities.documentation.Reference;
 
 /**
@@ -40,9 +40,14 @@ import de.lmu.ifi.dbs.elki.utilities.documentation.Reference;
  * </p>
  * 
  * @author Erich Schubert
+ * 
+ * @apiviz.uses CauchyRandomProjectionFamily
  */
-@Reference(authors = "M. Datar and N. Immorlica and P. Indyk and V. S. Mirrokni", title = "Locality-sensitive hashing scheme based on p-stable distributions", booktitle = "Proc. 20th annual symposium on Computational geometry", url = "http://dx.doi.org/10.1145/997817.997857")
-public class ManhattanHashFunctionFamily extends AbstractHashFunctionFamily {
+@Reference(authors = "M. Datar and N. Immorlica and P. Indyk and V. S. Mirrokni", //
+title = "Locality-sensitive hashing scheme based on p-stable distributions", //
+booktitle = "Proc. 20th annual symposium on Computational geometry", //
+url = "http://dx.doi.org/10.1145/997817.997857")
+public class ManhattanHashFunctionFamily extends AbstractProjectedHashFunctionFamily {
   /**
    * Constructor.
    * 
@@ -55,7 +60,7 @@ public class ManhattanHashFunctionFamily extends AbstractHashFunctionFamily {
   }
 
   @Override
-  public boolean isCompatible(DistanceFunction<?, ?> df) {
+  public boolean isCompatible(DistanceFunction<?> df) {
     // TODO: also allow HistogramIntersectionDistance?
     return ManhattanDistanceFunction.class.isInstance(df);
   }
@@ -67,7 +72,7 @@ public class ManhattanHashFunctionFamily extends AbstractHashFunctionFamily {
    * 
    * @apiviz.exclude
    */
-  public static class Parameterizer extends AbstractHashFunctionFamily.Parameterizer {
+  public static class Parameterizer extends AbstractProjectedHashFunctionFamily.Parameterizer {
     @Override
     protected ManhattanHashFunctionFamily makeInstance() {
       return new ManhattanHashFunctionFamily(random, width, k);