Changed fast_uniform to uniform (as uniform was faster).

Author: Hoyt Koepke

src/core/logging/table_printer/table_printer.hpp

@@ -156,7 +156,7 @@ struct progress_time {
  *
  *        for(size_t i = 0; i < 50000; ++i) {
  *          table.print_progress_row(proc, proc, progress_time(), i);
- *          proc += random::fast_uniform<size_t>(0, 100);
+ *          proc += random::uniform<size_t>(0, 100);
  *          usleep(100);  // sleep for 200 microseconds
  *        }
  *

src/core/logging/table_printer/table_printer_examples.cpp

@@ -59,7 +59,7 @@ int main(int argc, char **argv) {
 
     for(size_t i = 0; i < 50000; ++i) {
       table.print_progress_row(proc, proc, progress_time(), i);
-      proc += random::fast_uniform<size_t>(0, 100);
+      proc += random::uniform<size_t>(0, 100);
       usleep(100);  // sleep for 200 microseconds
     }
 

src/core/random/alias.cpp

@@ -56,8 +56,8 @@ alias_sampler::alias_sampler(const std::vector<double>& p) {
 }
 
 size_t alias_sampler::sample() {
-  size_t k = random::fast_uniform<size_t>(0, K - 1);
-  if (q[k] > random::fast_uniform<double>(0, 1)) {
+  size_t k = random::uniform<size_t>(0, K - 1);
+  if (q[k] > random::uniform<double>(0, 1)) {
     return k;
   } else {
     return J[k];

src/core/random/random.hpp

@@ -144,7 +144,7 @@ namespace turi {
       /**
        * Generate a random number in the uniform real with range [min,
        * max) or [min, max] if the number type is discrete.
-       * [Double overload]
+       * [Float overload]
        */
       template <typename NumType>
       inline NumType uniform(const NumType min, const NumType max, 
@@ -155,14 +155,6 @@ namespace turi {
         return d(m_rng);
       } // end of uniform 
 
-      /**
-       * Generate a random number in the uniform real with range [min,
-       * max) or [min, max] if the number type is discrete.
-       */
-      template <typename NumType>
-      inline NumType fast_uniform(const NumType min, const NumType max) {
-        return uniform<NumType>(min, max);
-      }
 
       /**
        * Generate a random number in the uniform real with range [min,
@@ -385,11 +377,16 @@ namespace turi {
      * max) or [min, max] if the number type is discrete.
      */
     template<typename NumType>
-    inline NumType fast_uniform(const NumType min, const NumType max) {
+    inline NumType uniform(const NumType min, const NumType max) {
       if (min == max) return min;
+<<<<<<< Updated upstream
       return get_source().fast_uniform<NumType>(min, max);
     } // end of uniform
 
+=======
+      return get_source().uniform<NumType>(min, max);
+    } // end of uniform
+>>>>>>> Stashed changes
 
     /**
      * \ingroup random

src/core/storage/serialization/dir_archive.cpp

@@ -278,7 +278,7 @@ size_t get_next_random_number() {
     gen.nondet_seed();
     initialized = true;
   }
-  return gen.fast_uniform<size_t>(0, std::numeric_limits<size_t>::max());
+  return gen.uniform<size_t>(0, std::numeric_limits<size_t>::max());
 }
 
 

src/core/storage/sframe_data/sarray_file_format_v2.hpp

@@ -314,7 +314,7 @@ class sarray_format_reader_v2: public sarray_format_reader<T> {
    * (looping around).
    */
   void try_evict_something_from_cache() {
-    size_t b = turi::random::fast_uniform<size_t>(0, m_cache.size() - 1);
+    size_t b = turi::random::uniform<size_t>(0, m_cache.size() - 1);
     /*
      * if the current bit is not 1, try to find the next one bit
      * if there is no bit after that, loop around, reset and 0 and try the bit

src/core/util/testing_utils.cpp

@@ -56,7 +56,7 @@ std::string _get_unique_directory(const std::string& file, size_t line) {
 
   ss  << "t" << thread::thread_id() << "__";
 
-  ss << random::fast_uniform<size_t>(0, size_t(-1));
+  ss << random::uniform<size_t>(0, size_t(-1));
 
   return ss.str();
 }

src/core/util/testing_utils.hpp

@@ -48,7 +48,7 @@ void _save_and_load_object(T& dest, const U& src, std::string dir) {
 
   std::string arc_name = dir + "/test_archive";
 
-  uint64_t random_number = hash64(random::fast_uniform<size_t>(0,size_t(-1)));
+  uint64_t random_number = hash64(random::uniform<size_t>(0,size_t(-1)));
 
   // Save it
   dir_archive archive_write;

src/ml/ml_data/ml_data.cpp

@@ -746,7 +746,7 @@ ml_data ml_data::create_subsampled_copy(size_t n_rows, size_t random_seed) const
   for(size_t i = 0; i < n_rows; ++i) {
     size_t lb = (i > 0) ? (samples[i - 1] + 1) : 0;
     size_t ub = (i < n_rows - 1) ? (samples[i + 1] - 1) : data_size - 1;
-    samples[i] = random::fast_uniform<size_t>(lb, ub);
+    samples[i] = random::uniform<size_t>(lb, ub);
   }
 
   // Break them up into groups

src/ml/sketches/countmin.hpp

@@ -69,7 +69,7 @@ class countmin {
       gen.seed(seed);
       // Initialize hash functions and count matrix
       for (size_t j = 0; j < num_hash; ++j) {
-        seeds.push_back(gen.fast_uniform<size_t>(0, std::numeric_limits<size_t>::max()));
+        seeds.push_back(gen.uniform<size_t>(0, std::numeric_limits<size_t>::max()));
         counts.push_back(std::vector<size_t>(num_bins));
       }
    }