Update JVM toolchain to 17 and improve benchmarks

holgerbrandl · Nov 9, 2024 · b11ec1b · b11ec1b
1 parent 550f7dd
commit b11ec1b
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 29 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     api("io.github.oshai:kotlin-logging-jvm:6.0.9")
 
 //    api("org.jetbrains.kotlinx:dataframe-core:0.14.1")
-    api("com.github.holgerbrandl:kdfutils:1.4.3")
+    api("com.github.holgerbrandl:kdfutils:1.4.5")
 
     implementation("com.google.code.gson:gson:2.10.1")
 //    implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.21")
@@ -82,7 +82,7 @@ compileKotlin.compilerOptions {
 
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 

diff --git a/modules/animation/build.gradle.kts b/modules/animation/build.gradle.kts
@@ -166,5 +166,5 @@ signing {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
diff --git a/modules/benchmarks/.gitignore b/modules/benchmarks/.gitignore
@@ -1,3 +1,6 @@
 out
 build
+.gradle
+out
+build
 .gradle
diff --git a/modules/benchmarks/src/jmh/kotlin/org/kalasim/benchmarks/ERBenchmark.kt b/modules/benchmarks/src/jmh/kotlin/org/kalasim/benchmarks/ERBenchmark.kt
@@ -30,6 +30,44 @@ open class ERBenchmark {
 }
 
 
+@State(Scope.Benchmark)
+@Fork(1)
+@Warmup(iterations = 2)
+@Measurement(iterations = 5)
+@OutputTimeUnit(TimeUnit.SECONDS)
+@BenchmarkMode(Mode.AverageTime)
+open class ERLoggingBenchmark {
+
+//    var value: Double = 0.0
+//
+//    @Setup
+//    fun setUp(): Unit {
+//        value = 3.0
+//    }
+
+
+    @State(Scope.Benchmark)
+    open class ExecutionPlan {
+
+//        @Param("10", "20","30")
+//        var numFloors =
+
+        lateinit var sim: EmergencyRoom
+
+        @Setup(Level.Invocation)
+        fun setUp() {
+            sim = EmergencyRoom()
+        }
+    }
+
+    @Benchmark
+    fun measureER(execPlan: ExecutionPlan) {
+        execPlan.sim.run(30.days)
+    }
+
+}
+
+
 @State(Scope.Benchmark)
 @Fork(1)
 @Warmup(iterations = 2)

diff --git a/modules/kravis/build.gradle.kts b/modules/kravis/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
 dependencies {
     api(project(":"))
 
-    api("com.github.holgerbrandl:kravis:1.0.1")
+    api("com.github.holgerbrandl:kravis:1.0.2")
 
     testImplementation(kotlin("test"))
 }
@@ -73,5 +73,5 @@ signing {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
diff --git a/modules/letsplot/build.gradle.kts b/modules/letsplot/build.gradle.kts
@@ -75,5 +75,5 @@ signing {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
diff --git a/modules/logistics/build.gradle.kts b/modules/logistics/build.gradle.kts
@@ -85,5 +85,5 @@ signing {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
diff --git a/modules/notebook/build.gradle.kts b/modules/notebook/build.gradle.kts
@@ -77,5 +77,5 @@ signing {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
     out
     build
+    .gradle
+    out
+    build
     .gradle