azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sorting optimizations: do not make excessive copies, introduce methods to sort the whole array.

Browse Source 
#KT-9904 Fixed
This commit is contained in:
Ilya Gorbunov
2015-11-05 19:12:32 +03:00
parent 3e81cdfc5d
commit 8bdd1e3246
7 changed files with 199 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.libraries/src/core/kotlin_special.kt
+23 -20
View File
@@ -489,7 +489,7 @@ public inline fun ShortArray.plus(element: Short): ShortArray {
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
@library("primitiveArraySort")
public fun ByteArray.sort(): Unit {
@@ -497,7 +497,7 @@ public fun ByteArray.sort(): Unit {
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
@library("primitiveArraySort")
public fun CharArray.sort(): Unit {
@@ -505,7 +505,7 @@ public fun CharArray.sort(): Unit {
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
@library("primitiveArraySort")
public fun DoubleArray.sort(): Unit {
@@ -513,7 +513,7 @@ public fun DoubleArray.sort(): Unit {
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
@library("primitiveArraySort")
public fun FloatArray.sort(): Unit {
@@ -521,7 +521,7 @@ public fun FloatArray.sort(): Unit {
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
@library("primitiveArraySort")
public fun IntArray.sort(): Unit {
@@ -529,7 +529,7 @@ public fun IntArray.sort(): Unit {
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
@library("primitiveArraySort")
public fun ShortArray.sort(): Unit {
@@ -537,21 +537,23 @@ public fun ShortArray.sort(): Unit {
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
public fun <T: Comparable<T>> Array<out T>.sort(): Unit {
sort { a: T, b: T -> a.compareTo(b) }
if (size > 1)
sort { a: T, b: T -> a.compareTo(b) }
}
/**
* Sorts the array inplace.
* Sorts the array in-place.
*/
public fun LongArray.sort(): Unit {
sort { a: Long, b: Long -> a.compareTo(b) }
if (size > 1)
sort { a: Long, b: Long -> a.compareTo(b) }
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun <T> Array<out T>.sort(comparison: (T, T) -> Int): Unit {
@@ -559,7 +561,7 @@ public fun <T> Array<out T>.sort(comparison: (T, T) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun ByteArray.sort(comparison: (Byte, Byte) -> Int): Unit {
@@ -567,7 +569,7 @@ public fun ByteArray.sort(comparison: (Byte, Byte) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun CharArray.sort(comparison: (Char, Char) -> Int): Unit {
@@ -575,7 +577,7 @@ public fun CharArray.sort(comparison: (Char, Char) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun DoubleArray.sort(comparison: (Double, Double) -> Int): Unit {
@@ -583,7 +585,7 @@ public fun DoubleArray.sort(comparison: (Double, Double) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun FloatArray.sort(comparison: (Float, Float) -> Int): Unit {
@@ -591,7 +593,7 @@ public fun FloatArray.sort(comparison: (Float, Float) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun IntArray.sort(comparison: (Int, Int) -> Int): Unit {
@@ -599,7 +601,7 @@ public fun IntArray.sort(comparison: (Int, Int) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun LongArray.sort(comparison: (Long, Long) -> Int): Unit {
@@ -607,7 +609,7 @@ public fun LongArray.sort(comparison: (Long, Long) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparison] function.
* Sorts the array in-place according to the order specified by the given [comparison] function.
*/
@native
public fun ShortArray.sort(comparison: (Short, Short) -> Int): Unit {
@@ -615,10 +617,11 @@ public fun ShortArray.sort(comparison: (Short, Short) -> Int): Unit {
}
/**
* Sorts the array inplace according to the order specified by the given [comparator] object.
* Sorts the array in-place according to the order specified by the given [comparator] object.
*/
public fun <T> Array<out T>.sortWith(comparator: Comparator<in T>): Unit {
sort { a, b -> comparator.compare(a, b) }
if (size > 1)
sort { a, b -> comparator.compare(a, b) }
}
/**
js/js.translator/testData/kotlin_lib.js
Vendored
+7 -9
View File
@@ -999,17 +999,15 @@
mutableList.sort(boundComparator);
}
//TODO: should be deleted when List will be JS Array-like (https://developer.mozilla.org/en-US/docs/JavaScript/Guide/Predefined_Core_Objects#Working_with_Array-like_objects)
var array = [];
var it = mutableList.iterator();
while (it.hasNext()) {
array.push(it.next());
}
if (mutableList.size > 1) {
//TODO: should be deleted when List will be JS Array-like (https://developer.mozilla.org/en-US/docs/JavaScript/Guide/Predefined_Core_Objects#Working_with_Array-like_objects)
var array = Kotlin.copyToArray(mutableList);
array.sort(boundComparator);
array.sort(boundComparator);
for (var i = 0, n = array.length; i < n; i++) {
mutableList.set_vux3hl$(i, array[i]);
for (var i = 0, n = array.length; i < n; i++) {
mutableList.set_vux3hl$(i, array[i]);
}
}
};