[Andrew Polyakov] Changed behaviour of the NDArrayValueProvider

Author: AndrewPolyakov1

utbot-python/src/main/kotlin/org/utbot/python/evaluation/PythonWorkerManager.kt

@@ -81,7 +81,7 @@ class PythonWorkerManager(
                 serverSocket.localPort.toString(),
                 coverageReceiver.address().first,
                 coverageReceiver.address().second,
-                "--logfile", logfile.absolutePath,
+                "--logfile", "C:\\Users\\Andrew\\Desktop\\Huawei\\Tests\\test_cli\\out\\log.log", // TODO: Remove
                 "--loglevel", "DEBUG",  // "DEBUG", "INFO", "WARNING", "ERROR"
                 "--coverage_type", coverageMeasureMode.toString(),  // "lines", "instructions"
                 sendCoverageContinuously.toSendCoverageContinuouslyString(),  // "--send_coverage", "--no-send_coverage"

utbot-python/src/main/kotlin/org/utbot/python/evaluation/serialization/PythonObjectParser.kt

@@ -107,6 +107,7 @@ class NdarrayMemoryObject(
     typeinfo: TypeInfo,
     comparable: Boolean,
     val items: List<String>,
+    val dimensions: List<Int>
 ) : MemoryObject(id, typeinfo, comparable)
 
 fun PythonTree.PythonTreeNode.toMemoryObject(memoryDump: MemoryDump, reload: Boolean = false): String {
@@ -124,10 +125,11 @@ fun PythonTree.PythonTreeNode.toMemoryObject(memoryDump: MemoryDump, reload: Boo
             )
         }
 
-        is PythonTree.NdarrayNode -> { // TODO: Optimize for ndarray
+        is PythonTree.NDArrayNode -> { // TODO: Optimize for ndarray
             val items = this.items.entries
                 .map { it.value.toMemoryObject(memoryDump) }
-            NdarrayMemoryObject(id, typeinfo, this.comparable, items) // TODO: Ndarray to memory object
+            val dimensions = this.dimensions
+            NdarrayMemoryObject(id, typeinfo, this.comparable, items, dimensions) // TODO: Ndarray to memory object
         }
 
         is PythonTree.ListNode -> {
@@ -321,16 +323,15 @@ fun MemoryObject.toPythonTree(
 
             is NdarrayMemoryObject -> {
                 val draft = when (this.qualname) {
-                    "np.ndarray" -> PythonTree.NdarrayNode(id, mutableMapOf(), listOf())
-                    "numpy.ndarray" -> PythonTree.NdarrayNode(id, mutableMapOf(), listOf())
+                    "numpy.ndarray" -> PythonTree.NDArrayNode(id, mutableMapOf(), this.dimensions)
                     else -> PythonTree.ListNode(id, mutableMapOf())
                 }
                 visited[this.id] = draft
 
                 items.mapIndexed { index, valueId ->
                     val value = memoryDump.getById(valueId).toPythonTree(memoryDump, visited)
                     when (draft) {
-                        is PythonTree.NdarrayNode -> draft.items[index] = value
+                        is PythonTree.NDArrayNode -> draft.items[index] = value
                         else -> {}
                     }
                 }

utbot-python/src/main/kotlin/org/utbot/python/framework/api/python/PythonTree.kt

@@ -155,23 +155,28 @@ object PythonTree {
             else false
         }
     }
-    class NdarrayNode(
+    class NDArrayNode(
         id: Long,
         val items: MutableMap<Int, PythonTreeNode>,
-        val dimention: List<Int>
+        val dimensions: List<Int>
     ) : PythonTreeNode(id, pythonNdarrayClassId) {
-        constructor(items: MutableMap<Int, PythonTreeNode>, dimention: List<Int>) : this(PythonIdGenerator.createId(), items, dimention)
+        constructor(items: MutableMap<Int, PythonTreeNode>, dimensions: List<Int>) : this(PythonIdGenerator.createId(), items, dimensions)
 
         override val children: List<PythonTreeNode>
             get() = items.values.toList()
 
         override fun typeEquals(other: Any?): Boolean {
-            return if (other is NdarrayNode)
+            return if (other is NDArrayNode)
                 children.zip(other.children).all {
                     it.first.typeEquals(it.second)
                 }
             else false
         }
+
+
+        override fun toString(): String {
+            return "ndarray[${items.values}], shape: ($dimensions)"
+        }
     }
 
     class DictNode(

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/constructor/tree/PythonCgVariableConstructor.kt

@@ -67,9 +67,11 @@ class PythonCgVariableConstructor(cgContext: CgContext) : CgVariableConstructor(
                 }
             }
 
-            is PythonTree.NdarrayNode -> {
+            is PythonTree.NDArrayNode -> {
                 val items = objectNode.items.values.map { pythonBuildObject(it) }
-                Pair(CgPythonNdarray(items.map { it.first }), items.flatMap { it.second })
+                val shape = objectNode.dimensions
+                val type = objectNode.items.values.firstOrNull()?.type?.typeName
+                Pair(CgPythonNdarray(items.map { it.first }, shape, type?: "int"), items.flatMap { it.second })
             }
 
             is PythonTree.TupleNode -> {

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/constructor/visitor/CgPythonRenderer.kt

@@ -192,7 +192,7 @@ internal class CgPythonRenderer(
         println("\"\"\"")
     }
 
-    override fun visit(element: CgDocRegularStmt){
+    override fun visit(element: CgDocRegularStmt) {
         if (element.isEmpty()) return
 
         println(element.stmt)
@@ -561,13 +561,16 @@ internal class CgPythonRenderer(
     }
 
     override fun visit(element: CgPythonNdarray) {
-        if (element.elements.isEmpty()) {
-            print("numpy.array([])")
-        } else{
-            print("numpy.array([")
-            element.elements.renderSeparated()
-            print("])")
-        }
+
+        print("numpy.ndarray(")
+        print("dtype=" + element.dtype + ",")
+        print("shape=(")
+
+        print(element.shape.joinToString(",") { it.toString() })
+        print("), buffer=numpy.array([")
+        element.elements.renderSeparated()
+        print("]))")
+
 
     }
 

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/tree/CgPythonElement.kt

@@ -124,7 +124,9 @@ class CgPythonSet(
 }
 
 class CgPythonNdarray(
-    val elements: List<CgValue>
+    val elements: List<CgValue>,
+    val shape: List<Int>,
+    val dtype: String
 ) : CgValue, CgPythonElement {
     override val type: PythonClassId = pythonNdarrayClassId
 }

utbot-python/src/main/kotlin/org/utbot/python/fuzzing/provider/NDArrayValueProvider.kt

@@ -10,7 +10,6 @@ import org.utbot.python.fuzzing.FuzzedUtType.Companion.toFuzzed
 import org.utbot.python.fuzzing.PythonFuzzedValue
 import org.utbot.python.fuzzing.PythonMethodDescription
 import org.utbot.python.fuzzing.PythonValueProvider
-import org.utbot.python.fuzzing.provider.utils.*
 import org.utpython.types.*
 import kotlin.math.abs
 
@@ -41,20 +40,18 @@ class NDArrayValueProvider(
                 )
             ) {
                 PythonFuzzedValue(
-
-                    PythonTree.NdarrayNode(
+                    PythonTree.NDArrayNode(
                         emptyMap<Int, PythonTree.PythonTreeNode>().toMutableMap(), // Generate new Python IntNode
                         ((it.first().tree as PythonTree.ListNode).items as Map<Int, PythonTree.PrimitiveNode>).values.map { node ->
-                            abs(node.repr.take(3).toInt()) % 10
+                            abs(node.repr.take(3).toInt()) % 7 // TODO: Fix this
                         }
                     ), "%var% = ${type.pythonTypeRepresentation()}"
                 )
             },
-            // TODO: Call to modify
             modify = sequence {
                 yield(Routine.Call((0 until 10000). map{param[1]}.toFuzzed()) { instance, arguments ->
-                    val obj = instance.tree as PythonTree.NdarrayNode
-                    (0 until obj.dimention.fold(1, Int::times)).map {
+                    val obj = instance.tree as PythonTree.NDArrayNode
+                    (0 until obj.dimensions.fold(1, Int::times)).map {
                         obj.items[it] = arguments.get(it).tree
                     }
 

utbot-python/src/main/kotlin/org/utbot/python/newtyping/inference/baseline/BaselineAlgorithm.kt

@@ -76,7 +76,7 @@ class BaselineAlgorithm(
 
     private val checkedSignatures: MutableSet<UtType> = mutableSetOf()
 
-    private fun getRandomType(): UtType? {
+    private fun getRandomType(): UtType? { // TODO: Remove random type when ndarray
         val weights = states.map { 1.0 / (it.anyNodes.size * it.anyNodes.size + 1) }
         val state = weightedRandom(states, weights, random)
         val newState = expandState(state, storage, state.anyNodes.map { mixtureType })
@@ -109,7 +109,7 @@ class BaselineAlgorithm(
                 val laudedType = getLaudedType()
                 if (laudedType != null) return laudedType
             }
-            val randomType = getRandomType()
+            val randomType = getRandomType() // TODO: Not to do when ndarray (via pythonMethod )
             if (randomType != null) return randomType
         }