diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/algorithm/AbstractDistanceBasedAlgorithm.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/algorithm/AbstractDistanceBasedAlgorithm.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/algorithm/AbstractDistanceBasedAlgorithm.java b/src/de/lmu/ifi/dbs/elki/algorithm/AbstractDistanceBasedAlgorithm.java index e9d638dc..3420e279 100644 --- a/src/de/lmu/ifi/dbs/elki/algorithm/AbstractDistanceBasedAlgorithm.java +++ b/src/de/lmu/ifi/dbs/elki/algorithm/AbstractDistanceBasedAlgorithm.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.algorithm; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2012 + Copyright (C) 2013 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -24,11 +24,10 @@ package de.lmu.ifi.dbs.elki.algorithm; */ import de.lmu.ifi.dbs.elki.distance.distancefunction.DistanceFunction; -import de.lmu.ifi.dbs.elki.distance.distancefunction.EuclideanDistanceFunction; +import de.lmu.ifi.dbs.elki.distance.distancefunction.minkowski.EuclideanDistanceFunction; import de.lmu.ifi.dbs.elki.distance.distancevalue.Distance; import de.lmu.ifi.dbs.elki.result.Result; import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; -import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID; import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization; import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; @@ -45,15 +44,10 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * @param <D> the type of Distance used by this Algorithm * @param <R> the type of result to retrieve from this Algorithm */ -public abstract class AbstractDistanceBasedAlgorithm<O, D extends Distance<D>, R extends Result> extends AbstractAlgorithm<R> { - /** - * OptionID for {@link #DISTANCE_FUNCTION_ID}. - */ - public static final OptionID DISTANCE_FUNCTION_ID = new OptionID("algorithm.distancefunction", "Distance function to determine the distance between database objects."); - +public abstract class AbstractDistanceBasedAlgorithm<O, D extends Distance<D>, R extends Result> extends AbstractAlgorithm<R> implements DistanceBasedAlgorithm<O, D> { /** * Holds the instance of the distance function specified by - * {@link #DISTANCE_FUNCTION_ID}. + * {@link DistanceBasedAlgorithm#DISTANCE_FUNCTION_ID}. */ private DistanceFunction<? super O, D> distanceFunction; @@ -72,6 +66,7 @@ public abstract class AbstractDistanceBasedAlgorithm<O, D extends Distance<D>, R * * @return the distanceFunction */ + @Override public DistanceFunction<? super O, D> getDistanceFunction() { return distanceFunction; } |