fix

Author: hereisderek

.idea/workspace.xml

@@ -189,7 +189,7 @@ TODO: Leetcode_710
 |:----------:|:-----:|-------------------------------------|-------------------------------------------------------------------------------------|-------|
 |     🟢     |   ✅   | 344. Reverse String                 | [Leetcode](https://leetcode.com/problems/reverse-string/), [Github]()               |       |
 |     🟢     |   ✅   | 303. Range Sum Query - Immutable    | [Leetcode](https://leetcode.com/problems/range-sum-query-immutable/), [Github]()    |       |
-|     🟠     |   ❌   | 304. Range Sum Query 2D - Immutable | [Leetcode](https://leetcode.com/problems/range-sum-query-2d-immutable/), [Github]() |       |
+|     🟠     |   ✅   | 304. Range Sum Query 2D - Immutable | [Leetcode](https://leetcode.com/problems/range-sum-query-2d-immutable/), [Github]() |       |
 
 
 

README.md

@@ -165,7 +165,7 @@ private interface Leetcode_304 {
     companion object : Testable {
         override fun test() {
             val tests = listOf<Pair<Array<IntArray>, List<Pair<IntArray, Int>>>>(
-/*                 arrayOf(
+                arrayOf(
                     intArrayOf(3, 0, 1, 4, 2),
                     intArrayOf(5, 6, 3, 2, 1),
                     intArrayOf(1, 2, 0, 1, 5),
@@ -182,7 +182,7 @@ private interface Leetcode_304 {
                     intArrayOf(0,0,0,0) to -4,
                     intArrayOf(0,0,0,1) to -9,
                     intArrayOf(0,1,0,1) to -5,
-                ), */
+                ),
                 arrayOf(
                     intArrayOf(8,-4,5),
                     intArrayOf(-1,4,4),
@@ -196,20 +196,13 @@ private interface Leetcode_304 {
             tests.flatMap {
                 listOf(
                     M1(it.first) to it.second,
-                    M1(it.first) to it.second,
+                    // M1(it.first) to it.second,
                 )
-            }.forEachPair { m, tests ->
-                tests.forEachPair { pos, expected ->
-                    m.sumRegion(pos[0],pos[1],pos[2],pos[3]).assertEqualTo(expected)
+            }.runTimedTests {
+                second.forEachPair { pos, expected ->
+                    first.sumRegion(pos[0],pos[1],pos[2],pos[3]).assertEqualTo(expected)
                 }
             }
-            /*
-            listOf(
-                M1()::someMethod,
-            ).runTimedTests {
-                invoke().assertEqualTo(Unit)
-            }
-            */
         }
     }
 

src/main/kotlin/_2022/_06/_20220618.kt

@@ -0,0 +1,30 @@
+@file:Suppress("DuplicatedCode", "ClassName")
+
+package _2022._06
+
+import Testable
+import utils.assertEqualTo
+import utils.runTimedTests
+
+fun main() {
+    Leetcode.test()
+}
+
+private interface Leetcode {
+
+    companion object : Testable {
+        override fun test() {
+            /*
+            listOf(
+                M1()::someMethod,
+            ).runTimedTests {
+                invoke().assertEqualTo(Unit)
+            }
+            */
+        }
+    }
+
+    private class M1 : Leetcode {
+
+    }
+}

src/main/kotlin/_2022/_06/_20220619.kt

@@ -102,32 +102,31 @@ inline fun<reified T, reified R> List<T>.runTimedTests(
     testName: String? = null,
     block: T.()->R
 ) {
-    var duration : Duration? = null
     try {
         firstOrNull()?.also {
             measureTime { it.block() }
             print("")
         }
-        forEach {
-            val duration = measureTime{ it.block() }
-            val prefix = if (testName.isNullOrEmpty()) "" else "${testName}."
-            if (printTime) println("execution for ${prefix} finished, took ${duration.inWholeNanoseconds} Nanoseconds")
-        }
-    } catch (e: Throwable) {
-
-    }  finally {
-
+    } catch (e: Exception) {
+        // Ignored
     }
 
-
-    firstOrNull()?.also {
-        measureTime { it.block() }
-        print("")
-    }
-    forEach {
-        val duration = measureTime{ it.block() }
-        val prefix = if (testName.isNullOrEmpty()) "" else "${testName}."
-        if (printTime) println("execution for ${prefix} finished, took ${duration.inWholeNanoseconds} Nanoseconds")
+    forEachIndexed { index, it ->
+        var duration : Duration? = null
+        try {
+            duration = measureTime { it.block() }
+        } catch (e: Exception) {
+            throw e
+        } finally {
+            val prefix = try {
+                if (testName.isNullOrEmpty()) {
+                    (Thread.currentThread().stackTrace.getOrNull(1) as StackTraceElement).className.split("$")[0]
+                } else null
+            } catch (e: Exception) {
+                null
+            } ?: testName
+            if (printTime) println("execution for ${prefix}@$index finished, took ${duration?.inWholeNanoseconds} Nanoseconds")
+        }
     }
 }