Change old PRG to be SkLCGRandom; change new one to SkRandom

include/utils/SkRandom.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkRandom_DEFINED
 #define SkRandom_DEFINED
 
 #include "Sk64.h"
 #include "SkScalar.h"
 
-/** \class SkRandom
+/** \class SkLCGRandom
 
     Utility class that implements pseudo random 32bit numbers using a fast
     linear equation. Unlike rand(), this class holds its own seed (initially
     set to 0), so that multiple instances can be used with no side-effects.
 */
-class SkRandom {
+class SkLCGRandom {
 public:
-    SkRandom() : fSeed(0) {}
-    SkRandom(uint32_t seed) : fSeed(seed) {}
+    SkLCGRandom() : fSeed(0) {}
+    SkLCGRandom(uint32_t seed) : fSeed(seed) {}
 
     /** Return the next pseudo random number as an unsigned 32bit value.
     */
     uint32_t nextU() { uint32_t r = fSeed * kMul + kAdd; fSeed = r; return r; }
 
     /** Return the next pseudo random number as a signed 32bit value.
     */
     int32_t nextS() { return (int32_t)this->nextU(); }
 
     /** Return the next pseudo random number as an unsigned 16bit value.
@@ skipping 108 matching lines @@
 
 private:
     //  See "Numerical Recipes in C", 1992 page 284 for these constants
     enum {
         kMul = 1664525,
         kAdd = 1013904223
     };
     uint32_t fSeed;
 };
 
-/** \class SkMWCRandom
+/** \class SkRandom
 
  Utility class that implements pseudo random 32bit numbers using Marsaglia's
  multiply-with-carry "mother of all" algorithm. Unlike rand(), this class holds
  its own state, so that multiple instances can be used with no side-effects.
 
  Has a large period and all bits are well-randomized.
  */
-class SkMWCRandom {
+class SkRandom {
 public:
-    SkMWCRandom() { init(0); }
-    SkMWCRandom(uint32_t seed) { init(seed); }
-    SkMWCRandom(const SkMWCRandom& rand) : fK(rand.fK), fJ(rand.fJ) {}
+    SkRandom() { init(0); }
+    SkRandom(uint32_t seed) { init(seed); }
+    SkRandom(const SkRandom& rand) : fK(rand.fK), fJ(rand.fJ) {}
 
-    SkMWCRandom& operator=(const SkMWCRandom& rand) {
+    SkRandom& operator=(const SkRandom& rand) {
         fK = rand.fK;
         fJ = rand.fJ;
 
         return *this;
     }
 
     /** Return the next pseudo random number as an unsigned 32bit value.
      */
     uint32_t nextU() {
         fK = kKMul*(fK & 0xffff) + (fK >> 16);
@@ skipping 135 matching lines @@
     enum {
         kKMul = 30345,
         kJMul = 18000,
     };
 
     uint32_t fK;
     uint32_t fJ;
 };
 
 #endif