Browse Source

Reordered some functions for cleanliness and to preserve my sanity

release/0.19
Jessica James 8 years ago
parent
commit
f09868e77a
  1. 16
      Jupiter/Algorithm.h

16
Jupiter/Algorithm.h

@ -29,38 +29,38 @@ namespace Jupiter
namespace Algorithm 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 Data to sort
* @param in_data_length Length of the array of data to sort * @param in_data_length Length of the array of data to sort
*/ */
template<typename T> void merge_sort_serial(T *in_data, size_t in_data_length); template<typename T> 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 * @brief Sorts an array of data in-place using merge sort across multiple threads
* *
* @param in_data Data to sort * @param in_data Data to sort
* @param in_data_length Length of the array of 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<typename T> void merge_sort_parallel(T *in_data, size_t in_data_length, unsigned int in_max_threads, bool in_force_max_threads = false); template<typename T> 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 * @brief Sorts an array of data in-place using merge sort across multiple threads
* *
* @param in_data Data to sort * @param in_data Data to sort
* @param in_data_length Length of the array of 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<typename T> void merge_sort_parallel(T *in_data, size_t in_data_length); template<typename T> 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 Data to sort
* @param in_data_length Length of the array of data to sort * @param in_data_length Length of the array of data to sort
*/ */
template<typename T> void merge_sort(T *in_data, size_t in_data_length); template<typename T> void merge_sort_serial(T *in_data, size_t in_data_length);
/** Internal helper templates */ /** Internal helper templates */
namespace Internal namespace Internal

Loading…
Cancel
Save