+shiffle

+List.binarySearch

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt

@@ -324,10 +324,8 @@ open class Obj {
             addFn("apply") {
                 val body = args.firstAndOnly()
                 (thisObj as? ObjInstance)?.let {
-                    println("apply in ${thisObj is ObjInstance}, ${it.instanceScope}")
                     body.callOn(ApplyScope(this, it.instanceScope))
                 } ?: run {
-                    println("apply on non-instance $thisObj")
                     body.callOn(this)
                 }
                 thisObj

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjArray.kt

@@ -50,5 +50,26 @@ val ObjArray by lazy {
         addFn("indices") {
             ObjRange(0.toObj(), thisObj.invokeInstanceMethod(this, "size"), false)
         }
+
+        addFn("binarySearch") {
+            val target = args.firstAndOnly()
+            var low = 0
+            var high = thisObj.invokeInstanceMethod(this, "size").toInt() - 1
+
+            while (low <= high) {
+                val mid = (low + high) / 2
+                val midVal = thisObj.getAt(this, ObjInt(mid.toLong()))
+
+                val cmp = midVal.compareTo(this, target)
+                when {
+                    cmp == 0 -> return@addFn (mid).toObj()
+                    cmp > 0 -> high = mid - 1
+                    else -> low = mid + 1
+                }
+            }
+
+            // Элемент не найден, возвращаем -(точка вставки) - 1
+            (-low - 1).toObj()
+        }
     }
 }

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjIterable.kt

@@ -141,6 +141,5 @@ val ObjIterable by lazy {
             list.list.reverse()
             list
         }
-
     }
 }

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjList.kt

@@ -269,6 +269,10 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
                 thisAs<ObjList>().quicksort { a, b -> comparator.call(this, a, b).toInt() }
                 ObjVoid
             }
+            addFn("shuffle") {
+                thisAs<ObjList>().list.shuffle()
+                ObjVoid
+            }
         }
     }
 }

lynglib/src/commonMain/kotlin/net/sergeych/lyng/stdlib_included/root_lyng.kt

@@ -131,6 +131,10 @@ fun Iterable.sortedBy(predicate) {
     sortedWith { a, b -> predicate(a) <=> predicate(b) }
 }
 
+fun Iterable.shuffled() {
+    toList().apply { shuffle() }
+}
+
 fun List.toString() {
     "[" + joinToString(",") + "]"
 }

lynglib/src/commonTest/kotlin/ScriptTest.kt

@@ -3188,7 +3188,8 @@ class ScriptTest {
 
     @Test
     fun testSort() = runTest {
-        eval("""
+        eval(
+            """
             val coll = [5,4,1,7]
             assertEquals( [1,4,5,7], coll.sortedWith { a,b -> a <=> b })
             assertEquals( [1,4,5,7], coll.sorted())
@@ -3200,7 +3201,8 @@ class ScriptTest {
 
     @Test
     fun testListSortInPlace() = runTest {
-        eval("""
+        eval(
+            """
             val l1 = [6,3,1,9]
             l1.sort()
             assertEquals( [1,3,6,9], l1)
@@ -3212,6 +3214,35 @@ class ScriptTest {
             // 1 3 2 1
             // we hope we got it also stable:
             assertEquals( [1,9,6,3], l1)
-        """)
+        """
+        )
     }
+
+    @Test
+    fun binarySearchTest() = runTest {
+        eval(
+            """
+            val coll = [1,2,3,4,5]
+            assertEquals( 2, coll.binarySearch(3) )
+            assertEquals( 0, coll.binarySearch(1) )
+            assertEquals( 4, coll.binarySearch(5) )
+        """.trimIndent()
+        )
+    }
+
+    @Test
+    fun binarySearchTest2() = runTest {
+        eval(
+            """
+            val src = (1..50).toList().shuffled()
+            val result = []
+            for( x in src ) {
+                val i = result.binarySearch(x)
+                assert( i < 0 )
+                result.insertAt(-i-1, x)
+            }
+            assertEquals( src.sorted(), result )
+            """.trimIndent())
+    }
+
 }

lynglib/src/jvmTest/kotlin/BookTest.kt

@@ -327,4 +327,9 @@ class BookTest {
         runDocTests("../docs/serialization.md")
     }
 
+    @Test
+    fun testArray() = runBlocking {
+        runDocTests("../docs/Array.md")
+    }
+
 }