[Numpy-svn] r4555 - in branches/numpy.scons: . numpy/f2py numpy/random/mtrand

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-12-06 20:17:51 -0600 (Thu, 06 Dec 2007)
New Revision: 4555

Modified:
   branches/numpy.scons/
   branches/numpy.scons/numpy/f2py/crackfortran.py
   branches/numpy.scons/numpy/random/mtrand/distributions.c
Log:
Merged revisions 4549-4554 via svnmerge from 
http://svn.scipy.org/svn/numpy/trunk

........
  r4553 | pearu | 2007-12-06 04:59:29 +0900 (Thu, 06 Dec 2007) | 1 line
  
  Fix typo.
........
  r4554 | rkern | 2007-12-06 14:18:54 +0900 (Thu, 06 Dec 2007) | 1 line
  
  Use a correct upper bound for the inversion search in binomial distributions.
........



Property changes on: branches/numpy.scons
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/distutils-revamp:1-2752 /branches/multicore:1-3687 /trunk:1-4548
   + /branches/distutils-revamp:1-2752 /branches/multicore:1-3687 /trunk:1-4554

Modified: branches/numpy.scons/numpy/f2py/crackfortran.py
===================================================================
--- branches/numpy.scons/numpy/f2py/crackfortran.py	2007-12-06 05:18:54 UTC (rev 4554)
+++ branches/numpy.scons/numpy/f2py/crackfortran.py	2007-12-07 02:17:51 UTC (rev 4555)
@@ -1876,7 +1876,7 @@
 
         if '=' in vars[name] and not isstring(vars[name]):
             for word in word_pattern.findall(vars[name]['=']):
-                if word not in words and word not in vars:
+                if word not in words and word in vars:
                     words.append(word)
         for word in words[:]:
             for w in deps.get(word,[]) \

Modified: branches/numpy.scons/numpy/random/mtrand/distributions.c
===================================================================
--- branches/numpy.scons/numpy/random/mtrand/distributions.c	2007-12-06 05:18:54 UTC (rev 4554)
+++ branches/numpy.scons/numpy/random/mtrand/distributions.c	2007-12-07 02:17:51 UTC (rev 4555)
@@ -389,7 +389,7 @@
         state->q = q = 1.0 - p;
         state->r = qn = exp(n * log(q));
         state->c = np = n*p;
-        state->m = bound = min(n, np + 10.0*sqrt(np));
+        state->m = bound = min(n, np + 10.0*sqrt(np*q + 1));
     } else
     {
         q = state->q;