commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang/math JVMRandom.java RandomUtils.java
Date Wed, 07 May 2003 15:09:20 GMT
bayard      2003/05/07 08:09:19

  Modified:    lang/src/java/org/apache/commons/lang/math RandomUtils.java
  Added:       lang/src/java/org/apache/commons/lang/math JVMRandom.java
  Log:
  RandomUtils functionality moved to JVMRandom. RandomUtils then becomes a proper XxxUtils
class.
  
  Revision  Changes    Path
  1.2       +30 -12    jakarta-commons/lang/src/java/org/apache/commons/lang/math/RandomUtils.java
  
  Index: RandomUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/math/RandomUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RandomUtils.java	2 Apr 2003 16:28:15 -0000	1.1
  +++ RandomUtils.java	7 May 2003 15:09:19 -0000	1.2
  @@ -53,6 +53,8 @@
    */
   package org.apache.commons.lang.math;
   
  +import java.util.Random;
  +
   /**
    * <p><code>RandomUtils</code> is a wrapper that supports all possible

    * Random methods via the java.lang.Math.random() method and its system-wide 
  @@ -64,12 +66,11 @@
    */
   public final class RandomUtils {
   
  -    // Note: This class statically implements the Random class
  -    //       except for public synchronized void setSeed(long);
  -    //       and public synchronized double nextGaussian();
  +    public static Random JVM_RANDOM = new JVMRandom();
   
  -// should be possible?
  +// should be possible for JVM_RANDOM?
   //    public static void nextBytes(byte[]) {
  +//    public synchronized double nextGaussian();
   //    }
   
       /**
  @@ -79,7 +80,10 @@
        * @return the random int
        */
       public static int nextInt() {
  -        return nextInt(Integer.MAX_VALUE);
  +        return nextInt(JVM_RANDOM);
  +    }
  +    public static int nextInt(Random rnd) {
  +        return rnd.nextInt();
       }
       /**
        * Returns a pseudorandom, uniformly distributed int value between 0 
  @@ -91,8 +95,11 @@
        * @return the random int
        */
       public static int nextInt(int n) {
  +        return nextInt(JVM_RANDOM, n);
  +    }
  +    public static int nextInt(Random rnd, int n) {
           // check this cannot return 'n'
  -        return (int)Math.random() * n;
  +        return rnd.nextInt(n);
       }
       /**
        * Returns the next pseudorandom, uniformly distributed long value 
  @@ -101,8 +108,10 @@
        * @return the random long
        */
       public static long nextLong() {
  -        // possible loss of precision?
  -        return (long)Math.random() * Long.MAX_VALUE;
  +        return nextLong(JVM_RANDOM);
  +    }
  +    public static long nextLong(Random rnd) {
  +        return rnd.nextLong();
       }
       /**
        * Returns the next pseudorandom, uniformly distributed boolean value 
  @@ -111,7 +120,10 @@
        * @return the random boolean
        */
       public static boolean nextBoolean() {
  -        return (Math.random() > 0.5);
  +        return nextBoolean(JVM_RANDOM);
  +    }
  +    public static boolean nextBoolean(Random rnd) {
  +        return rnd.nextBoolean();
       }
       /**
        * Returns the next pseudorandom, uniformly distributed float value 
  @@ -120,7 +132,10 @@
        * @return the random float
        */
       public static float nextFloat() {
  -        return (float)Math.random();
  +        return nextFloat(JVM_RANDOM);
  +    }
  +    public static float nextFloat(Random rnd) {
  +        return rnd.nextFloat();
       }
       /**
        * Synonymous to the Math.random() call.
  @@ -128,7 +143,10 @@
        * @return the random double
        */
       public static double nextDouble() {
  -        return Math.random();
  +        return nextDouble(JVM_RANDOM);
  +    }
  +    public static double nextDouble(Random rnd) {
  +        return rnd.nextDouble();
       }
       
   }
  
  
  
  1.1                  jakarta-commons/lang/src/java/org/apache/commons/lang/math/JVMRandom.java
  
  Index: JVMRandom.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF 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.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  package org.apache.commons.lang.math;
  
  import java.util.Random;
  
  /**
   * <p><code>JVMRandom</code> is a wrapper that supports all possible 
   * Random methods via the java.lang.Math.random() method and its system-wide 
   * Random object.
   * 
   * @author Henri Yandell
   * @since 2.0
   * @version $Id: JVMRandom.java,v 1.1 2003/05/07 15:09:19 bayard Exp $
   */
  public final class JVMRandom extends Random {
  
      public synchronized void setSeed(long seed) {
          throw new UnsupportedOperationException();
      }
  
      public synchronized double nextGaussian() {
          throw new UnsupportedOperationException();
      }
  
      public void nextBytes(byte[] byteArray) {
          throw new UnsupportedOperationException();
      }
  
      /**
       * Returns the next pseudorandom, uniformly distributed int value 
       * from the Math.random() sequence. 
       *
       * @return the random int
       */
      public int nextInt() {
          return nextInt(Integer.MAX_VALUE);
      }
      /**
       * Returns a pseudorandom, uniformly distributed int value between 0 
       * (inclusive) and the specified value (exclusive), from the 
       * Math.random() sequence. 
       *
       * @param n  the specified exclusive max-value
       *
       * @return the random int
       */
      public int nextInt(int n) {
          // check this cannot return 'n'
          return (int)Math.random() * n;
      }
      /**
       * Returns the next pseudorandom, uniformly distributed long value 
       * from the Math.random() sequence.
       *
       * @return the random long
       */
      public long nextLong() {
          // possible loss of precision?
          return (long)Math.random() * Long.MAX_VALUE;
      }
      /**
       * Returns the next pseudorandom, uniformly distributed boolean value 
       * from the Math.random() sequence.
       *
       * @return the random boolean
       */
      public boolean nextBoolean() {
          return (Math.random() > 0.5);
      }
      /**
       * Returns the next pseudorandom, uniformly distributed float value 
       * between 0.0 and 1.0 from the Math.random() sequence.
       *
       * @return the random float
       */
      public float nextFloat() {
          return (float)Math.random();
      }
      /**
       * Synonymous to the Math.random() call.
       *
       * @return the random double
       */
      public double nextDouble() {
          return Math.random();
      }
      
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message