kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

Make Float values in Memory be actually stored with Double

Browse Source
This commit is contained in:
Iaroslav Postovalov 2020-12-10 19:17:04 +07:00
parent 3adbec15cb
commit 08afa59dcc
No known key found for this signature in database
GPG Key ID: 46E15E4A31B3BCD7
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kmath-memory/src/commonMain/kotlin/space/kscience/kmath/memory/Memory.kt
View File

@ -56,6 +56,8 @@ public interface MemoryReader {
/** /**
* Reads [Float] at certain [offset]. * Reads [Float] at certain [offset].
*
* **Warning: since JS can't handle Float properly, the size of segment read by this function is 8 bytes.**
*/ */
public fun readFloat(offset: Int): Float public fun readFloat(offset: Int): Float
@ -112,6 +114,8 @@ public interface MemoryWriter {
/** /**
* Writes [Float] at certain [offset]. * Writes [Float] at certain [offset].
*
* **Warning: since JS can't handle Float properly, the size of segment written by this function is 8 bytes.**
*/ */
public fun writeFloat(offset: Int, value: Float) public fun writeFloat(offset: Int, value: Float)

23
kmath-memory/src/commonTest/kotlin/kscience/kmath/memory/MemoryTest.kt
View File

@ -54,20 +54,15 @@ internal class MemoryTest {
fun rwFloat() { fun rwFloat() {
val mem = Memory.allocate(64) val mem = Memory.allocate(64)
mem.write { writeFloat(0, 12.12345f) } mem.write { writeFloat(0, 12.12345f) }
println(1) assertEquals(12.12345f, mem.read { readFloat(0) })
assertEquals(12.12345027923584, mem.read { readFloat(0) }.toDouble()) mem.write { writeFloat(8, -313.13f) }
mem.write { writeFloat(4, -313.13f) } assertEquals(-313.13f, mem.read { readFloat(8) })
println(2) mem.write { writeFloat(16, Float.NaN) }
assertEquals(-313.1300048828125, mem.read { readFloat(4) }.toDouble()) assertEquals(Float.NaN, mem.read { readFloat(16) })
mem.write { writeFloat(8, Float.NaN) } mem.write { writeFloat(24, Float.POSITIVE_INFINITY) }
println(3) assertEquals(Float.POSITIVE_INFINITY, mem.read { readFloat(24) })
assertEquals(Float.NaN, mem.read { readFloat(8) }) mem.write { writeFloat(32, Float.NEGATIVE_INFINITY) }
mem.write { writeFloat(12, Float.POSITIVE_INFINITY) } assertEquals(Float.NEGATIVE_INFINITY, mem.read { readFloat(32) })
println(4)
assertEquals(Float.POSITIVE_INFINITY, mem.read { readFloat(12) })
mem.write { writeFloat(12, Float.NEGATIVE_INFINITY) }
println(5)
assertEquals(Float.NEGATIVE_INFINITY, mem.read { readFloat(12) })
} }
@Test @Test

4
kmath-memory/src/jsMain/kotlin/space/kscience/kmath/memory/DataViewMemory.kt
View File

@ -30,7 +30,7 @@ private class DataViewMemory(val view: DataView) : Memory {
override fun readDouble(offset: Int): Double = view.getFloat64(offset, true) override fun readDouble(offset: Int): Double = view.getFloat64(offset, true)
override fun readFloat(offset: Int): Float = view.getFloat32(offset, true) override fun readFloat(offset: Int): Float = view.getFloat64(offset, true).toFloat()
override fun readByte(offset: Int): Byte = view.getInt8(offset) override fun readByte(offset: Int): Byte = view.getInt8(offset)
@ -56,7 +56,7 @@ private class DataViewMemory(val view: DataView) : Memory {
} }
override fun writeFloat(offset: Int, value: Float) { override fun writeFloat(offset: Int, value: Float) {
view.setFloat32(offset, value, true) view.setFloat64(offset, value.toDouble(), true)
} }
override fun writeByte(offset: Int, value: Byte) { override fun writeByte(offset: Int, value: Byte) {

4
kmath-memory/src/jvmMain/kotlin/space/kscience/kmath/memory/ByteBufferMemory.kt
View File

@ -44,7 +44,7 @@ internal class ByteBufferMemory(
override fun readDouble(offset: Int) = buffer.getDouble(position(offset)) override fun readDouble(offset: Int) = buffer.getDouble(position(offset))
override fun readFloat(offset: Int) = buffer.getFloat(position(offset)) override fun readFloat(offset: Int) = buffer.getDouble(position(offset)).toFloat()
override fun readByte(offset: Int) = buffer.get(position(offset)) override fun readByte(offset: Int) = buffer.get(position(offset))
@ -69,7 +69,7 @@ internal class ByteBufferMemory(
} }
override fun writeFloat(offset: Int, value: Float) { override fun writeFloat(offset: Int, value: Float) {
buffer.putFloat(position(offset), value) buffer.putDouble(position(offset), value.toDouble())
} }
override fun writeByte(offset: Int, value: Byte) { override fun writeByte(offset: Int, value: Byte) {

4
kmath-memory/src/nativeMain/kotlin/space/kscience/kmath/memory/NativeMemory.kt
View File

@ -31,7 +31,7 @@ internal class NativeMemory(
override fun readDouble(offset: Int) = array.getDoubleAt(position(offset)) override fun readDouble(offset: Int) = array.getDoubleAt(position(offset))
override fun readFloat(offset: Int) = array.getFloatAt(position(offset)) override fun readFloat(offset: Int) = array.getDoubleAt(position(offset)).toFloat()
override fun readByte(offset: Int) = array[position(offset)] override fun readByte(offset: Int) = array[position(offset)]
@ -56,7 +56,7 @@ internal class NativeMemory(
} }
override fun writeFloat(offset: Int, value: Float) { override fun writeFloat(offset: Int, value: Float) {
array.setFloatAt(position(offset), value) array.setDoubleAt(position(offset), value.toDouble())
} }
override fun writeByte(offset: Int, value: Byte) { override fun writeByte(offset: Int, value: Byte) {