From: W. Trevor King <wking@drexel.edu>
Date: Sat, 6 Nov 2010 14:15:48 +0000 (-0700)
Subject: Fix Gumbel normalization in pysawsim.test.bell_rate.probability_distribution.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=35b4279e1aac6310687e5ff9fa2f6895ce7b49aa;p=sawsim.git

Fix Gumbel normalization in pysawsim.test.bell_rate.probability_distribution.
---

diff --git a/pysawsim/test/bell_rate.py b/pysawsim/test/bell_rate.py
index 83ca86d..a49da05 100644
--- a/pysawsim/test/bell_rate.py
+++ b/pysawsim/test/bell_rate.py
@@ -96,11 +96,20 @@ def probability_distribution(x, params):
     """Gumbel (minimum) probability distribution.
 
     .. math:: 1/\\rho exp((x-\\alpha)/\\rho - exp((x-\\alpha)/\\rho))
+
+    Integral
+
+    .. math:: -exp(-exp((x-\\alpha)/\\rho))
+
+    So integrated over the range x = [0,\\infty]
+
+    .. math:: -exp(-\\infty) - (-exp(-exp(-\\alpha/\\rho)))
+      = exp(-exp(-\\alpha/\\rho)))
     """
     p = params  # convenient alias
     p[1] = abs(p[1])  # cannot normalize negative rho.
     xs = (x - p[0]) / p[1]
-    return (1.0/p[1]) * exp(xs - exp(xs))
+    return (exp(exp(-p[0]/p[1]))/p[1]) * exp(xs - exp(xs))
 
 
 class GumbelModelFitter (HistogramModelFitter):
@@ -164,13 +173,13 @@ def bell_rate(sawsim_runner, num_domains=1, unfolding_rate=1,
 
     sim = sawsim_histogram(sawsim_runner, param_string, N=N,
                            bin_edges=theory.bin_edges)
-    
+
     e = GumbelModelFitter(sim)
     params = e.fit()
     sim_alpha = params[0]
     sim_rho = abs(params[1])
     for s,t,n in [(sim_alpha, alpha, 'alpha'), (sim_rho, rho, 'rho')]:
-        assert (s - t)/t < 0.1, 'simulation %s = %g != %g = %s' % (n,s,t,n)
+        assert (s - t)/t < 0.1, 'simulation %s = %g != %g = %s' % (n,s,t,n))
     return sim.residual(theory)