diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/distance/distancefunction/CosineDistanceFunction.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/distance/distancefunction/CosineDistanceFunction.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/CosineDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/CosineDistanceFunction.java index bc86b6cf..b345aa47 100644 --- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/CosineDistanceFunction.java +++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/CosineDistanceFunction.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 @@ -40,14 +40,14 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * @author Arthur Zimek */ @Alias({ "cosine" }) -public class CosineDistanceFunction extends AbstractSpatialDoubleDistanceFunction { +public class CosineDistanceFunction extends AbstractSpatialDistanceFunction { /** * Static instance */ public static final CosineDistanceFunction STATIC = new CosineDistanceFunction(); /** - * Provides a CosineDistanceFunction. + * Constructor - use {@link #STATIC} instead. * * @deprecated Use static instance */ @@ -67,7 +67,7 @@ public class CosineDistanceFunction extends AbstractSpatialDoubleDistanceFunctio * @return the cosine distance for two given feature vectors v1 and v2 */ @Override - public double doubleDistance(NumberVector<?> v1, NumberVector<?> v2) { + public double distance(NumberVector v1, NumberVector v2) { double d = 1 - VectorUtil.cosAngle(v1, v2); if (d < 0) { d = 0; @@ -76,7 +76,7 @@ public class CosineDistanceFunction extends AbstractSpatialDoubleDistanceFunctio } @Override - public double doubleMinDist(SpatialComparable mbr1, SpatialComparable mbr2) { + public double minDist(SpatialComparable mbr1, SpatialComparable mbr2) { double d = 1 - VectorUtil.minCosAngle(mbr1, mbr2); if (d < 0) { d = 0; @@ -101,7 +101,7 @@ public class CosineDistanceFunction extends AbstractSpatialDoubleDistanceFunctio } @Override - public SimpleTypeInformation<? super NumberVector<?>> getInputTypeRestriction() { + public SimpleTypeInformation<? super NumberVector> getInputTypeRestriction() { return TypeUtil.NUMBER_VECTOR_VARIABLE_LENGTH; } |