aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <gingerBill@users.noreply.github.com>2022-09-01 16:27:00 +0100
committerGitHub <noreply@github.com>2022-09-01 16:27:00 +0100
commite89f0de232372155ce16afdb7cfae971d717c005 (patch)
treee6c5689e44f6e56a7d7140e3ecb26f176e4db28d
parent4858e16a11aef6d55c9f021da9f3476201577df2 (diff)
parent15aaf7dfa009d9a048b4029932831628999638c2 (diff)
Merge pull request #1997 from thePHTest/sort_with_indices
add sort_with_indices family of procs
-rw-r--r--core/slice/sort.odin28
-rw-r--r--core/slice/sort_private.odin177
2 files changed, 205 insertions, 0 deletions
diff --git a/core/slice/sort.odin b/core/slice/sort.odin
index b6e455056..779ba37fd 100644
--- a/core/slice/sort.odin
+++ b/core/slice/sort.odin
@@ -38,6 +38,20 @@ sort :: proc(data: $T/[]$E) where ORD(E) {
}
}
+// sort sorts a slice
+// This sort is not guaranteed to be stable
+sort_with_indices :: proc(data: $T/[]$E, indices: []int) where ORD(E) {
+ when size_of(E) != 0 {
+ if n := len(data); n > 1 {
+ assert(len(data) == len(indices))
+ for _, idx in indices {
+ indices[idx] = idx
+ }
+ _quick_sort_general_with_indices(data, indices, 0, n, _max_depth(n), struct{}{}, .Ordered)
+ }
+ }
+}
+
// sort_by sorts a slice with a given procedure to test whether two values are ordered "i < j"
// This sort is not guaranteed to be stable
sort_by :: proc(data: $T/[]$E, less: proc(i, j: E) -> bool) {
@@ -48,6 +62,20 @@ sort_by :: proc(data: $T/[]$E, less: proc(i, j: E) -> bool) {
}
}
+// sort_by sorts a slice with a given procedure to test whether two values are ordered "i < j"
+// This sort is not guaranteed to be stable
+sort_by_with_indices :: proc(data: $T/[]$E, indices: []int, less: proc(i, j: E) -> bool) {
+ when size_of(E) != 0 {
+ if n := len(data); n > 1 {
+ assert(len(data) == len(indices))
+ for _, idx in indices {
+ indices[idx] = idx
+ }
+ _quick_sort_general_with_indices(data, indices, 0, n, _max_depth(n), less, .Less)
+ }
+ }
+}
+
sort_by_cmp :: proc(data: $T/[]$E, cmp: proc(i, j: E) -> Ordering) {
when size_of(E) != 0 {
if n := len(data); n > 1 {
diff --git a/core/slice/sort_private.odin b/core/slice/sort_private.odin
index d93d74bf9..86a6f5928 100644
--- a/core/slice/sort_private.odin
+++ b/core/slice/sort_private.odin
@@ -198,3 +198,180 @@ _stable_sort_general :: proc(data: $T/[]$E, call: $P, $KIND: Sort_Kind) where (O
}
}
}
+
+_quick_sort_general_with_indices :: proc(data: $T/[]$E, indices: []int, a, b, max_depth: int, call: $P, $KIND: Sort_Kind) where (ORD(E) && KIND == .Ordered) || (KIND != .Ordered) #no_bounds_check {
+ less :: #force_inline proc(a, b: E, call: P) -> bool {
+ when KIND == .Ordered {
+ return a < b
+ } else when KIND == .Less {
+ return call(a, b)
+ } else when KIND == .Cmp {
+ return call(a, b) == .Less
+ } else {
+ #panic("unhandled Sort_Kind")
+ }
+ }
+
+ insertion_sort :: proc(data: $T/[]$E, indices: []int, a, b: int, call: P) #no_bounds_check {
+ for i in a+1..<b {
+ for j := i; j > a && less(data[j], data[j-1], call); j -= 1 {
+ swap(data, j, j-1)
+ swap(indices, j, j-1)
+ }
+ }
+ }
+
+ heap_sort :: proc(data: $T/[]$E, indices: []int, a, b: int, call: P) #no_bounds_check {
+ sift_down :: proc(data: T, indices: []int, lo, hi, first: int, call: P) #no_bounds_check {
+ root := lo
+ for {
+ child := 2*root + 1
+ if child >= hi {
+ break
+ }
+ if child+1 < hi && less(data[first+child], data[first+child+1], call) {
+ child += 1
+ }
+ if !less(data[first+root], data[first+child], call) {
+ return
+ }
+ swap(data, first+root, first+child)
+ swap(indices, first+root, first+child)
+ root = child
+ }
+ }
+
+
+ first, lo, hi := a, 0, b-a
+
+ for i := (hi-1)/2; i >= 0; i -= 1 {
+ sift_down(data, indices, i, hi, first, call)
+ }
+
+ for i := hi-1; i >= 0; i -= 1 {
+ swap(data, first, first+i)
+ swap(indices, first, first+i)
+ sift_down(data, indices, lo, i, first, call)
+ }
+ }
+
+ median3 :: proc(data: T, indices: []int, m1, m0, m2: int, call: P) #no_bounds_check {
+ if less(data[m1], data[m0], call) {
+ swap(data, m1, m0)
+ swap(indices, m1, m0)
+ }
+ if less(data[m2], data[m1], call) {
+ swap(data, m2, m1)
+ swap(indices, m2, m1)
+ if less(data[m1], data[m0], call) {
+ swap(data, m1, m0)
+ swap(indices, m1, m0)
+ }
+ }
+ }
+
+ do_pivot :: proc(data: T, indices: []int, lo, hi: int, call: P) -> (midlo, midhi: int) #no_bounds_check {
+ m := int(uint(lo+hi)>>1)
+ if hi-lo > 40 {
+ s := (hi-lo)/8
+ median3(data, indices, lo, lo+s, lo+s*2, call)
+ median3(data, indices, m, m-s, m+s, call)
+ median3(data, indices, hi-1, hi-1-s, hi-1-s*2, call)
+ }
+ median3(data, indices, lo, m, hi-1, call)
+
+ pivot := lo
+ a, c := lo+1, hi-1
+
+
+ for ; a < c && less(data[a], data[pivot], call); a += 1 {
+ }
+ b := a
+
+ for {
+ for ; b < c && !less(data[pivot], data[b], call); b += 1 { // data[b] <= pivot
+ }
+ for ; b < c && less(data[pivot], data[c-1], call); c -=1 { // data[c-1] > pivot
+ }
+ if b >= c {
+ break
+ }
+
+ swap(data, b, c-1)
+ swap(indices, b, c-1)
+ b += 1
+ c -= 1
+ }
+
+ protect := hi-c < 5
+ if !protect && hi-c < (hi-lo)/4 {
+ dups := 0
+ if !less(data[pivot], data[hi-1], call) {
+ swap(data, c, hi-1)
+ swap(indices, c, hi-1)
+ c += 1
+ dups += 1
+ }
+ if !less(data[b-1], data[pivot], call) {
+ b -= 1
+ dups += 1
+ }
+
+ if !less(data[m], data[pivot], call) {
+ swap(data, m, b-1)
+ swap(indices, m, b-1)
+ b -= 1
+ dups += 1
+ }
+ protect = dups > 1
+ }
+ if protect {
+ for {
+ for ; a < b && !less(data[b-1], data[pivot], call); b -= 1 {
+ }
+ for ; a < b && less(data[a], data[pivot], call); a += 1 {
+ }
+ if a >= b {
+ break
+ }
+ swap(data, a, b-1)
+ swap(indices, a, b-1)
+ a += 1
+ b -= 1
+ }
+ }
+ swap(data, pivot, b-1)
+ swap(indices, pivot, b-1)
+ return b-1, c
+ }
+
+ assert(len(data) == len(indices))
+
+ a, b, max_depth := a, b, max_depth
+
+ for b-a > 12 { // only use shell sort for lengths <= 12
+ if max_depth == 0 {
+ heap_sort(data, indices, a, b, call)
+ return
+ }
+ max_depth -= 1
+ mlo, mhi := do_pivot(data, indices, a, b, call)
+ if mlo-a < b-mhi {
+ _quick_sort_general_with_indices(data, indices, a, mlo, max_depth, call, KIND)
+ a = mhi
+ } else {
+ _quick_sort_general_with_indices(data, indices, mhi, b, max_depth, call, KIND)
+ b = mlo
+ }
+ }
+ if b-a > 1 {
+ // Shell short with gap 6
+ for i in a+6..<b {
+ if less(data[i], data[i-6], call) {
+ swap(data, i, i-6)
+ swap(indices, i, i-6)
+ }
+ }
+ insertion_sort(data, indices, a, b, call)
+ }
+}