diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter')
4 files changed, 2 insertions, 20 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/AbstractSimilarityAdapter.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/AbstractSimilarityAdapter.java index 19e80724..74606083 100644 --- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/AbstractSimilarityAdapter.java +++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/AbstractSimilarityAdapter.java @@ -65,7 +65,7 @@ public abstract class AbstractSimilarityAdapter<O> extends AbstractDatabaseDista * {@link de.lmu.ifi.dbs.elki.distance.similarityfunction.FractionalSharedNearestNeighborSimilarityFunction} * </p> */ - public static final OptionID SIMILARITY_FUNCTION_ID = OptionID.getOrCreateOptionID("adapter.similarityfunction", "Similarity function to derive the distance between database objects from."); + public static final OptionID SIMILARITY_FUNCTION_ID = new OptionID("adapter.similarityfunction", "Similarity function to derive the distance between database objects from."); /** * Holds the similarity function. @@ -166,7 +166,7 @@ public abstract class AbstractSimilarityAdapter<O> extends AbstractDatabaseDista * * @apiviz.exclude */ - public static abstract class Parameterizer<O> extends AbstractParameterizer { + public abstract static class Parameterizer<O> extends AbstractParameterizer { /** * Holds the similarity function. */ diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterArccos.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterArccos.java index d1a5aa4a..b77e4a7d 100644 --- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterArccos.java +++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterArccos.java @@ -30,7 +30,6 @@ import de.lmu.ifi.dbs.elki.distance.distancefunction.DistanceFunction; import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance; import de.lmu.ifi.dbs.elki.distance.distancevalue.NumberDistance; import de.lmu.ifi.dbs.elki.distance.similarityfunction.NormalizedSimilarityFunction; -import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization; /** * Adapter from a normalized similarity function to a distance function using @@ -92,11 +91,6 @@ public class SimilarityAdapterArccos<O> extends AbstractSimilarityAdapter<O> { */ public static class Parameterizer<O> extends AbstractSimilarityAdapter.Parameterizer<O> { @Override - protected void makeOptions(Parameterization config) { - super.makeOptions(config); - } - - @Override protected SimilarityAdapterArccos<O> makeInstance() { return new SimilarityAdapterArccos<O>(similarityFunction); } diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLinear.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLinear.java index e2c0f981..ab7204ce 100644 --- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLinear.java +++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLinear.java @@ -30,7 +30,6 @@ import de.lmu.ifi.dbs.elki.distance.distancefunction.DistanceFunction; import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance; import de.lmu.ifi.dbs.elki.distance.distancevalue.NumberDistance; import de.lmu.ifi.dbs.elki.distance.similarityfunction.NormalizedSimilarityFunction; -import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization; /** * Adapter from a normalized similarity function to a distance function using @@ -92,11 +91,6 @@ public class SimilarityAdapterLinear<O> extends AbstractSimilarityAdapter<O> { */ public static class Parameterizer<O> extends AbstractSimilarityAdapter.Parameterizer<O> { @Override - protected void makeOptions(Parameterization config) { - super.makeOptions(config); - } - - @Override protected SimilarityAdapterLinear<O> makeInstance() { return new SimilarityAdapterLinear<O>(similarityFunction); } diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLn.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLn.java index a45b6108..b1b63486 100644 --- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLn.java +++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/adapter/SimilarityAdapterLn.java @@ -30,7 +30,6 @@ import de.lmu.ifi.dbs.elki.distance.distancefunction.DistanceFunction; import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance; import de.lmu.ifi.dbs.elki.distance.distancevalue.NumberDistance; import de.lmu.ifi.dbs.elki.distance.similarityfunction.NormalizedSimilarityFunction; -import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization; /** * Adapter from a normalized similarity function to a distance function using @@ -92,11 +91,6 @@ public class SimilarityAdapterLn<O> extends AbstractSimilarityAdapter<O> { */ public static class Parameterizer<O> extends AbstractSimilarityAdapter.Parameterizer<O> { @Override - protected void makeOptions(Parameterization config) { - super.makeOptions(config); - } - - @Override protected SimilarityAdapterLn<O> makeInstance() { return new SimilarityAdapterLn<O>(similarityFunction); } |