diff options
author | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 22:30:46 +0000 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 22:30:46 +0000 |
commit | 0a055548ae9f9d5c639bb29ca32e0fd88de37c1d (patch) | |
tree | 3bd93fd4bb0ae6025a6fcfadeb7844669fea457c /elki/src/main/java/de/lmu/ifi/dbs/elki/algorithm/clustering/em/EM.java | |
parent | 38212b3127e90751fb39cda34250bc11be62b76c (diff) |
Import Upstream version 0.7.1
Diffstat (limited to 'elki/src/main/java/de/lmu/ifi/dbs/elki/algorithm/clustering/em/EM.java')
-rw-r--r-- | elki/src/main/java/de/lmu/ifi/dbs/elki/algorithm/clustering/em/EM.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/algorithm/clustering/em/EM.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/algorithm/clustering/em/EM.java index 208e8450..039c0174 100644 --- a/elki/src/main/java/de/lmu/ifi/dbs/elki/algorithm/clustering/em/EM.java +++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/algorithm/clustering/em/EM.java @@ -63,14 +63,16 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; * Clustering by expectation maximization (EM-Algorithm), also known as Gaussian * Mixture Modeling (GMM). * + * Reference: * <p> - * Reference: A. P. Dempster, N. M. Laird, D. B. Rubin:<br /> - * Maximum Likelihood from Incomplete Data via the EM algorithm.<br> + * A. P. Dempster, N. M. Laird, D. B. Rubin:<br /> + * Maximum Likelihood from Incomplete Data via the EM algorithm.<br /> * In Journal of the Royal Statistical Society, Series B, 39(1), 1977, pp. 1-31 * </p> * * @author Arthur Zimek * @author Erich Schubert + * @since 0.2 * * @apiviz.composedOf EMClusterModelFactory * @@ -83,7 +85,7 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter; title = "Maximum Likelihood from Incomplete Data via the EM algorithm", // booktitle = "Journal of the Royal Statistical Society, Series B, 39(1), 1977, pp. 1-31", // url = "http://www.jstor.org/stable/2984875") -@Alias({ "de.lmu.ifi.dbs.elki.algorithm.clustering.EM", "EM" }) +@Alias("de.lmu.ifi.dbs.elki.algorithm.clustering.EM") public class EM<V extends NumberVector, M extends MeanModel> extends AbstractAlgorithm<Clustering<M>> implements ClusteringAlgorithm<Clustering<M>> { /** * The logger for this class. @@ -392,7 +394,7 @@ public class EM<V extends NumberVector, M extends MeanModel> extends AbstractAlg initializer = initialP.instantiateClass(config); } - DoubleParameter deltaP = new DoubleParameter(DELTA_ID, 1e-5)// + DoubleParameter deltaP = new DoubleParameter(DELTA_ID, 1e-7)// .addConstraint(CommonConstraints.GREATER_EQUAL_ZERO_DOUBLE); if(config.grab(deltaP)) { delta = deltaP.getValue(); |