diff options
| author | Erich Schubert <erich@debian.org> | 2012-06-02 17:47:03 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 22:30:32 +0000 |
| commit | 593eae6c91717eb9f4ff5088ba460dd4210509c0 (patch) | |
| tree | d97e8cefb48773a382542e9e9d4a6796202a044a /src/de/lmu/ifi/dbs/elki/distance/distancefunction/subspace/AbstractDimensionsSelectingDoubleDistanceFunction.java | |
| parent | e580e42664ca92fbf8792bc39b8d59383db829fe (diff) | |
| parent | c36aa2a8fd31ca5e225ff30278e910070cd2c8c1 (diff) | |
Import Debian changes 0.5.0~beta2-1
elki (0.5.0~beta2-1) unstable; urgency=low
* New upstream beta release.
* Needs GNU Trove 3, in NEW.
* Build with OpenJDK7, as OpenJDK6 complains.
elki (0.5.0~beta1-1) unstable; urgency=low
* New upstream beta release.
* Needs GNU Trove 3, not yet in Debian (private package)
* Build with OpenJDK7, as OpenJDK6 complains.
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/distance/distancefunction/subspace/AbstractDimensionsSelectingDoubleDistanceFunction.java')
| -rw-r--r-- | src/de/lmu/ifi/dbs/elki/distance/distancefunction/subspace/AbstractDimensionsSelectingDoubleDistanceFunction.java | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/subspace/AbstractDimensionsSelectingDoubleDistanceFunction.java b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/subspace/AbstractDimensionsSelectingDoubleDistanceFunction.java index a7204562..b58979ef 100644 --- a/src/de/lmu/ifi/dbs/elki/distance/distancefunction/subspace/AbstractDimensionsSelectingDoubleDistanceFunction.java +++ b/src/de/lmu/ifi/dbs/elki/distance/distancefunction/subspace/AbstractDimensionsSelectingDoubleDistanceFunction.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.distance.distancefunction.subspace; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -42,7 +42,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntListParameter; * @author Elke Achtert * @param <V> the type of FeatureVector to compute the distances in between */ -public abstract class AbstractDimensionsSelectingDoubleDistanceFunction<V extends FeatureVector<?, ?>> extends AbstractPrimitiveDistanceFunction<V, DoubleDistance> implements PrimitiveDoubleDistanceFunction<V> { +public abstract class AbstractDimensionsSelectingDoubleDistanceFunction<V extends FeatureVector<?, ?>> extends AbstractPrimitiveDistanceFunction<V, DoubleDistance> implements PrimitiveDoubleDistanceFunction<V>, DimensionSelectingSubspaceDistanceFunction<V, DoubleDistance> { /** * Dimensions parameter. */ @@ -51,7 +51,7 @@ public abstract class AbstractDimensionsSelectingDoubleDistanceFunction<V extend /** * The dimensions to be considered for distance computation. */ - private BitSet dimensions; + protected BitSet dimensions; /** * Constructor. @@ -68,22 +68,12 @@ public abstract class AbstractDimensionsSelectingDoubleDistanceFunction<V extend return new DoubleDistance(doubleDistance(o1, o2)); } - /** - * Returns a bit set representing the selected dimensions. - * - * @return a bit set representing the selected dimensions - */ + @Override public BitSet getSelectedDimensions() { - BitSet dimensions = new BitSet(this.dimensions.size()); - dimensions.or(this.dimensions); return dimensions; } - /** - * Sets the selected dimensions according to the set bits in the given BitSet. - * - * @param dimensions a BitSet designating the new selected dimensions - */ + @Override public void setSelectedDimensions(BitSet dimensions) { this.dimensions.clear(); this.dimensions.or(dimensions); |