Commit a3e6b31a by Johannes Singler Committed by Johannes Singler

for_each.h: Fixed comment/doxygen markup typos.

2007-09-17  Johannes Singler  <singler@ira.uka.de>

        * include/parallel/for_each.h: Fixed comment/doxygen markup typos.
        * include/parallel/base.h: Same.
        * include/parallel/numeric: Same.
        * include/parallel/quicksort.h: Same.
        * include/parallel/compiletime_settings.h: Same.
        * include/parallel/random_shuffle.h: Same.
        * include/parallel/balanced_quicksort.h: Same.
        * include/parallel/tree.h: Same.
        * include/parallel/settings.h: Same.
        * include/parallel/search.h: Same.
        * include/parallel/partition.h: Same.
        * include/parallel/partial_sum.h: Same.

From-SVN: r128545
parent d483feaa
2007-09-17 Johannes Singler <singler@ira.uka.de>
* include/parallel/for_each.h: Fixed comment/doxygen markup typos.
* include/parallel/base.h: Same.
* include/parallel/numeric: Same.
* include/parallel/quicksort.h: Same.
* include/parallel/compiletime_settings.h: Same.
* include/parallel/random_shuffle.h: Same.
* include/parallel/balanced_quicksort.h: Same.
* include/parallel/tree.h: Same.
* include/parallel/settings.h: Same.
* include/parallel/search.h: Same.
* include/parallel/partition.h: Same.
* include/parallel/partial_sum.h: Same.
2007-09-17 Paolo Carlini <pcarlini@suse.de> 2007-09-17 Paolo Carlini <pcarlini@suse.de>
* include/tr1_impl/type_traitsfwd.h (aligned_storage): Remove * include/tr1_impl/type_traitsfwd.h (aligned_storage): Remove
......
...@@ -277,7 +277,7 @@ namespace __gnu_parallel ...@@ -277,7 +277,7 @@ namespace __gnu_parallel
|| (end - split_pos1) < (n >> 7)) || (end - split_pos1) < (n >> 7))
{ {
// Very unequal split, one part smaller than one 128th // Very unequal split, one part smaller than one 128th
// elements not stricly larger than the pivot. // elements not strictly larger than the pivot.
__gnu_parallel::unary_negate<__gnu_parallel::binder1st<Comparator, value_type, value_type, bool>, value_type> pred(__gnu_parallel::binder1st<Comparator, value_type, value_type, bool>(comp, *pivot_pos)); __gnu_parallel::unary_negate<__gnu_parallel::binder1st<Comparator, value_type, value_type, bool>, value_type> pred(__gnu_parallel::binder1st<Comparator, value_type, value_type, bool>(comp, *pivot_pos));
// Find other end of pivot-equal range. // Find other end of pivot-equal range.
......
...@@ -49,7 +49,7 @@ namespace __gnu_parallel ...@@ -49,7 +49,7 @@ namespace __gnu_parallel
// XXX remove std::duplicates from here if possible, // XXX remove std::duplicates from here if possible,
// XXX but keep minimal dependencies. // XXX but keep minimal dependencies.
/** @brief Calculates the rounded-down logrithm of @c n for base 2. /** @brief Calculates the rounded-down logarithm of @c n for base 2.
* @param n Argument. * @param n Argument.
* @return Returns 0 for argument 0. * @return Returns 0 for argument 0.
*/ */
...@@ -107,7 +107,6 @@ namespace __gnu_parallel ...@@ -107,7 +107,6 @@ namespace __gnu_parallel
bool operator()(const T1& a, const T2& b) bool operator()(const T1& a, const T2& b)
{ {
// FIXME: wrong in general (T1 != T2)
return !comp(a, b) && !comp(b, a); return !comp(a, b) && !comp(b, a);
} }
}; };
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
#define _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB 0 #define _GLIBCXX_RANDOM_SHUFFLE_CONSIDER_TLB 0
/** @brief First copy the data, sort it locally, and merge it back /** @brief First copy the data, sort it locally, and merge it back
* (0); or copy it back after everyting is done (1). * (0); or copy it back after everything is done (1).
* *
* Recommendation: 0 */ * Recommendation: 0 */
#define _GLIBCXX_MULTIWAY_MERGESORT_COPY_LAST 0 #define _GLIBCXX_MULTIWAY_MERGESORT_COPY_LAST 0
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
// Public License. // Public License.
/** @file parallel/for_each.h /** @file parallel/for_each.h
* @brief Main interface for embarassingly parallel functions. * @brief Main interface for embarrassingly parallel functions.
* *
* The explicit implementation are in other header files, like * The explicit implementation are in other header files, like
* workstealing.h, par_loop.h, omp_loop.h, and omp_loop_static.h. * workstealing.h, par_loop.h, omp_loop.h, and omp_loop_static.h.
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/** /**
* @file parallel/numeric * @file parallel/numeric
* *
* @brief Parallel STL fucntion calls corresponding to stl_numeric.h. * @brief Parallel STL function calls corresponding to stl_numeric.h.
* The functions defined here mainly do case switches and * The functions defined here mainly do case switches and
* call the actual parallelized versions in other files. * call the actual parallelized versions in other files.
* Inlining policy: Functions that basically only contain one function call, * Inlining policy: Functions that basically only contain one function call,
......
...@@ -75,7 +75,7 @@ namespace __gnu_parallel ...@@ -75,7 +75,7 @@ namespace __gnu_parallel
return result; return result;
} }
/** @brief Parallel partial sum implmenetation, two-phase approach, /** @brief Parallel partial sum implementation, two-phase approach,
no recursion. no recursion.
* @param begin Begin iterator of input sequence. * @param begin Begin iterator of input sequence.
* @param end End iterator of input sequence. * @param end End iterator of input sequence.
......
...@@ -102,7 +102,7 @@ namespace __gnu_parallel ...@@ -102,7 +102,7 @@ namespace __gnu_parallel
difference_type thread_left, thread_left_border, thread_right, thread_right_border; difference_type thread_left, thread_left_border, thread_right, thread_right_border;
thread_left = left + 1; thread_left = left + 1;
// Just to satify the condition below. // Just to satisfy the condition below.
thread_left_border = thread_left - 1; thread_left_border = thread_left - 1;
thread_right = n - 1; thread_right = n - 1;
thread_right_border = thread_right + 1; thread_right_border = thread_right + 1;
......
...@@ -48,7 +48,7 @@ namespace __gnu_parallel ...@@ -48,7 +48,7 @@ namespace __gnu_parallel
* @param end End iterator of subsequence. * @param end End iterator of subsequence.
* @param comp Comparator. * @param comp Comparator.
* @param pivot_rank Desired rank of the pivot. * @param pivot_rank Desired rank of the pivot.
* @param num_samples Chosse pivot from that many samples. * @param num_samples Choose pivot from that many samples.
* @param num_threads Number of threads that are allowed to work on * @param num_threads Number of threads that are allowed to work on
* this part. * this part.
*/ */
......
...@@ -131,7 +131,7 @@ namespace __gnu_parallel ...@@ -131,7 +131,7 @@ namespace __gnu_parallel
} }
/** @brief Random shuffle code executed by each thread. /** @brief Random shuffle code executed by each thread.
* @param pus Arary of thread-local data records. */ * @param pus Array of thread-local data records. */
template<typename RandomAccessIterator, typename RandomNumberGenerator> template<typename RandomAccessIterator, typename RandomNumberGenerator>
inline void parallel_random_shuffle_drs_pu(DRSSorterPU<RandomAccessIterator, RandomNumberGenerator>* pus) inline void parallel_random_shuffle_drs_pu(DRSSorterPU<RandomAccessIterator, RandomNumberGenerator>* pus)
{ {
......
...@@ -100,7 +100,7 @@ namespace __gnu_parallel ...@@ -100,7 +100,7 @@ namespace __gnu_parallel
// Last point to start search. // Last point to start search.
difference_type input_length = (end1 - begin1) - pattern_length; difference_type input_length = (end1 - begin1) - pattern_length;
// Where is first occurence of pattern? defaults to end. // Where is first occurrence of pattern? defaults to end.
difference_type res = (end1 - begin1); difference_type res = (end1 - begin1);
// Pattern too long. // Pattern too long.
...@@ -128,7 +128,7 @@ namespace __gnu_parallel ...@@ -128,7 +128,7 @@ namespace __gnu_parallel
{ {
// Get new value of res. // Get new value of res.
#pragma omp flush(res) #pragma omp flush(res)
// No chance for this thread to find first occurence. // No chance for this thread to find first occurrence.
if (res < start) if (res < start)
break; break;
while (pred(begin1[start + pos_in_pattern], begin2[pos_in_pattern])) while (pred(begin1[start + pos_in_pattern], begin2[pos_in_pattern]))
......
...@@ -152,7 +152,7 @@ namespace ...@@ -152,7 +152,7 @@ namespace
static volatile bool force_sequential; static volatile bool force_sequential;
/** @brief Force all algorithms to be executed in parallel. /** @brief Force all algorithms to be executed in parallel.
* This setting can be overriden by __gnu_parallel::sequential_tag * This setting can be overridden by __gnu_parallel::sequential_tag
* (compile-time), and force_sequential (run-time). */ * (compile-time), and force_sequential (run-time). */
static volatile bool force_parallel; static volatile bool force_parallel;
...@@ -171,7 +171,7 @@ namespace ...@@ -171,7 +171,7 @@ namespace
(quicksort). */ (quicksort). */
static volatile unsigned int sort_qs_num_samples_preset; static volatile unsigned int sort_qs_num_samples_preset;
/** @brief Maximal subsequence length to swtich to unbalanced /** @brief Maximal subsequence length to switch to unbalanced
* base case. Applies to std::sort with dynamically * base case. Applies to std::sort with dynamically
* load-balanced quicksort. */ * load-balanced quicksort. */
static volatile sequence_index_t sort_qsb_base_case_maximal_n; static volatile sequence_index_t sort_qsb_base_case_maximal_n;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment