[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard rand.c

2008-10-01 Thread Scott MacVicar 
scottmacWed Oct  1 11:04:27 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   rand.c 
  Log:
  MFH: Fix bug #46209 - Remove license condition that is no longer required.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/rand.c?r1=1.70.2.1.2.3&r2=1.70.2.1.2.4&diff_format=u
Index: php-src/ext/standard/rand.c
diff -u php-src/ext/standard/rand.c:1.70.2.1.2.3 
php-src/ext/standard/rand.c:1.70.2.1.2.4
--- php-src/ext/standard/rand.c:1.70.2.1.2.3Mon Dec 31 07:20:13 2007
+++ php-src/ext/standard/rand.c Wed Oct  1 11:04:27 2008
@@ -23,7 +23,7 @@
| Shawn Cokus <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: rand.c,v 1.70.2.1.2.3 2007/12/31 07:20:13 sebastian Exp $ */
+/* $Id: rand.c,v 1.70.2.1.2.4 2008/10/01 11:04:27 scottmac Exp $ */
 
 #include 
 
@@ -138,14 +138,6 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   The original code included the following notice:
-
-   When you use this, send an email to: [EMAIL PROTECTED]
-with an appropriate reference to your work.
-
-   It would be nice to CC: [EMAIL PROTECTED] and [EMAIL PROTECTED]
-   when you write.
 */
 
 #define N MT_N /* length of state vector */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard rand.c

2006-11-10 Thread Dmitry Stogov 
dmitry  Fri Nov 10 10:10:39 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   rand.c 
  Log:
  Faster and better licensed implementation
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/rand.c?r1=1.70.2.1&r2=1.70.2.1.2.1&diff_format=u
Index: php-src/ext/standard/rand.c
diff -u php-src/ext/standard/rand.c:1.70.2.1 
php-src/ext/standard/rand.c:1.70.2.1.2.1
--- php-src/ext/standard/rand.c:1.70.2.1Sun Jan  1 12:50:15 2006
+++ php-src/ext/standard/rand.c Fri Nov 10 10:10:38 2006
@@ -17,10 +17,13 @@
|  Pedro Melo <[EMAIL PROTECTED]>   
  |
|  Sterling Hughes <[EMAIL PROTECTED]>  |
|  |
-   | Based on code from: Shawn Cokus <[EMAIL PROTECTED]>  |
+   | Based on code from: Richard J. Wagner <[EMAIL PROTECTED]> |
+   | Makoto Matsumoto <[EMAIL PROTECTED]>  |
+   | Takuji Nishimura |
+   | Shawn Cokus <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: rand.c,v 1.70.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: rand.c,v 1.70.2.1.2.1 2006/11/10 10:10:38 dmitry Exp $ */
 
 #include 
 
@@ -85,152 +88,127 @@
 /* MT RAND FUNCTIONS */
 
 /*
-   This is the ``Mersenne Twister'' random number generator MT19937, which
-   generates pseudorandom integers uniformly distributed in 0..(2^32 - 1)
-   starting from any odd seed in 0..(2^32 - 1).  This version is a recode
-   by Shawn Cokus ([EMAIL PROTECTED]) on March 8, 1998 of a version by
-   Takuji Nishimura (who had suggestions from Topher Cooper and Marc Rieffel in
-   July-August 1997).
-  
-   Effectiveness of the recoding (on Goedel2.math.washington.edu, a DEC Alpha
-   running OSF/1) using GCC -O3 as a compiler: before recoding: 51.6 sec. to
-   generate 300 million random numbers; after recoding: 24.0 sec. for the same
-   (i.e., 46.5% of original time), so speed is now about 12.5 million random
-   number generations per second on this machine.
-  
-   According to the URL 
-   (and paraphrasing a bit in places), the Mersenne Twister is ``designed
-   with consideration of the flaws of various existing generators,'' has
-   a period of 2^19937 - 1, gives a sequence that is 623-dimensionally
-   equidistributed, and ``has passed many stringent tests, including the
-   die-hard test of G. Marsaglia and the load test of P. Hellekalek and
-   S. Wegenkittl.''  It is efficient in memory usage (typically using 2506
-   to 5012 bytes of static data, depending on data type sizes, and the code
-   is quite short as well).  It generates random numbers in batches of 624
-   at a time, so the caching and pipelining of modern systems is exploited.
-   It is also divide- and mod-free.
-  
-   This library is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published by
-   the Free Software Foundation (either version 2 of the License or, at your
-   option, any later version).  This library is distributed in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY, without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-   the GNU Library General Public License for more details.  You should have
-   received a copy of the GNU Library General Public License along with this
-   library; if not, write to the Free Software Foundation, Inc., 59 Temple
-   Place, Suite 330, Boston, MA 02111-1307, USA.
-  
-   The code as Shawn received it included the following notice:
-  
- Copyright (C) 1997 Makoto Matsumoto and Takuji Nishimura.  When
- you use this, send an e-mail to <[EMAIL PROTECTED]> with
- an appropriate reference to your work.
-  
-   It would be nice to CC: <[EMAIL PROTECTED]> when you write.
-  
-
-  
-   php_uint32 must be an unsigned integer type capable of holding at least 32
-   bits; exactly 32 should be fastest, but 64 is better on an Alpha with
-   GCC at -O3 optimization so try your options and see what's best for you
+   The following php_mt_...() functions are based on a C++ class MTRand by
+   Richard J. Wagner. For more information see the web page at
+   http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
+
+   Mersenne Twister random number generator -- a C++ class MTRand
+   Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
+   Richard J. Wagner  v1.0  15 May 2003  [EMAIL PROTECTED]
+
+   The Mersenne Twister is an algorithm for generating random numbers.  It
+   was designed with consideration of the flaws in various other 
generators.
+   The period, 2^19937-1, and the order of equidistribution, 623 
dimensions,
+   are