vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

builtin: optimize array sort (#9570)

pull/9575/head
yuyi 2021-04-03 18:16:18 +08:00 committed by GitHub
parent 5229428d91
commit 7f81702d81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
vlib/builtin/array.v
View File

@ -571,46 +571,6 @@ fn compare_ints_reverse(a &int, b &int) int {
return 0
}
fn compare_u64s(a &u64, b &u64) int {
if *a < *b {
return -1
}
if *a > *b {
return 1
}
return 0
}
fn compare_u64s_reverse(a &u64, b &u64) int {
if *a > *b {
return -1
}
if *a < *b {
return 1
}
return 0
}
fn compare_floats(a &f64, b &f64) int {
if *a < *b {
return -1
}
if *a > *b {
return 1
}
return 0
}
fn compare_floats_reverse(a &f64, b &f64) int {
if *a > *b {
return -1
}
if *a < *b {
return 1
}
return 0
}
// sort sorts an array of int in place in ascending order.
pub fn (mut a []int) sort() {
a.sort_with_compare(compare_ints)
@ -649,38 +609,6 @@ pub fn (mut a array) grow_len(amount int) {
a.len += amount
}
// array_eq<T> checks if two arrays contain all the same elements in the same order.
// []int == []int (also for: i64, f32, f64, byte, string)
/*
fn array_eq<T>(a1, a2 []T) bool {
if a1.len != a2.len {
return false
}
for i in 0..a1.len {
if a1[i] != a2[i] {
return false
}
}
return true
}
pub fn (a []int) eq(a2 []int) bool {
return array_eq(a, a2)
}
pub fn (a []i64) eq(a2 []i64) bool {
return array_eq(a, a2)
}
pub fn (a []byte) eq(a2 []byte) bool {
return array_eq(a, a2)
}
pub fn (a []f32) eq(a2 []f32) bool {
return array_eq(a, a2)
}
*/
// eq checks if the arrays have the same elements or not.
// TODO: make it work with all types.
pub fn (a1 []string) eq(a2 []string) bool {
@ -700,48 +628,6 @@ pub fn (a1 []string) eq(a2 []string) bool {
return true
}
// compare_i64 for []i64 sort_with_compare()
// sort []i64 with quicksort
// usage :
// mut x := [i64(100),10,70,28,92]
// x.sort_with_compare(compare_i64)
// println(x) // Sorted i64 Array
// output:
// [10, 28, 70, 92, 100]
pub fn compare_i64(a &i64, b &i64) int {
if *a < *b {
return -1
}
if *a > *b {
return 1
}
return 0
}
// compare_f64 for []f64 sort_with_compare()
// ref. compare_i64(...)
pub fn compare_f64(a &f64, b &f64) int {
if *a < *b {
return -1
}
if *a > *b {
return 1
}
return 0
}
// compare_f32 for []f32 sort_with_compare()
// ref. compare_i64(...)
pub fn compare_f32(a &f32, b &f32) int {
if *a < *b {
return -1
}
if *a > *b {
return 1
}
return 0
}
// pointers returns a new array, where each element
// is the address of the corresponding element in the array.
[unsafe]

6
vlib/builtin/array_test.v
View File

@ -836,7 +836,7 @@ fn test_sort_by_different_order_of_a_b() {
fn test_f32_sort() {
mut f := [f32(50.0), 15, 1, 79, 38, 0, 27]
f.sort_with_compare(compare_f32)
f.sort()
assert f[0] == 0.0
assert f[1] == 1.0
assert f[6] == 79.0
@ -844,7 +844,7 @@ fn test_f32_sort() {
fn test_f64_sort() {
mut f := [50.0, 15, 1, 79, 38, 0, 27]
f.sort_with_compare(compare_f64)
f.sort()
assert f[0] == 0.0
assert f[1] == 1.0
assert f[6] == 79.0
@ -852,7 +852,7 @@ fn test_f64_sort() {
fn test_i64_sort() {
mut f := [i64(50), 15, 1, 79, 38, 0, 27]
f.sort_with_compare(compare_i64)
f.sort()
assert f[0] == 0
assert f[1] == 1
assert f[6] == 79

2
vlib/v/gen/c/array.v
View File

@ -228,9 +228,7 @@ fn (mut g Gen) gen_array_sort(node ast.CallExpr) {
// users.sort() or users.sort(a > b)
compare_fn = match typ {
ast.int_type, ast.int_type.to_ptr() { 'compare_ints' }
ast.u64_type, ast.u64_type.to_ptr() { 'compare_u64s' }
ast.string_type, ast.string_type.to_ptr() { 'compare_strings' }
ast.f64_type, ast.f64_type.to_ptr() { 'compare_floats' }
else { '' }
}
if compare_fn != '' && is_reverse {