diff options
Diffstat (limited to 'elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter')
59 files changed, 98 insertions, 38 deletions
diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractConversionFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractConversionFilter.java index 57eb6501..dbb492d5 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractConversionFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractConversionFilter.java @@ -35,6 +35,7 @@ import de.lmu.ifi.dbs.elki.utilities.exceptions.AbortException; * Abstract base class for simple conversion filters such as normalizations and projections. * * @author Erich Schubert + * @since 0.4.0 * * @param <I> Input object type * @param <O> Input object type @@ -74,7 +75,7 @@ public abstract class AbstractConversionFilter<I, O> implements ObjectFilter { // When necessary, perform an initialization scan if(prepareStart(castType)) { - FiniteProgress pprog = logger.isVerbose() ? new FiniteProgress("Preparing normalization.", objects.dataLength(), logger) : null; + FiniteProgress pprog = logger.isVerbose() ? new FiniteProgress("Preparing normalization", objects.dataLength(), logger) : null; for(Object o : column) { @SuppressWarnings("unchecked") final I obj = (I) o; @@ -90,7 +91,7 @@ public abstract class AbstractConversionFilter<I, O> implements ObjectFilter { bundle.appendColumn(convertedType(castType), castColumn); // Normalization scan - FiniteProgress nprog = logger.isVerbose() ? new FiniteProgress("Data normalization.", objects.dataLength(), logger) : null; + FiniteProgress nprog = logger.isVerbose() ? new FiniteProgress("Data normalization", objects.dataLength(), logger) : null; for(int i = 0; i < objects.dataLength(); i++) { @SuppressWarnings("unchecked") final I obj = (I) column.get(i); diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamConversionFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamConversionFilter.java index 19aa0d53..57b8474a 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamConversionFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamConversionFilter.java @@ -32,6 +32,7 @@ import de.lmu.ifi.dbs.elki.datasource.bundle.BundleMeta; * projections. * * @author Erich Schubert + * @since 0.5.0 * * @param <I> Input object type * @param <O> Input object type diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamFilter.java index f2cf7e62..19d8ce05 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractStreamFilter.java @@ -30,6 +30,7 @@ import de.lmu.ifi.dbs.elki.datasource.bundle.MultipleObjectsBundle; * Abstract base class for streaming filters. * * @author Erich Schubert + * @since 0.4.0 */ public abstract class AbstractStreamFilter implements StreamFilter { /** diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorConversionFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorConversionFilter.java index 4c4e92bd..4da87ed1 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorConversionFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorConversionFilter.java @@ -30,6 +30,7 @@ import de.lmu.ifi.dbs.elki.data.type.SimpleTypeInformation; * Abstract class for filters that produce number vectors. * * @author Erich Schubert + * @since 0.4.0 * * @param <I> Input vector type * @param <O> Output vector type diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorStreamConversionFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorStreamConversionFilter.java index b5111a22..80edde67 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorStreamConversionFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/AbstractVectorStreamConversionFilter.java @@ -29,6 +29,7 @@ import de.lmu.ifi.dbs.elki.data.type.SimpleTypeInformation; * Abstract base class for streaming filters that produce vectors. * * @author Erich Schubert + * @since 0.4.0 * * @param <I> Input type * @param <O> Output vector type diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java index d8da0f62..2dc97ef0 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FilterUtil.java @@ -37,6 +37,7 @@ import de.lmu.ifi.dbs.elki.logging.LoggingUtil; * Utilities for implementing filters. * * @author Erich Schubert + * @since 0.4.0 */ public final class FilterUtil { /** diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FixedDBIDsFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FixedDBIDsFilter.java index f6ae4a41..0177acb4 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FixedDBIDsFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/FixedDBIDsFilter.java @@ -38,6 +38,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * the bundle by adding a column of DBID type to the bundle. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.has DBIDRange oneway - - «produces» */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/NoOpFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/NoOpFilter.java index 872daf19..c8c77e0e 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/NoOpFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/NoOpFilter.java @@ -34,6 +34,7 @@ import de.lmu.ifi.dbs.elki.datasource.bundle.MultipleObjectsBundle; * just use this dummy filter as first parameter. * * @author Erich Schubert + * @since 0.4.0 */ public class NoOpFilter extends AbstractStreamFilter { /** diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/ObjectFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/ObjectFilter.java index cbf5fa85..ed541778 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/ObjectFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/ObjectFilter.java @@ -29,6 +29,7 @@ import de.lmu.ifi.dbs.elki.datasource.bundle.MultipleObjectsBundle; * Object filters as part of the input step. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.landmark * diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/StreamFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/StreamFilter.java index 2e07c52c..9157967e 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/StreamFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/StreamFilter.java @@ -30,6 +30,7 @@ import de.lmu.ifi.dbs.elki.datasource.bundle.BundleStreamSource; * keep a reference to earlier data. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.landmark * diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/DropNaNFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/DropNaNFilter.java index 8eb54ab4..21300cea 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/DropNaNFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/DropNaNFilter.java @@ -44,8 +44,9 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * TODO: add support for sparse vectors. * * @author Erich Schubert + * @since 0.4.0 */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.DropNaNFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.DropNaNFilter") public class DropNaNFilter extends AbstractStreamFilter { /** * Class logger diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/NoMissingValuesFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/NoMissingValuesFilter.java index 32b92a8a..a7c425e4 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/NoMissingValuesFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/NoMissingValuesFilter.java @@ -36,8 +36,10 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * A filter to remove entries that have missing values. * * @author Erich Schubert + * @since 0.4.0 */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.NoMissingValuesFilter" }) +@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.FilterNoMissingValuesFilter", // +"de.lmu.ifi.dbs.elki.datasource.filter.NoMissingValuesFilter" }) public class NoMissingValuesFilter extends AbstractStreamFilter { /** * Class logger @@ -130,4 +132,4 @@ public class NoMissingValuesFilter extends AbstractStreamFilter { return new NoMissingValuesFilter(); } } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/ReplaceNaNWithRandomFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/ReplaceNaNWithRandomFilter.java index 6ee9e220..a5222d8f 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/ReplaceNaNWithRandomFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/ReplaceNaNWithRandomFilter.java @@ -48,8 +48,9 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * TODO: add support for sparse vectors. * * @author Erich Schubert + * @since 0.4.0 */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.ReplaceNaNWithRandomFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.ReplaceNaNWithRandomFilter") public class ReplaceNaNWithRandomFilter extends AbstractStreamFilter { /** * Class logger diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/VectorDimensionalityFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/VectorDimensionalityFilter.java index d0bafa31..33a9c13f 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/VectorDimensionalityFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/cleaning/VectorDimensionalityFilter.java @@ -44,10 +44,10 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * Filter to remove all vectors that do not have the desired dimensionality. * * @author Erich Schubert + * @since 0.7.0 * * @param <V> Vector type */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.VectorDimensionalityFilter" }) public class VectorDimensionalityFilter<V extends NumberVector> extends AbstractStreamFilter { /** * Class logger. diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractNormalization.java index e0cd3f09..0e6f783b 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractNormalization.java @@ -32,6 +32,7 @@ import de.lmu.ifi.dbs.elki.math.linearalgebra.LinearEquationSystem; * Abstract super class for all normalizations. * * @author Elke Achtert + * @since 0.4.0 * * @param <V> Object type processed */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractStreamNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractStreamNormalization.java index 1e61a206..e8b099ce 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractStreamNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/AbstractStreamNormalization.java @@ -32,6 +32,7 @@ import de.lmu.ifi.dbs.elki.math.linearalgebra.LinearEquationSystem; * Abstract super class for all normalizations. * * @author Erich Schubert + * @since 0.4.0 * * @param <V> Object type processed */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/NonNumericFeaturesException.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/NonNumericFeaturesException.java index 16175bc8..4f8cfb56 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/NonNumericFeaturesException.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/NonNumericFeaturesException.java @@ -29,6 +29,7 @@ package de.lmu.ifi.dbs.elki.datasource.filter.normalization; * features have been expected. * * @author Arthur Zimek + * @since 0.4.0 */ public class NonNumericFeaturesException extends Exception { /** diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/Normalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/Normalization.java index 26393bd9..ea08a93e 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/Normalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/Normalization.java @@ -34,6 +34,7 @@ import de.lmu.ifi.dbs.elki.math.linearalgebra.LinearEquationSystem; * dependencies quantitatively adapted to the original space. * * @author Arthur Zimek + * @since 0.4.0 * * @apiviz.landmark * @apiviz.has NonNumericFeaturesException diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseBetaNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseBetaNormalization.java index 2500a370..1b9b9d6d 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseBetaNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseBetaNormalization.java @@ -59,13 +59,13 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectListParamet * this. * * @author Erich Schubert + * @since 0.6.0 * * @param <V> vector type * * @apiviz.uses NumberVector * @apiviz.uses DistributionEstimator */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseBetaNormalization"}) public class AttributeWiseBetaNormalization<V extends NumberVector> implements Normalization<V> { /** * Class logger. diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseCDFNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseCDFNormalization.java index d4028f1e..6d2f77e8 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseCDFNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseCDFNormalization.java @@ -64,6 +64,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectListParamet * but they do not detail how to obtain an appropriate function `F`. * * @author Erich Schubert + * @since 0.6.0 * @param <V> vector type * * @apiviz.uses NumberVector diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseErfNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseErfNormalization.java index 83d24244..a099e533 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseErfNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseErfNormalization.java @@ -36,12 +36,14 @@ import de.lmu.ifi.dbs.elki.utilities.Alias; * sense when you have data that has been mean-variance normalized before. * * @author Erich Schubert + * @since 0.4.0 * * @param <V> Object type * * @apiviz.uses NumberVector */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseErfNormalization"}) +@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseErfNormalization", // +"de.lmu.ifi.dbs.elki.datasource.filter.AttributeWiseErfNormalization" }) public class AttributeWiseErfNormalization<V extends NumberVector> extends AbstractNormalization<V> { /** * Class logger. diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMADNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMADNormalization.java index cdb60a4d..165aa4a1 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMADNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMADNormalization.java @@ -52,6 +52,7 @@ import de.lmu.ifi.dbs.elki.utilities.exceptions.ExceptionMessages; * robust towards outliers, and only slightly more expensive to compute. * * @author Erich Schubert + * @since 0.6.0 * @param <V> vector type * * @apiviz.uses NumberVector @@ -111,7 +112,7 @@ public class AttributeWiseMADNormalization<V extends NumberVector> implements No // Scratch space for testing: double[] test = new double[castColumn.size()]; - FiniteProgress dprog = LOG.isVerbose() ? new FiniteProgress("Analyzing data.", dim, LOG) : null; + FiniteProgress dprog = LOG.isVerbose() ? new FiniteProgress("Analyzing data", dim, LOG) : null; // We iterate over dimensions, this kind of filter needs fast random // access. for(int d = 0; d < dim; d++) { @@ -147,7 +148,7 @@ public class AttributeWiseMADNormalization<V extends NumberVector> implements No } LOG.ensureCompleted(dprog); - FiniteProgress nprog = LOG.isVerbose() ? new FiniteProgress("Data normalization.", objects.dataLength(), LOG) : null; + FiniteProgress nprog = LOG.isVerbose() ? new FiniteProgress("Data normalization", objects.dataLength(), LOG) : null; // Normalization scan double[] buf = new double[dim]; for(int i = 0; i < objects.dataLength(); i++) { diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMeanNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMeanNormalization.java index 350f6188..4aedfe3d 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMeanNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMeanNormalization.java @@ -38,11 +38,11 @@ import de.lmu.ifi.dbs.elki.utilities.FormatUtil; * attribute is scaled to have the same mean (but 0 is not changed). * * @author Erich Schubert + * @since 0.7.0 * @param <V> vector type * * @apiviz.uses NumberVector */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseMeanNormalization"}) public class AttributeWiseMeanNormalization<V extends NumberVector> extends AbstractNormalization<V> { /** * Class logger. @@ -204,4 +204,4 @@ public class AttributeWiseMeanNormalization<V extends NumberVector> extends Abst protected SimpleTypeInformation<? super V> getInputTypeRestriction() { return TypeUtil.NUMBER_VECTOR_FIELD; } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMinMaxNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMinMaxNormalization.java index 7981d4f5..8fbff47e 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMinMaxNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseMinMaxNormalization.java @@ -44,11 +44,13 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleListParamet * given minimum and maximum in each dimension. * * @author Elke Achtert + * @since 0.4.0 * @param <V> vector type * * @apiviz.uses NumberVector */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseMinMaxNormalization" }) +@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseMinMaxNormalization", // +"de.lmu.ifi.dbs.elki.datasource.filter.AttributeWiseMinMaxNormalization" }) public class AttributeWiseMinMaxNormalization<V extends NumberVector> extends AbstractNormalization<V> { /** * Class logger. diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseVarianceNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseVarianceNormalization.java index e997b907..d53f7ffd 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseVarianceNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/AttributeWiseVarianceNormalization.java @@ -46,11 +46,13 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleListParamet * given mean and standard deviation in each dimension. * * @author Erich Schubert + * @since 0.4.0 * @param <V> vector type * * @apiviz.uses NumberVector */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseVarianceNormalization", "z" }) +@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.AttributeWiseVarianceNormalization", // +"z", "de.lmu.ifi.dbs.elki.datasource.filter.AttributeWiseVarianceNormalization" }) public class AttributeWiseVarianceNormalization<V extends NumberVector> extends AbstractNormalization<V> { /** * Class logger. @@ -277,4 +279,4 @@ public class AttributeWiseVarianceNormalization<V extends NumberVector> extends return new AttributeWiseVarianceNormalization<>(mean, stddev); } } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/IntegerRankTieNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/IntegerRankTieNormalization.java index 03c98023..d9733b78 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/IntegerRankTieNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/IntegerRankTieNormalization.java @@ -45,8 +45,9 @@ import de.lmu.ifi.dbs.elki.utilities.datastructures.arrays.IntegerComparator; * then, followed by the next on "4") * * @author Erich Schubert + * @since 0.5.0 */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.IntegerRankTieNormalization"}) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.normalization.RankTieNormalization") public class IntegerRankTieNormalization implements ObjectFilter { /** * Constructor. @@ -147,4 +148,4 @@ public class IntegerRankTieNormalization implements ObjectFilter { return (vx < vy) ? -1 : (vx == vy) ? 0 : +1; } } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/InverseDocumentFrequencyNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/InverseDocumentFrequencyNormalization.java index 3ebce57d..6b730fc1 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/InverseDocumentFrequencyNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/columnwise/InverseDocumentFrequencyNormalization.java @@ -38,12 +38,14 @@ import de.lmu.ifi.dbs.elki.utilities.Alias; * frequency (IDF). See also: TF-IDF for text analysis. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.uses SparseNumberVector * * @param <V> Vector type */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.InverseDocumentFrequencyNormalization" }) +@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.InverseDocumentFrequencyNormalization", // +"de.lmu.ifi.dbs.elki.datasource.filter.InverseDocumentFrequencyNormalization" }) public class InverseDocumentFrequencyNormalization<V extends SparseNumberVector> extends AbstractNormalization<V> { /** * Class logger. @@ -127,4 +129,4 @@ public class InverseDocumentFrequencyNormalization<V extends SparseNumberVector> protected Logging getLogger() { return LOG; } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/HellingerHistogramNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/HellingerHistogramNormalization.java index a79a3047..352e96dd 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/HellingerHistogramNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/HellingerHistogramNormalization.java @@ -39,10 +39,10 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * {@link de.lmu.ifi.dbs.elki.distance.distancefunction.probabilistic.HellingerDistanceFunction} * * @author Erich Schubert + * @since 0.7.0 * * @param <V> vector type */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.HellingerHistogramNormalization" }) public class HellingerHistogramNormalization<V extends NumberVector> extends AbstractStreamNormalization<V> { /** * Static instance. @@ -94,4 +94,4 @@ public class HellingerHistogramNormalization<V extends NumberVector> extends Abs return STATIC; } } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceLogRankNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceLogRankNormalization.java index 8f46b156..d8d0ff95 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceLogRankNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceLogRankNormalization.java @@ -37,6 +37,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * largest is 1, but using log_2(1+x). * * @author Erich Schubert + * @since 0.7.0 * * @param <V> vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMeanVarianceNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMeanVarianceNormalization.java index a546ccd8..fa1eb6d1 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMeanVarianceNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMeanVarianceNormalization.java @@ -34,6 +34,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * Normalize vectors such that they have zero mean and unit variance. * * @author Erich Schubert + * @since 0.7.0 * * @param <V> vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMinMaxNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMinMaxNormalization.java index f0b1ceea..fbbd4d46 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMinMaxNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceMinMaxNormalization.java @@ -38,6 +38,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleParameter; * Normalize vectors such that the smallest attribute is 0, the largest is 1. * * @author Erich Schubert + * @since 0.7.0 * * @param <V> vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceRankNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceRankNormalization.java index f6058ecb..bd85d912 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceRankNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/InstanceRankNormalization.java @@ -36,6 +36,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; * largest is 1. * * @author Erich Schubert + * @since 0.7.0 * * @param <V> vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/LengthNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/LengthNormalization.java index df00683e..b82d1eba 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/LengthNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/LengthNormalization.java @@ -40,6 +40,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * * @author Heidi Kolb * @author Erich Schubert + * @since 0.5.0 * * @param <V> vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/Log1PlusNormalization.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/Log1PlusNormalization.java index 04e27e73..737869ae 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/Log1PlusNormalization.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/normalization/instancewise/Log1PlusNormalization.java @@ -41,10 +41,10 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.DoubleParameter; * By default b=1, and thus the transformation is log2(1+|x|). * * @author Erich Schubert + * @since 0.5.0 * * @param <V> vector type */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.Log1PlusNormalization" }) public class Log1PlusNormalization<V extends NumberVector> extends AbstractStreamNormalization<V> { /** * Static instance. @@ -116,4 +116,4 @@ public class Log1PlusNormalization<V extends NumberVector> extends AbstractStrea return new Log1PlusNormalization<>(boost); } } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ByLabelFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ByLabelFilter.java index 381001c0..962e3a7a 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ByLabelFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ByLabelFilter.java @@ -42,10 +42,12 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.PatternParameter; * A filter to select data set by their label. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.uses LabelList oneway - - «reads» */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.ByLabelFilter" }) +@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.ByLabelFilter", // +"de.lmu.ifi.dbs.elki.datasource.filter.FilterByLabelFilter" }) public class ByLabelFilter extends AbstractStreamFilter { /** * Class logger @@ -195,4 +197,4 @@ public class ByLabelFilter extends AbstractStreamFilter { return new ByLabelFilter(pattern, inverted); } } -}
\ No newline at end of file +} diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/RandomSamplingStreamFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/RandomSamplingStreamFilter.java index faf6276f..9418a6c1 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/RandomSamplingStreamFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/RandomSamplingStreamFilter.java @@ -40,8 +40,9 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.RandomParameter; * Subsampling stream filter. * * @author Erich Schubert + * @since 0.5.0 */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.RandomSamplingStreamFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.RandomSamplingStreamFilter") public class RandomSamplingStreamFilter extends AbstractStreamFilter { /** * Probability diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ShuffleObjectsFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ShuffleObjectsFilter.java index 1d86a59d..16afb512 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ShuffleObjectsFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/ShuffleObjectsFilter.java @@ -41,6 +41,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.RandomParameter; * A filter to shuffle the dataset. * * @author Erich Schubert + * @since 0.4.0 */ @Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.ShuffleObjectsFilter" }) public class ShuffleObjectsFilter implements ObjectFilter { diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/SortByLabelFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/SortByLabelFilter.java index d1a7beb8..5b833c07 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/SortByLabelFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/selection/SortByLabelFilter.java @@ -39,10 +39,11 @@ import de.lmu.ifi.dbs.elki.utilities.exceptions.AbortException; * A filter to sort the data set by some label. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.uses de.lmu.ifi.dbs.elki.data.LabelList oneway - - «reads» */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.SortByLabelFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.SortByLabelFilter") public class SortByLabelFilter implements ObjectFilter { /** * Class logger diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/AbstractSupervisedProjectionVectorFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/AbstractSupervisedProjectionVectorFilter.java index bd89e7f1..3854ee7d 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/AbstractSupervisedProjectionVectorFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/AbstractSupervisedProjectionVectorFilter.java @@ -23,9 +23,6 @@ package de.lmu.ifi.dbs.elki.datasource.filter.transform; along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import gnu.trove.list.TIntList; -import gnu.trove.list.array.TIntArrayList; - import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -42,12 +39,13 @@ import de.lmu.ifi.dbs.elki.datasource.filter.typeconversions.ClassLabelFilter; import de.lmu.ifi.dbs.elki.logging.Logging; import de.lmu.ifi.dbs.elki.math.linearalgebra.Matrix; import de.lmu.ifi.dbs.elki.math.linearalgebra.Vector; -import de.lmu.ifi.dbs.elki.utilities.datastructures.arraylike.ArrayLikeUtil; 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.constraints.CommonConstraints; import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization; import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; +import gnu.trove.list.TIntList; +import gnu.trove.list.array.TIntArrayList; /** * Base class for supervised projection methods. @@ -56,6 +54,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * * @author Angela Peng * @author Erich Schubert + * @since 0.6.0 * * @param <V> Vector type */ @@ -113,7 +112,7 @@ public abstract class AbstractSupervisedProjectionVectorFilter<V extends NumberV List<V> vectorcolumn = (List<V>) column; final VectorFieldTypeInformation<?> vtype = (VectorFieldTypeInformation<?>) type; @SuppressWarnings("unchecked") - NumberVector.Factory<V> factory = (NumberVector.Factory<V> ) vtype.getFactory(); + NumberVector.Factory<V> factory = (NumberVector.Factory<V>) vtype.getFactory(); int dim = vtype.getDimensionality(); if(tdim > dim) { @@ -127,7 +126,7 @@ public abstract class AbstractSupervisedProjectionVectorFilter<V extends NumberV Matrix proj = computeProjectionMatrix(vectorcolumn, classcolumn, dim); for(int i = 0; i < dataLength; i++) { final Vector pv = proj.times(vectorcolumn.get(i).getColumnVector()); - V filteredObj = factory.newNumberVector(pv, ArrayLikeUtil.VECTORADAPTER); + V filteredObj = factory.newNumberVector(pv); vectorcolumn.set(i, filteredObj); } bundle.appendColumn(convertedType(type, factory), column); diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ClassicMultidimensionalScalingTransform.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ClassicMultidimensionalScalingTransform.java index af1aa3af..8c1d161c 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ClassicMultidimensionalScalingTransform.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ClassicMultidimensionalScalingTransform.java @@ -54,6 +54,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * instead. * * @author Erich Schubert + * @since 0.6.0 * * @apiviz.composedOf SingularValueDecomposition * diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/FastMultidimensionalScalingTransform.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/FastMultidimensionalScalingTransform.java index 121e500b..7270b3ac 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/FastMultidimensionalScalingTransform.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/FastMultidimensionalScalingTransform.java @@ -52,6 +52,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * This implementation is O(n^2), and uses O(n^2) memory. * * @author Erich Schubert + * @since 0.6.0 * * @param <O> Data type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/GlobalPrincipalComponentAnalysisTransform.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/GlobalPrincipalComponentAnalysisTransform.java index 86b30c0c..20b64eb0 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/GlobalPrincipalComponentAnalysisTransform.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/GlobalPrincipalComponentAnalysisTransform.java @@ -54,6 +54,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * {@link Parameterizer#FILTER_ID} parameter! * * @author Erich Schubert + * @since 0.5.0 * * @apiviz.composedOf PCARunner * @apiviz.composedOf CovarianceMatrix diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/HistogramJitterFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/HistogramJitterFilter.java index 609ee0c9..a88ec88d 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/HistogramJitterFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/HistogramJitterFilter.java @@ -29,6 +29,7 @@ import de.lmu.ifi.dbs.elki.data.type.TypeUtil; import de.lmu.ifi.dbs.elki.datasource.filter.AbstractVectorStreamConversionFilter; import de.lmu.ifi.dbs.elki.math.random.RandomFactory; import de.lmu.ifi.dbs.elki.math.statistics.distribution.ExponentialDistribution; +import de.lmu.ifi.dbs.elki.utilities.Alias; import de.lmu.ifi.dbs.elki.utilities.documentation.Description; import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer; import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID; @@ -52,10 +53,12 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.RandomParameter; * to control the degradation amount. * * @author Erich Schubert + * @since 0.5.5 * * @param <V> Vector type */ @Description("Add uniform Jitter to a dataset, while preserving the total vector sum.") +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.HistogramJitterFilter") public class HistogramJitterFilter<V extends NumberVector> extends AbstractVectorStreamConversionFilter<V, V> { /** * Jitter amount. diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LatLngToECEFFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LatLngToECEFFilter.java index e82f07d1..9284f4ab 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LatLngToECEFFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LatLngToECEFFilter.java @@ -40,6 +40,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * Z), such that Euclidean distance is line-of-sight. * * @author Erich Schubert + * @since 0.6.0 * * @apiviz.uses NumberVector * @apiviz.composedOf EarthModel diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LinearDiscriminantAnalysisFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LinearDiscriminantAnalysisFilter.java index 58e29021..08ebcc8b 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LinearDiscriminantAnalysisFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LinearDiscriminantAnalysisFilter.java @@ -54,6 +54,7 @@ import de.lmu.ifi.dbs.elki.utilities.documentation.Reference; * * @author Angela Peng * @author Erich Schubert + * @since 0.6.0 * * @param <V> Vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LngLatToECEFFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LngLatToECEFFilter.java index fae5ee9f..7fcabaaf 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LngLatToECEFFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/LngLatToECEFFilter.java @@ -40,6 +40,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * Z), such that Euclidean distance is line-of-sight. * * @author Erich Schubert + * @since 0.6.0 * * @apiviz.uses NumberVector * @apiviz.composedOf EarthModel diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorFeatureSelectionFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorFeatureSelectionFilter.java index e2a03544..2716b830 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorFeatureSelectionFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorFeatureSelectionFilter.java @@ -44,6 +44,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntListParameter; * </p> * * @author Arthur Zimek + * @since 0.4.0 * * @apiviz.uses NumberVector * diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorRandomFeatureSelectionFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorRandomFeatureSelectionFilter.java index fff1f44a..fca5aa73 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorRandomFeatureSelectionFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/NumberVectorRandomFeatureSelectionFilter.java @@ -44,6 +44,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.RandomParameter; * randomly selected subset of attributes. * * @author Arthur Zimek + * @since 0.4.0 * * @apiviz.uses NumberVector * diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/PerturbationFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/PerturbationFilter.java index 680cd023..afae04a2 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/PerturbationFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/PerturbationFilter.java @@ -67,6 +67,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.LongParameter; * </p> * * @author Arthur Zimek + * @since 0.7.0 */ @Title("Data Perturbation for Outlier Detection Ensembles") @Description("A filter to perturb a datasset on read by an additive noise component, implemented for use in an outlier ensemble (this reference).") diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ProjectionFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ProjectionFilter.java index ed87b8db..2074929e 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ProjectionFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/transform/ProjectionFilter.java @@ -36,6 +36,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * Apply a projection to the data. * * @author Erich Schubert + * @since 0.6.0 * * @apiviz.composedOf Projection * diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFilter.java index 4e48adbc..33b715dc 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFilter.java @@ -44,11 +44,12 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * Class that turns a label column into a class label column. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.uses LabelList oneway - - «reads» * @apiviz.has ClassLabel */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.ClassLabelFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.ClassLabelFilter") public class ClassLabelFilter implements ObjectFilter { /** * The index of the label to be used as class label, null if no class label is diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFromPatternFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFromPatternFilter.java index 0d3279ce..1eab3804 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFromPatternFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ClassLabelFromPatternFilter.java @@ -44,8 +44,9 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.StringParameter; * Streaming filter to derive an outlier class label. * * @author Erich Schubert + * @since 0.6.0 */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.ClassLabelFromPatternFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.ClassLabelFromPatternFilter") public class ClassLabelFromPatternFilter extends AbstractStreamFilter { /** * Current meta data diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ExternalIDFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ExternalIDFilter.java index 72ac5578..b6baaebf 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ExternalIDFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/ExternalIDFilter.java @@ -42,11 +42,12 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * Class that turns a label column into an external ID column. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.uses LabelList oneway - - «reads» * @apiviz.has ExternalID oneway - - «produces» */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.ExternalIDFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.ExternalIDFilter") public class ExternalIDFilter implements ObjectFilter { /** * The index of the label to be used as external Id. diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/MultivariateTimeSeriesFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/MultivariateTimeSeriesFilter.java index 4ee50783..5d4e253b 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/MultivariateTimeSeriesFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/MultivariateTimeSeriesFilter.java @@ -41,6 +41,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * Class to "fold" a flat number vector into a multivariate time series. * * @author Erich Schubert + * @since 0.7.0 * * @param <V> Vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SparseVectorFieldFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SparseVectorFieldFilter.java index 86092f7c..f174eb70 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SparseVectorFieldFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SparseVectorFieldFilter.java @@ -37,6 +37,7 @@ import de.lmu.ifi.dbs.elki.utilities.Alias; * the maximum dimensionality for each vector. * * @author Erich Schubert + * @since 0.5.0 * * @param <V> Vector type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SplitNumberVectorFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SplitNumberVectorFilter.java index bf1e415f..95e3fd6a 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SplitNumberVectorFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/SplitNumberVectorFilter.java @@ -45,12 +45,13 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntListParameter; * Split an existing column into two types. * * @author Erich Schubert + * @since 0.4.0 * * @apiviz.uses NumberVector * * @param <V> Vector type */ -@Alias({ "de.lmu.ifi.dbs.elki.datasource.filter.normalization.SplitNumberVectorFilter" }) +@Alias("de.lmu.ifi.dbs.elki.datasource.filter.SplitNumberVectorFilter") public class SplitNumberVectorFilter<V extends NumberVector> implements ObjectFilter { /** * Selected dimensions. diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainSplitFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainSplitFilter.java index 0ae85cd2..68dcf218 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainSplitFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainSplitFilter.java @@ -43,6 +43,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * uncertain observation. * * @author Erich Schubert + * @since 0.7.0 */ public class UncertainSplitFilter extends AbstractConversionFilter<NumberVector, UnweightedDiscreteUncertainObject> { /** diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainifyFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainifyFilter.java index e45b964c..ccd8e72f 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainifyFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/UncertainifyFilter.java @@ -57,6 +57,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.RandomParameter; * * @author Alexander Koos * @author Erich Schubert + * @since 0.7.0 * * @param <UO> Uncertain object type */ diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/WeightedUncertainSplitFilter.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/WeightedUncertainSplitFilter.java index 48df989b..0a10b036 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/WeightedUncertainSplitFilter.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/datasource/filter/typeconversions/WeightedUncertainSplitFilter.java @@ -45,6 +45,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.IntParameter; * interpret as uncertain observation. * * @author Erich Schubert + * @since 0.7.0 */ public class WeightedUncertainSplitFilter extends AbstractConversionFilter<NumberVector, WeightedDiscreteUncertainObject> { /** |