Changeset 5913 for lang/cplusplus

Timestamp:

01/31/08 01:45:27 (5 years ago)

Author:

mrkn

Message:

lang/cplusplus/boost-supplement/trunk/boost_supplement/random/zipf_distribution.hpp: Correct the return type of make_dist function, and modify buffer initialization and a for-loop condition.
lang/cplusplus/boost-supplement/trunk/boost_supplement/random/discrete_distribution.hpp: Includes <boost/assert.hpp>. Modifies operator() to correct its wrong algorithm.

Location:

lang/cplusplus/boost-supplement/trunk

Files:

• ChangeLog (modified) (1 diff)
• boost_supplement/random/discrete_distribution.hpp (modified) (2 diffs)
• boost_supplement/random/zipf_distribution.hpp (modified) (1 diff)

lang/cplusplus/boost-supplement/trunk/ChangeLog

@@ -1 +1 @@
 2008-01-31  Kenta Murata  <muraken@gmail.com>
+
+        * boost_supplement/random/zipf_distribution.hpp: Correct the
+        return type of make_dist function, and modify buffer
+        initialization and a for-loop condition.
+
+        * boost_supplement/random/discrete_distribution.hpp: Includes
+        <boost/assert.hpp>.  Modifies operator() to correct its wrong
+        algorithm.
 
         * boost_supplement/random/zipf_distribution.hpp

lang/cplusplus/boost-supplement/trunk/boost_supplement/random/discrete_distribution.hpp

@@ -13 +13 @@
 #define BOOST_SUPPLEMENT_DISCRETE_DISTRIBUTION_HPP 1
 
+#include <boost/assert.hpp>
 #include <boost/random/uniform_real.hpp>
 #include <boost/concept_check.hpp>
@@ -166 +167 @@
     {
       boost::uniform_real<input_type> ud;
-      input_type u = ud(eng);
+      input_type u = ud(eng)*num();
       result_type x = result_type(u);
       u -= x;
-      if (probabilities_[x] < u) return x;
+      if (u < probabilities_[x]) return x;
       return aliases_[x];
     }

lang/cplusplus/boost-supplement/trunk/boost_supplement/random/zipf_distribution.hpp

@@ -47 +47 @@
   dist_type dist_;
 
-  void make_dist(result_type num, input_type shift, input_type exp)
+  dist_type make_dist(result_type num, input_type shift, input_type exp)
     {
-      std::vector<input_type> buffer(num);
-      for (result_type k = 1; k <= num; ++k)
+      std::vector<input_type> buffer(num + 1, input_type(0));
+      for (result_type k = 1; k < num; ++k)
         buffer[k] = std::pow(k + shift, -exp);
       return dist_type(buffer.begin(), buffer.end());