From 3b18000f1edcd9d99e15037230885140b64b8001 Mon Sep 17 00:00:00 2001
From: Iaroslav <postovalovya@gmail.com>
Date: Mon, 29 Jun 2020 00:14:01 +0700
Subject: [PATCH] Make several NDStructures mutable

---
 .../scientifik.kmath.nd4j/INDArrayStructures.kt    | 10 +++++++---
 .../scientifik/kmath/nd4j/INDArrayStructureTest.kt | 14 +++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/kmath-nd4j/src/main/kotlin/scientifik.kmath.nd4j/INDArrayStructures.kt b/kmath-nd4j/src/main/kotlin/scientifik.kmath.nd4j/INDArrayStructures.kt
index b444def3d..f39d84716 100644
--- a/kmath-nd4j/src/main/kotlin/scientifik.kmath.nd4j/INDArrayStructures.kt
+++ b/kmath-nd4j/src/main/kotlin/scientifik.kmath.nd4j/INDArrayStructures.kt
@@ -1,6 +1,7 @@
 package scientifik.kmath.nd4j
 
 import org.nd4j.linalg.api.ndarray.INDArray
+import scientifik.kmath.structures.MutableNDStructure
 import scientifik.kmath.structures.NDStructure
 
 interface INDArrayStructure<T> : NDStructure<T> {
@@ -13,9 +14,10 @@ interface INDArrayStructure<T> : NDStructure<T> {
     override fun elements(): Sequence<Pair<IntArray, T>> = Sequence(::elementsIterator)
 }
 
-data class INDArrayIntStructure(override val ndArray: INDArray) : INDArrayStructure<Int> {
+data class INDArrayIntStructure(override val ndArray: INDArray) : INDArrayStructure<Int>, MutableNDStructure<Int> {
     override fun elementsIterator(): Iterator<Pair<IntArray, Int>> = INDArrayIntIterator(ndArray)
     override fun get(index: IntArray): Int = ndArray.getInt(*index)
+    override fun set(index: IntArray, value: Int): Unit = run { ndArray.putScalar(index, value) }
 }
 
 data class INDArrayLongStructure(override val ndArray: INDArray) : INDArrayStructure<Long> {
@@ -23,12 +25,14 @@ data class INDArrayLongStructure(override val ndArray: INDArray) : INDArrayStruc
     override fun get(index: IntArray): Long = ndArray.getLong(*widenToLongArray(index))
 }
 
-data class INDArrayDoubleStructure(override val ndArray: INDArray) : INDArrayStructure<Double> {
+data class INDArrayDoubleStructure(override val ndArray: INDArray) : INDArrayStructure<Double>, MutableNDStructure<Double> {
     override fun elementsIterator(): Iterator<Pair<IntArray, Double>> = INDArrayDoubleIterator(ndArray)
     override fun get(index: IntArray): Double = ndArray.getDouble(*index)
+    override fun set(index: IntArray, value: Double): Unit = run { ndArray.putScalar(index, value) }
 }
 
-data class INDArrayFloatStructure(override val ndArray: INDArray) : INDArrayStructure<Float> {
+data class INDArrayFloatStructure(override val ndArray: INDArray) : INDArrayStructure<Float>, MutableNDStructure<Float> {
     override fun elementsIterator(): Iterator<Pair<IntArray, Float>> = INDArrayFloatIterator(ndArray)
     override fun get(index: IntArray): Float = ndArray.getFloat(*index)
+    override fun set(index: IntArray, value: Float): Unit = run { ndArray.putScalar(index, value) }
 }
diff --git a/kmath-nd4j/src/test/kotlin/scientifik/kmath/nd4j/INDArrayStructureTest.kt b/kmath-nd4j/src/test/kotlin/scientifik/kmath/nd4j/INDArrayStructureTest.kt
index 239289262..77565856a 100644
--- a/kmath-nd4j/src/test/kotlin/scientifik/kmath/nd4j/INDArrayStructureTest.kt
+++ b/kmath-nd4j/src/test/kotlin/scientifik/kmath/nd4j/INDArrayStructureTest.kt
@@ -1,9 +1,9 @@
 package scientifik.kmath.nd4j
 
 import org.nd4j.linalg.factory.Nd4j
+import scientifik.kmath.structures.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import scientifik.kmath.structures.get
 
 internal class INDArrayStructureTest {
     @Test
@@ -17,7 +17,7 @@ internal class INDArrayStructureTest {
     @Test
     fun testShape() {
         val nd = Nd4j.rand(10, 2, 3, 6)!!
-        val struct = INDArrayIntStructure(nd)
+        val struct = INDArrayLongStructure(nd)
         assertEquals(intArrayOf(10, 2, 3, 6).toList(), struct.shape.toList())
     }
 
@@ -33,7 +33,7 @@ internal class INDArrayStructureTest {
     @Test
     fun testDimension() {
         val nd = Nd4j.rand(8, 16, 3, 7, 1)!!
-        val struct = INDArrayIntStructure(nd)
+        val struct = INDArrayFloatStructure(nd)
         assertEquals(5, struct.dimension)
     }
 
@@ -43,4 +43,12 @@ internal class INDArrayStructureTest {
         val struct = INDArrayIntStructure(nd)
         assertEquals(nd.getInt(0, 0, 0, 0), struct[0, 0, 0, 0])
     }
+
+    @Test
+    fun testSet() {
+        val nd = Nd4j.rand(17, 12, 4, 8)!!
+        val struct = INDArrayIntStructure(nd)
+        struct[intArrayOf(1, 2, 3, 4)] = 777
+        assertEquals(777, struct[1, 2, 3, 4])
+    }
 }