From f09868e77a049cdf05eacd1d5fcfdddda882afef Mon Sep 17 00:00:00 2001 From: Jessica James Date: Fri, 13 Jan 2017 13:49:07 -0500 Subject: [PATCH] Reordered some functions for cleanliness and to preserve my sanity --- Jupiter/Algorithm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Jupiter/Algorithm.h b/Jupiter/Algorithm.h index 54b25f1..0036f61 100644 --- a/Jupiter/Algorithm.h +++ b/Jupiter/Algorithm.h @@ -29,38 +29,38 @@ namespace Jupiter namespace Algorithm { /** - * @brief Sorts an array of data in-place using merge sort + * @brief Sorts an array of data in-place using merge sort across multiple threads * * @param in_data Data to sort * @param in_data_length Length of the array of data to sort */ - template void merge_sort_serial(T *in_data, size_t in_data_length); + template void merge_sort(T *in_data, size_t in_data_length); /** * @brief Sorts an array of data in-place using merge sort across multiple threads * * @param in_data Data to sort * @param in_data_length Length of the array of data to sort - * @param in_max_threads Maximum number of threads to use - * @param in_use_max_threads True to force the number of threads to in_max_threads */ - template void merge_sort_parallel(T *in_data, size_t in_data_length, unsigned int in_max_threads, bool in_force_max_threads = false); + template void merge_sort_parallel(T *in_data, size_t in_data_length); /** * @brief Sorts an array of data in-place using merge sort across multiple threads * * @param in_data Data to sort * @param in_data_length Length of the array of data to sort + * @param in_max_threads Maximum number of threads to use + * @param in_use_max_threads True to force the number of threads to in_max_threads */ - template void merge_sort_parallel(T *in_data, size_t in_data_length); + template void merge_sort_parallel(T *in_data, size_t in_data_length, unsigned int in_max_threads, bool in_force_max_threads = false); /** - * @brief Sorts an array of data in-place using merge sort across multiple threads + * @brief Sorts an array of data in-place using merge sort * * @param in_data Data to sort * @param in_data_length Length of the array of data to sort */ - template void merge_sort(T *in_data, size_t in_data_length); + template void merge_sort_serial(T *in_data, size_t in_data_length); /** Internal helper templates */ namespace Internal