diff --git a/src/main/java/org/apache/commons/math3/stat/clustering/Cluster.java b/src/main/java/org/apache/commons/math3/stat/clustering/Cluster.java index 793f443b85..4f773a4aa2 100644 --- a/src/main/java/org/apache/commons/math3/stat/clustering/Cluster.java +++ b/src/main/java/org/apache/commons/math3/stat/clustering/Cluster.java @@ -26,7 +26,10 @@ * @param the type of points that can be clustered * @version $Id$ * @since 2.0 + * @deprecated As of 3.2 (to be removed in 4.0), + * use {@link org.apache.commons.math3.ml.clustering.Cluster} instead */ +@Deprecated public class Cluster> implements Serializable { /** Serializable version identifier. */ diff --git a/src/main/java/org/apache/commons/math3/stat/clustering/Clusterable.java b/src/main/java/org/apache/commons/math3/stat/clustering/Clusterable.java index f7eb8533f5..264f816905 100644 --- a/src/main/java/org/apache/commons/math3/stat/clustering/Clusterable.java +++ b/src/main/java/org/apache/commons/math3/stat/clustering/Clusterable.java @@ -24,7 +24,10 @@ * @param the type of point that can be clustered * @version $Id$ * @since 2.0 + * @deprecated As of 3.2 (to be removed in 4.0), + * use {@link org.apache.commons.math3.ml.clustering.Clusterable} instead */ +@Deprecated public interface Clusterable { /** diff --git a/src/main/java/org/apache/commons/math3/stat/clustering/DBSCANClusterer.java b/src/main/java/org/apache/commons/math3/stat/clustering/DBSCANClusterer.java index f7df5471a8..c29cc28bfd 100644 --- a/src/main/java/org/apache/commons/math3/stat/clustering/DBSCANClusterer.java +++ b/src/main/java/org/apache/commons/math3/stat/clustering/DBSCANClusterer.java @@ -57,7 +57,10 @@ * A Density-Based Algorithm for Discovering Clusters in Large Spatial Databases with Noise * @version $Id$ * @since 3.1 + * @deprecated As of 3.2 (to be removed in 4.0), + * use {@link org.apache.commons.math3.ml.clustering.DBSCANClusterer} instead */ +@Deprecated public class DBSCANClusterer> { /** Maximum radius of the neighborhood to be considered. */ diff --git a/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanDoublePoint.java b/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanDoublePoint.java index 81c95eef65..de7aee51d0 100644 --- a/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanDoublePoint.java +++ b/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanDoublePoint.java @@ -26,7 +26,10 @@ * A simple implementation of {@link Clusterable} for points with double coordinates. * @version $Id$ * @since 3.1 + * @deprecated As of 3.2 (to be removed in 4.0), + * use {@link org.apache.commons.math3.ml.clustering.DoublePoint} instead */ +@Deprecated public class EuclideanDoublePoint implements Clusterable, Serializable { /** Serializable version identifier. */ diff --git a/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPoint.java b/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPoint.java index b48b393b91..49b74ff57c 100644 --- a/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPoint.java +++ b/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPoint.java @@ -27,7 +27,10 @@ * A simple implementation of {@link Clusterable} for points with integer coordinates. * @version $Id$ * @since 2.0 + * @deprecated As of 3.2 (to be removed in 4.0), + * use {@link org.apache.commons.math3.ml.clustering.DoublePoint} instead */ +@Deprecated public class EuclideanIntegerPoint implements Clusterable, Serializable { /** Serializable version identifier. */ diff --git a/src/main/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClusterer.java b/src/main/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClusterer.java index 9d42e02dec..8b12d238cd 100644 --- a/src/main/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClusterer.java +++ b/src/main/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClusterer.java @@ -36,7 +36,10 @@ * @see K-means++ (wikipedia) * @version $Id$ * @since 2.0 + * @deprecated As of 3.2 (to be removed in 4.0), + * use {@link org.apache.commons.math3.ml.clustering.KMeansPlusPlusClusterer} instead */ +@Deprecated public class KMeansPlusPlusClusterer> { /** Strategies to use for replacing an empty cluster. */ diff --git a/src/main/java/org/apache/commons/math3/stat/clustering/package-info.java b/src/main/java/org/apache/commons/math3/stat/clustering/package-info.java index b34bfd8ea5..f6b8d3e1e6 100644 --- a/src/main/java/org/apache/commons/math3/stat/clustering/package-info.java +++ b/src/main/java/org/apache/commons/math3/stat/clustering/package-info.java @@ -15,6 +15,15 @@ * limitations under the License. */ /** - * Clustering algorithms + *

All classes and sub-packages of this package are deprecated.

+ *

Please use their replacements, to be found under + *
    + *
  • {@link org.apache.commons.math3.ml.clustering}
  • + *
+ *

+ * + *

+ * Clustering algorithms. + *

*/ package org.apache.commons.math3.stat.clustering;