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 CDEC41879F for ; Sun, 20 Sep 2015 19:06:46 +0000 (UTC) Received: (qmail 60524 invoked by uid 500); 20 Sep 2015 19:06:45 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 60129 invoked by uid 500); 20 Sep 2015 19:06:45 -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 59656 invoked by uid 99); 20 Sep 2015 19:06:44 -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; Sun, 20 Sep 2015 19:06:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 71794E016C; Sun, 20 Sep 2015 19:06:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oertl@apache.org To: commits@commons.apache.org Date: Sun, 20 Sep 2015 19:06:49 -0000 Message-Id: <202c756ae0f645b7b0a89ff4731e8a8b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/8] [math] optimization of probability, logProbability, and cumulativeProbability methods in GeometricDistribution by precalculation of log(1-p) and log(p) optimization of probability, logProbability, and cumulativeProbability methods in GeometricDistribution by precalculation of log(1-p) and log(p) Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/6c53783e Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/6c53783e Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/6c53783e Branch: refs/heads/MATH_3_X Commit: 6c53783ea0c0185d2da589037b1a2170aafc7e3d Parents: ecb5299 Author: Otmar Ertl Authored: Sun Sep 20 20:20:16 2015 +0200 Committer: Otmar Ertl Committed: Sun Sep 20 20:49:38 2015 +0200 ---------------------------------------------------------------------- .../math3/distribution/GeometricDistribution.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/6c53783e/src/main/java/org/apache/commons/math3/distribution/GeometricDistribution.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math3/distribution/GeometricDistribution.java b/src/main/java/org/apache/commons/math3/distribution/GeometricDistribution.java index 19797c5..20ff7bc 100644 --- a/src/main/java/org/apache/commons/math3/distribution/GeometricDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/GeometricDistribution.java @@ -35,6 +35,10 @@ public class GeometricDistribution extends AbstractIntegerDistribution { private static final long serialVersionUID = 20130507L; /** The probability of success. */ private final double probabilityOfSuccess; + /** {@code log(p)} where p is the probability of success. */ + private final double logProbabilityOfSuccess; + /** {@code log(1 - p)} where p is the probability of success. */ + private final double log1mProbabilityOfSuccess; /** * Create a geometric distribution with the given probability of success. @@ -68,6 +72,8 @@ public class GeometricDistribution extends AbstractIntegerDistribution { } probabilityOfSuccess = p; + logProbabilityOfSuccess = FastMath.log(p); + log1mProbabilityOfSuccess = FastMath.log1p(-p); } /** @@ -84,7 +90,7 @@ public class GeometricDistribution extends AbstractIntegerDistribution { if (x < 0) { return 0.0; } else { - return FastMath.pow(1 - probabilityOfSuccess, x) * probabilityOfSuccess; + return FastMath.exp(log1mProbabilityOfSuccess * x) * probabilityOfSuccess; } } @@ -94,7 +100,7 @@ public class GeometricDistribution extends AbstractIntegerDistribution { if (x < 0) { return Double.NEGATIVE_INFINITY; } else { - return x * FastMath.log1p(-probabilityOfSuccess) + FastMath.log(probabilityOfSuccess); + return x * log1mProbabilityOfSuccess + logProbabilityOfSuccess; } } @@ -103,7 +109,7 @@ public class GeometricDistribution extends AbstractIntegerDistribution { if (x < 0) { return 0.0; } else { - return 1.0 - FastMath.pow(1 - probabilityOfSuccess, x + 1); + return -FastMath.expm1(log1mProbabilityOfSuccess * (x + 1)); } }