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

Compare floating point values asList elements in total order #KT-28753

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2020-03-27 06:09:12 +03:00
parent ba5e643cb2
commit 97c688057d
3 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jvm/src/generated/_ArraysJvm.kt
+6 -6
View File
@@ -192,10 +192,10 @@ public actual fun FloatArray.asList(): List<Float> {
return object : AbstractList<Float>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: Float): Boolean = this@asList.contains(element)
override fun contains(element: Float): Boolean = this@asList.any { it.toBits() == element.toBits() }
override fun get(index: Int): Float = this@asList[index]
override fun indexOf(element: Float): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: Float): Int = this@asList.lastIndexOf(element)
override fun indexOf(element: Float): Int = this@asList.indexOfFirst { it.toBits() == element.toBits() }
override fun lastIndexOf(element: Float): Int = this@asList.indexOfLast { it.toBits() == element.toBits() }
}
}
@@ -206,10 +206,10 @@ public actual fun DoubleArray.asList(): List<Double> {
return object : AbstractList<Double>(), RandomAccess {
override val size: Int get() = this@asList.size
override fun isEmpty(): Boolean = this@asList.isEmpty()
override fun contains(element: Double): Boolean = this@asList.contains(element)
override fun contains(element: Double): Boolean = this@asList.any { it.toBits() == element.toBits() }
override fun get(index: Int): Double = this@asList[index]
override fun indexOf(element: Double): Int = this@asList.indexOf(element)
override fun lastIndexOf(element: Double): Int = this@asList.lastIndexOf(element)
override fun indexOf(element: Double): Int = this@asList.indexOfFirst { it.toBits() == element.toBits() }
override fun lastIndexOf(element: Double): Int = this@asList.indexOfLast { it.toBits() == element.toBits() }
}
}
libraries/stdlib/test/collections/ArraysTest.kt
+20
View File
@@ -824,6 +824,26 @@ class ArraysTest {
assertEquals(10, intsAsList[1], "Should reflect changes in original array")
}
@Test fun asListInFloatingPrimitiveArrays() {
fun <T> testTotalOrder(expected: List<T>, actual: List<T>, element: T) = compare(expected, actual) {
propertyEquals { contains(element) }
propertyEquals { indexOf(element) }
propertyEquals { lastIndexOf(element) }
}
testTotalOrder(listOf(Float.NaN), floatArrayOf(Float.NaN).asList(), Float.NaN)
testTotalOrder(listOf(-0.0f), floatArrayOf(-0.0f).asList(), -0.0f)
testTotalOrder(listOf(-0.0f), floatArrayOf(-0.0f).asList(), 0.0f)
testTotalOrder(listOf(0.0f), floatArrayOf(0.0f).asList(), 0.0f)
testTotalOrder(listOf(0.0f), floatArrayOf(0.0f).asList(), -0.0f)
testTotalOrder(listOf(Double.NaN), doubleArrayOf(Double.NaN).asList(), Double.NaN)
testTotalOrder(listOf(-0.0), doubleArrayOf(-0.0).asList(), -0.0)
testTotalOrder(listOf(-0.0), doubleArrayOf(-0.0).asList(), 0.0)
testTotalOrder(listOf(0.0), doubleArrayOf(0.0).asList(), 0.0)
testTotalOrder(listOf(0.0), doubleArrayOf(0.0).asList(), -0.0)
}
@Test fun toPrimitiveArray() {
val genericArray: Array<Int> = arrayOf(1, 2, 3)
val primitiveArray: IntArray = genericArray.toIntArray()