From 233e34cf95325e16a47e698888504ffd95336a82 Mon Sep 17 00:00:00 2001
From: Kazik Pogoda <morisil@xemantic.com>
Date: Tue, 17 May 2022 20:42:32 +0200
Subject: [PATCH 1/2] KDTree: tree build time goes to log instead of println
 (also excessive imports removed)

---
 orx-kdtree/src/demo/kotlin/DemoKNearestNeighbour01.kt | 3 ---
 orx-kdtree/src/main/kotlin/KDTree.kt                  | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/orx-kdtree/src/demo/kotlin/DemoKNearestNeighbour01.kt b/orx-kdtree/src/demo/kotlin/DemoKNearestNeighbour01.kt
index bd5c30ba2..4fbc44d79 100644
--- a/orx-kdtree/src/demo/kotlin/DemoKNearestNeighbour01.kt
+++ b/orx-kdtree/src/demo/kotlin/DemoKNearestNeighbour01.kt
@@ -1,9 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.kdtree.buildKDTree
-import org.openrndr.extra.kdtree.findKNearest
 import org.openrndr.extra.kdtree.kdTree
-import org.openrndr.extra.kdtree.vector2Mapper
 import org.openrndr.math.Vector2
 import org.openrndr.shape.LineSegment
 
diff --git a/orx-kdtree/src/main/kotlin/KDTree.kt b/orx-kdtree/src/main/kotlin/KDTree.kt
index 830305a47..f7c7efb80 100644
--- a/orx-kdtree/src/main/kotlin/KDTree.kt
+++ b/orx-kdtree/src/main/kotlin/KDTree.kt
@@ -4,11 +4,14 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import mu.KotlinLogging
 import org.openrndr.math.*
 import java.util.*
 import kotlin.IllegalStateException
 import kotlin.math.abs
 
+val logger = KotlinLogging.logger { }
+
 /** built-in mapper for [Vector2] */
 fun vector2Mapper(v: Vector2, dimension: Int): Double {
     return when (dimension) {
@@ -172,7 +175,7 @@ fun <T> buildKDTree(items: MutableList<T>, dimensions: Int, mapper: (T, Int) ->
     runBlocking {
         job.join()
     }
-    println("building took ${System.currentTimeMillis() - start}ms")
+    logger.trace { "building took ${System.currentTimeMillis() - start}ms" }
     return root
 }
 

From 21f06964b439412b90b55c7a81750457ac156c2c Mon Sep 17 00:00:00 2001
From: Kazik Pogoda <morisil@xemantic.com>
Date: Tue, 17 May 2022 21:24:45 +0200
Subject: [PATCH 2/2] KDTree: build time reporting removed completely as it can
 be measured externally

---
 orx-kdtree/src/main/kotlin/KDTree.kt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/orx-kdtree/src/main/kotlin/KDTree.kt b/orx-kdtree/src/main/kotlin/KDTree.kt
index f7c7efb80..68338dbb6 100644
--- a/orx-kdtree/src/main/kotlin/KDTree.kt
+++ b/orx-kdtree/src/main/kotlin/KDTree.kt
@@ -4,14 +4,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import mu.KotlinLogging
 import org.openrndr.math.*
 import java.util.*
 import kotlin.IllegalStateException
 import kotlin.math.abs
 
-val logger = KotlinLogging.logger { }
-
 /** built-in mapper for [Vector2] */
 fun vector2Mapper(v: Vector2, dimension: Int): Double {
     return when (dimension) {
@@ -105,7 +102,6 @@ private fun <T> insertItem(root: KDTreeNode<T>, item: T): KDTreeNode<T> {
 fun <T> buildKDTree(items: MutableList<T>, dimensions: Int, mapper: (T, Int) -> Double): KDTreeNode<T> {
     val root = KDTreeNode<T>(dimensions, mapper)
 
-    val start = System.currentTimeMillis()
     fun <T> buildTreeTask(
         scope: CoroutineScope,
         node: KDTreeNode<T>,
@@ -175,7 +171,6 @@ fun <T> buildKDTree(items: MutableList<T>, dimensions: Int, mapper: (T, Int) ->
     runBlocking {
         job.join()
     }
-    logger.trace { "building took ${System.currentTimeMillis() - start}ms" }
     return root
 }