# # # patch "ChangeLog" # from [31b7b579b350491fbf380a43b1eb7a469d14433f] # to [eaa4693f757c25db80e183a75e2b3afec0cab22a] # # patch "diff_patch.cc" # from [1b235d6bac2c940f6790276db02b84dd5827b82e] # to [8aa66b18efb3414899dc18893b4f2417ef124558] # # patch "randomfile.hh" # from [c3603046d013d2d2c16edbb21969cdcb72fc1c7e] # to [ce70849e7fde36f69821216a73848cb1b68e11fe] # # patch "randomizer.cc" # from [d52b91acd41a39d4fd88904da51e9f651ad133fe] # to [b9d69ec8724714dd00a77f930a31d4b1bd2f84bc] # # patch "randomizer.hh" # from [a28dd5739fcc4a23680f460fa428e42654e21e77] # to [31dbc1df1eda65ea532e5740ae1bb397f5f9dcfe] # ============================================================ --- ChangeLog 31b7b579b350491fbf380a43b1eb7a469d14433f +++ ChangeLog eaa4693f757c25db80e183a75e2b3afec0cab22a @@ -1,5 +1,11 @@ 2006-07-04 Graydon Hoare + * randomizer.{cc,hh}: Remove seed function. + * randomfile.hh: Remove use of seed(). + * diff_patch.cc: Remove seeding arg from tester. + +2006-07-04 Graydon Hoare + * randomizer.{cc,hh}: New helpers for prngs. * Makefile.am (MOST_SOURCES): Add them. * charset.cc: Fix some missing initializers in unit tests. ============================================================ --- diff_patch.cc 1b235d6bac2c940f6790276db02b84dd5827b82e +++ diff_patch.cc 8aa66b18efb3414899dc18893b4f2417ef124558 @@ -1271,8 +1271,7 @@ { vector anc, d1, d2, m1, m2, gm; - file_randomizer::build_random_fork(anc, d1, d2, gm, - i * 1023, (10 + 2 * i)); + file_randomizer::build_random_fork(anc, d1, d2, gm, (10 + 2 * i)); BOOST_CHECK(merge3(anc, d1, d2, m1)); if (gm != m1) ============================================================ --- randomfile.hh c3603046d013d2d2c16edbb21969cdcb72fc1c7e +++ randomfile.hh ce70849e7fde36f69821216a73848cb1b68e11fe @@ -93,12 +93,10 @@ std::vector & left, std::vector & right, std::vector & merged, - int seed, int n_hunks = 10) { file_randomizer fr; - randomizer::seed(seed); // maybe prepend something to one side or the other if (randomizer::flip()) { @@ -114,7 +112,6 @@ for (int h = 0; h < n_hunks; ++h) { file_randomizer hr; - randomizer::seed(seed + h); hr.set_prefix(std::string("hunk ") + boost::lexical_cast(h) + " -- "); hr.initial_sequential_lines(10); hr.append_to(ancestor); ============================================================ --- randomizer.cc d52b91acd41a39d4fd88904da51e9f651ad133fe +++ randomizer.cc b9d69ec8724714dd00a77f930a31d4b1bd2f84bc @@ -26,13 +26,6 @@ return bernoulli(1.0 / static_cast(n)); } - void seed(size_t n) - { - if (rng) - delete rng; - rng = new boost::mt19937(n); - } - size_t uniform(size_t n) { return boost::random_number_generator(get_rng())(n); ============================================================ --- randomizer.hh a28dd5739fcc4a23680f460fa428e42654e21e77 +++ randomizer.hh 31dbc1df1eda65ea532e5740ae1bb397f5f9dcfe @@ -19,8 +19,6 @@ namespace randomizer { - void seed(size_t n); - // uniform process in [0,n] size_t uniform(size_t n);