From dda16974366e91036b32d0eeea33b766c2439feb Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 8 Aug 2020 17:32:23 +0100 Subject: fortune not found Quick commit --- sort/parallelmerge.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sort/parallelmerge.go') diff --git a/sort/parallelmerge.go b/sort/parallelmerge.go index 87543f6..c379883 100644 --- a/sort/parallelmerge.go +++ b/sort/parallelmerge.go @@ -12,18 +12,13 @@ func ParallelMerge(a ds.ArrayList) ds.ArrayList { func parallelMerge(a, aux ds.ArrayList) { l := len(a) - if l <= 1 { - return - } - mi := l / 2 if l < 1000 { - mergeSort(a[0:mi], aux[0:mi]) - mergeSort(a[mi:], aux[mi:]) - merge(a, aux, 0, mi, l-1) + mergeSort(a, aux) return } + mi := l / 2 var wg sync.WaitGroup wg.Add(2) @@ -39,5 +34,4 @@ func parallelMerge(a, aux ds.ArrayList) { wg.Wait() merge(a, aux, 0, mi, l-1) - return } -- cgit v1.2.3