algorithms_cpp: block_size support in MergeSort

algorithms_cpp/include/embb/algorithms/internal/merge_sort-inl.h

@@ -170,9 +170,6 @@ void MergeSort(
   difference_type distance = last - first;
   difference_type distance = last - first;
   assert(distance >= 0);
   assert(distance >= 0);
 
 
-  assert(block_size == 0); // TODO(Georgios Christodoulou):
-                           // Take block size into account
-
   if (block_size == 0) {
   if (block_size == 0) {
     block_size= (static_cast<size_t>(distance) / node.GetCoreCount());
     block_size= (static_cast<size_t>(distance) / node.GetCoreCount());
     if (block_size == 0)
     if (block_size == 0)

algorithms_cpp/test/merge_sort_test.cc

@@ -64,7 +64,7 @@ void MergeSortTest::TestDataStructures() {
   MergeSortAllocate(array, array + kCountSize);
   MergeSortAllocate(array, array + kCountSize);
   MergeSortAllocate(vector.begin(), vector.end());
   MergeSortAllocate(vector.begin(), vector.end());
   MergeSortAllocate(array, array + kCountSize, std::less<int>(),
   MergeSortAllocate(array, array + kCountSize, std::less<int>(),
-    ExecutionPolicy(), 0);
+    ExecutionPolicy(), 2);
   MergeSortAllocate(deque.begin(), deque.end());
   MergeSortAllocate(deque.begin(), deque.end());
   for (size_t i = 0; i < kCountSize; i++) {
   for (size_t i = 0; i < kCountSize; i++) {
     PT_EXPECT_EQ(vector_copy[i], array[i]);
     PT_EXPECT_EQ(vector_copy[i], array[i]);