Changeset 2936 for branches/0.10-stable/test/rng-mt.cc

Timestamp:

Jan 1, 2013, 7:58:24 AM (10 years ago)

Author:

Peter

Message:

avoid repeating code

File:

• branches/0.10-stable/test/rng-mt.cc (modified) (4 diffs)

branches/0.10-stable/test/rng-mt.cc

@@ -104 +104 @@
 
 
+std::vector<int> rnd_vec(void)
+{
+  std::vector<int> x(10);
+  Visitor visitor1(x);
+  boost::thread_group threads;
+  threads.create_thread(visitor1);
+  threads.join_all();
+  return x;
+}
+
+
 void test2(test::Suite& suite)
 {
@@ -109 +120 @@
   // test that we get same number with same seed
   RNG::instance()->seed(0);
-  std::vector<int> x(10);
-  Visitor visitor1(x);
-  boost::thread_group threads;
-  threads.create_thread(visitor1);
-  threads.join_all();
-  // copy result from visitor1 to variable y
-  std::vector<int> y(x);
+  std::vector<int> y = rnd_vec();
   suite.out() << "y: ";
   std::copy(y.begin(), y.end(), std::ostream_iterator<int>(suite.out(), " "));
@@ -121 +126 @@
 
   RNG::instance()->seed(0);
-  boost::thread_group threads2;
-  threads2.create_thread(visitor1);
-  threads2.join_all();
+  std::vector<int> x = rnd_vec();
   suite.out() << "x: ";
   std::copy(x.begin(), x.end(), std::ostream_iterator<int>(suite.out(), " "));
@@ -150 +153 @@
   suite.out() << std::endl;
 
-  std::vector<int> y(x);
-  Visitor visitor1(y);
-  boost::thread_group threads;
-  threads.create_thread(visitor1);
-  threads.join_all();
-
+  std::vector<int> y = rnd_vec();
   suite.out() << "y: ";
   std::copy(y.begin(), y.end(), std::ostream_iterator<int>(suite.out(), " "));