| ... | ... | @@ -4,22 +4,22 @@ const math = @import("math.zig"); |
| 4 | 4 | |
| 5 | 5 | pub const Cmp = math.Cmp; |
| 6 | 6 | |
| 7 | | pub fn sort(inline T: type, array: []T) { |
| 7 | pub fn sort(inline T: type, array: []T, inline cmp: fn(a: T, b: T)->Cmp) { |
| 8 | 8 | if (array.len > 0) { |
| 9 | | quicksort(T, array, 0, array.len - 1); |
| 9 | quicksort(T, array, 0, array.len - 1, cmp); |
| 10 | 10 | } |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | | fn quicksort(inline T: type, array: []T, left: usize, right: usize) { |
| 13 | fn quicksort(inline T: type, array: []T, left: usize, right: usize, inline cmp: fn(a: T, b: T)->Cmp) { |
| 14 | 14 | var i = left; |
| 15 | 15 | var j = right; |
| 16 | 16 | var p = (i + j) / 2; |
| 17 | 17 | |
| 18 | 18 | while (i <= j) { |
| 19 | | while (array[i] < array[p]) { |
| 19 | while (cmp(array[i], array[p]) == Cmp.Less) { |
| 20 | 20 | i += 1; |
| 21 | 21 | } |
| 22 | | while (array[j] > array[p]) { |
| 22 | while (cmp(array[j], array[p]) == Cmp.Greater) { |
| 23 | 23 | j -= 1; |
| 24 | 24 | } |
| 25 | 25 | if (i <= j) { |
| ... | ... | @@ -31,42 +31,28 @@ fn quicksort(inline T: type, array: []T, left: usize, right: usize) { |
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | | if (left < j) quicksort(T, array, left, j); |
| 35 | | if (i < right) quicksort(T, array, i, right); |
| 34 | if (left < j) quicksort(T, array, left, j, cmp); |
| 35 | if (i < right) quicksort(T, array, i, right, cmp); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | | // --------------------------------------- |
| 39 | | // sortCmp |
| 38 | pub fn i32asc(a: i32, b: i32) -> Cmp { |
| 39 | return if (a > b) Cmp.Greater else if (a < b) Cmp.Less else Cmp.Equal; |
| 40 | } |
| 40 | 41 | |
| 41 | | pub fn sortCmp(inline T: type, array: []T, inline cmp: fn(a: T, b: T)->Cmp) { |
| 42 | | if (array.len > 0) { |
| 43 | | quicksortCmp(T, array, 0, array.len - 1, cmp); |
| 44 | | } |
| 42 | pub fn i32desc(a: i32, b: i32) -> Cmp { |
| 43 | return reverse(i32asc(a, b)); |
| 45 | 44 | } |
| 46 | 45 | |
| 47 | | fn quicksortCmp(inline T: type, array: []T, left: usize, right: usize, inline cmp: fn(a: T, b: T)->Cmp) { |
| 48 | | var i = left; |
| 49 | | var j = right; |
| 50 | | var p = (i + j) / 2; |
| 46 | pub fn u8asc(a: u8, b: u8) -> Cmp { |
| 47 | return if (a > b) Cmp.Greater else if (a < b) Cmp.Less else Cmp.Equal; |
| 48 | } |
| 51 | 49 | |
| 52 | | while (i <= j) { |
| 53 | | while (cmp(array[i], array[p]) == Cmp.Less) { |
| 54 | | i += 1; |
| 55 | | } |
| 56 | | while (cmp(array[j], array[p]) == Cmp.Greater) { |
| 57 | | j -= 1; |
| 58 | | } |
| 59 | | if (i <= j) { |
| 60 | | const tmp = array[i]; |
| 61 | | array[i] = array[j]; |
| 62 | | array[j] = tmp; |
| 63 | | i += 1; |
| 64 | | if (j > 0) j -= 1; |
| 65 | | } |
| 66 | | } |
| 50 | pub fn u8desc(a: u8, b: u8) -> Cmp { |
| 51 | return reverse(u8asc(a, b)); |
| 52 | } |
| 67 | 53 | |
| 68 | | if (left < j) quicksortCmp(T, array, left, j, cmp); |
| 69 | | if (i < right) quicksortCmp(T, array, i, right, cmp); |
| 54 | fn reverse(was: Cmp) -> Cmp { |
| 55 | return if (was == Cmp.Greater) Cmp.Less else if (was == Cmp.Less) Cmp.Greater else Cmp.Equal; |
| 70 | 56 | } |
| 71 | 57 | |
| 72 | 58 | // --------------------------------------- |
| ... | ... | @@ -85,7 +71,7 @@ fn testSort() { |
| 85 | 71 | }; |
| 86 | 72 | |
| 87 | 73 | for (u8cases) |case| { |
| 88 | | sort(u8, case[0]); |
| 74 | sort(u8, case[0], u8asc); |
| 89 | 75 | assert(str.eql(case[0], case[1])); |
| 90 | 76 | } |
| 91 | 77 | |
| ... | ... | @@ -99,28 +85,14 @@ fn testSort() { |
| 99 | 85 | }; |
| 100 | 86 | |
| 101 | 87 | for (i32cases) |case| { |
| 102 | | sort(i32, case[0]); |
| 88 | sort(i32, case[0], i32asc); |
| 103 | 89 | assert(str.sliceEql(i32, case[0], case[1])); |
| 104 | 90 | } |
| 105 | 91 | } |
| 106 | 92 | |
| 107 | | fn testSortCmp() { |
| 93 | fn testSortDesc() { |
| 108 | 94 | @setFnTest(this, true); |
| 109 | 95 | |
| 110 | | const i32cases = [][][]i32 { |
| 111 | | [][]i32{[]i32{}, []i32{}}, |
| 112 | | [][]i32{[]i32{1}, []i32{1}}, |
| 113 | | [][]i32{[]i32{0, 1}, []i32{0, 1}}, |
| 114 | | [][]i32{[]i32{1, 0}, []i32{0, 1}}, |
| 115 | | [][]i32{[]i32{1, -1, 0}, []i32{-1, 0, 1}}, |
| 116 | | [][]i32{[]i32{2, 1, 3}, []i32{1, 2, 3}}, |
| 117 | | }; |
| 118 | | |
| 119 | | for (i32cases) |case| { |
| 120 | | sortCmp(i32, case[0], normalCmp); |
| 121 | | assert(str.sliceEql(i32, case[0], case[1])); |
| 122 | | } |
| 123 | | |
| 124 | 96 | const revCases = [][][]i32 { |
| 125 | 97 | [][]i32{[]i32{}, []i32{}}, |
| 126 | 98 | [][]i32{[]i32{1}, []i32{1}}, |
| ... | ... | @@ -131,16 +103,9 @@ fn testSortCmp() { |
| 131 | 103 | }; |
| 132 | 104 | |
| 133 | 105 | for (revCases) |case| { |
| 134 | | sortCmp(i32, case[0], revCmp); |
| 106 | sort(i32, case[0], i32desc); |
| 135 | 107 | assert(str.sliceEql(i32, case[0], case[1])); |
| 136 | 108 | } |
| 137 | 109 | |
| 138 | 110 | } |
| 139 | 111 | |
| 140 | | fn normalCmp(a: i32, b: i32) -> Cmp { |
| 141 | | return if (a > b) Cmp.Greater else if (a < b) Cmp.Less else Cmp.Equal; |
| 142 | | } |
| 143 | | |
| 144 | | fn revCmp(a: i32, b: i32) -> Cmp { |
| 145 | | return if (a < b) Cmp.Greater else if (a > b) Cmp.Less else Cmp.Equal; |
| 146 | | } |
Steve Perkins <stereosteve@gmail.com> 2016-11-03 04:10:33+00:00