diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/distance/distancefunction/LorentzianDistanceFunction.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/distance/distancefunction/LorentzianDistanceFunction.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/LorentzianDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/LorentzianDistanceFunction.java index 51140f36..b42f4865 100644 --- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/LorentzianDistanceFunction.java +++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/LorentzianDistanceFunction.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,7 +40,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * @author Erich Schubert */ @Reference(authors = "M.-M. Deza and E. Deza", title = "Dictionary of distances", booktitle = "Dictionary of distances") -public class LorentzianDistanceFunction extends AbstractSpatialDoubleDistanceNorm { +public class LorentzianDistanceFunction extends AbstractSpatialNorm { /** * Static instance. */ @@ -57,7 +57,7 @@ public class LorentzianDistanceFunction extends AbstractSpatialDoubleDistanceNor } @Override - public double doubleDistance(NumberVector<?> v1, NumberVector<?> v2) { + public double distance(NumberVector v1, NumberVector v2) { final int dim = dimensionality(v1, v2); double agg = 0.; for (int d = 0; d < dim; d++) { @@ -68,7 +68,7 @@ public class LorentzianDistanceFunction extends AbstractSpatialDoubleDistanceNor } @Override - public double doubleNorm(NumberVector<?> v1) { + public double norm(NumberVector v1) { final int dim = v1.getDimensionality(); double agg = 0.; for (int i = 0; i < dim; i++) { @@ -79,7 +79,7 @@ public class LorentzianDistanceFunction extends AbstractSpatialDoubleDistanceNor } @Override - public double doubleMinDist(SpatialComparable mbr1, SpatialComparable mbr2) { + public double minDist(SpatialComparable mbr1, SpatialComparable mbr2) { final int dim = dimensionality(mbr1, mbr2); double agg = 0.; for (int d = 0; d < dim; d++) { |