summaryrefslogtreecommitdiff
path: root/sort/parallelmerge.go
diff options
context:
space:
mode:
authorPaul Buetow <pbuetow@mimecast.com>2020-08-08 17:32:23 +0100
committerPaul Buetow <pbuetow@mimecast.com>2020-08-08 17:32:23 +0100
commitdda16974366e91036b32d0eeea33b766c2439feb (patch)
treef76a3fd0a08e5daa18c65271db55a3f290882a59 /sort/parallelmerge.go
parent36573e16d9e8b511aec24a82797a5d13ceef6aa4 (diff)
fortune not found
Quick commit
Diffstat (limited to 'sort/parallelmerge.go')
-rw-r--r--sort/parallelmerge.go10
1 files changed, 2 insertions, 8 deletions
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
}