random_shuffle.h: (sequential_random_shuffle) Copy data back.

2008-07-09  Johannes Singler  <singler@ira.uka.de>

         * include/parallel/random_shuffle.h:
         (sequential_random_shuffle) Copy data back.
         * testsuite/25_algorithms/random_shuffle/1.cc:
         New. Generic random_shuffle functionality test.

From-SVN: r137658

diff --git a/libstdc++-v3/include/parallel/random_shuffle.h b/libstdc++-v3/include/parallel/random_shuffle.h
index 1f7cc10742d3fb2fdbbaecb7eb91f09b4a09c874..e5bc5395c0bb5374acf50e5b8ad0b5eeb90f28e3 100644 (file)
--- a/libstdc++-v3/include/parallel/random_shuffle.h
+++ b/libstdc++-v3/include/parallel/random_shuffle.h
@@ -491,6 +491,9 @@ template<typename RandomAccessIterator, typename RandomNumberGenerator>
                                       rng);
           }
 
+        // Copy elements back.
+        std::copy(target, target + n, begin);
+
         delete[] dist0;
         delete[] dist1;
         delete[] oracles;

diff --git a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc
new file mode 100644 (file)
index 0000000..4c5836b
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc
@@ -0,0 +1,75 @@
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 25.2.11 random_shuffle()
+
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+bool test __attribute__((unused)) = true;
+
+const int N = 200000;
+int A[N], s1[N];
+
+#if _GLIBCXX_PARALLEL
+#define TAG , __gnu_parallel::sequential_tag()
+#else
+#define TAG
+#endif
+
+void fill_ascending()
+{
+  for (int i = 0; i < N; ++i)
+    A[i] = i;
+}
+
+void
+test01()
+{
+  fill_ascending();
+#if _GLIBCXX_PARALLEL
+  for (int num_threads = 1; num_threads <= 2; ++num_threads)
+  {
+    omp_set_num_threads(num_threads);
+#endif
+    std::copy(A, A + N, s1);
+    VERIFY(std::equal(s1, s1 + N, A TAG));
+
+    std::random_shuffle(s1, s1 + N);
+    // the chance that random_shuffle leaves the order as is by coincidence
+    // is negligible, so we expect it to be permuted
+    VERIFY(!std::equal(s1, s1 + N, A TAG));
+
+    std::sort(s1, s1 + N TAG);
+    VERIFY(std::equal(s1, s1 + N, A TAG));
+#if _GLIBCXX_PARALLEL
+  }
+#endif
+}
+
+int
+main()
+{
+#if _GLIBCXX_PARALLEL
+  __gnu_parallel::_Settings gpms = __gnu_parallel::_Settings::get();
+  gpms.algorithm_strategy = __gnu_parallel::force_parallel;
+  __gnu_parallel::_Settings::set(gpms);
+#endif
+  test01();
+  return 0;
+}