Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2F4819624 for ; Thu, 21 Apr 2016 23:15:02 +0000 (UTC) Received: (qmail 83297 invoked by uid 500); 21 Apr 2016 23:14:51 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 82749 invoked by uid 500); 21 Apr 2016 23:14:51 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 79596 invoked by uid 99); 21 Apr 2016 23:14:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2016 23:14:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47871EAB56; Thu, 21 Apr 2016 23:14:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: erans@apache.org To: commits@commons.apache.org Date: Thu, 21 Apr 2016 23:15:30 -0000 Message-Id: <8e20430a7341483e92f4de949e175b05@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/53] [abbrv] [math] Example code updated. Example code updated. Usage of "JDKRandomAdaptor". Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/880b0481 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/880b0481 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/880b0481 Branch: refs/heads/develop Commit: 880b04814c564ea7a1bb8fe97c15b4735c67e8e9 Parents: 3411f29 Author: Gilles Authored: Mon Mar 28 03:26:52 2016 +0200 Committer: Gilles Committed: Mon Mar 28 03:26:52 2016 +0200 ---------------------------------------------------------------------- .../math4/userguide/ClusterAlgorithmComparison.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/880b0481/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java b/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java index b33c3cf..9dbd1c2 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java @@ -46,7 +46,7 @@ import org.apache.commons.math4.ml.clustering.DBSCANClusterer; import org.apache.commons.math4.ml.clustering.DoublePoint; import org.apache.commons.math4.ml.clustering.FuzzyKMeansClusterer; import org.apache.commons.math4.ml.clustering.KMeansPlusPlusClusterer; -import org.apache.commons.math4.random.RandomAdaptor; +import org.apache.commons.math4.random.JDKRandomAdaptor; import org.apache.commons.math4.random.SobolSequenceGenerator; import org.apache.commons.math4.rng.UniformRandomProvider; import org.apache.commons.math4.rng.RandomSource; @@ -84,8 +84,7 @@ public class ClusterAlgorithmComparison { } if (shuffle) { - // Collections.shuffle(points, new RandomAdaptor(rng)); // XXX TODO - Collections.shuffle(points); // XXX temporary workaround + Collections.shuffle(points, new JDKRandomAdaptor(rng)); } return points; @@ -115,8 +114,7 @@ public class ClusterAlgorithmComparison { } if (shuffle) { - // Collections.shuffle(points, new RandomAdaptor(rng)); // XXX TODO - Collections.shuffle(points); // XXX temporary workaround + Collections.shuffle(points, new JDKRandomAdaptor(rng)); } return points; @@ -153,8 +151,7 @@ public class ClusterAlgorithmComparison { } if (shuffle) { - // Collections.shuffle(points, new RandomAdaptor(rng)); // XXX TODO - Collections.shuffle(points); // XXX temporary workaround + Collections.shuffle(points, new JDKRandomAdaptor(rng)); } return points; @@ -206,8 +203,9 @@ public class ClusterAlgorithmComparison { setLayout(new GridBagLayout()); int nSamples = 1500; - - UniformRandomProvider rng = RandomSource.create(RandomSource.WELL_19937_C, 0); + + final long seed = RandomSource.createLong(); // Random seed. + UniformRandomProvider rng = RandomSource.create(RandomSource.WELL_19937_C, seed); List> datasets = new ArrayList>(); datasets.add(normalize(makeCircles(nSamples, true, 0.04, 0.5, rng), -1, 1, -1, 1));