Improved Lushu test measurements

lac-dcc · Nov 10, 2023 · d7c6f47 · d7c6f47
1 parent 9c976eb
commit d7c6f47
Show file tree

Hide file tree

Showing 52 changed files with 122 additions and 103 deletions.
diff --git a/Lushu/build.gradle.kts b/Lushu/build.gradle.kts
@@ -41,6 +41,7 @@ fun newJarTask(
 ): Task {
     return task(name, type = Jar::class) {
         description = desc
+        archiveBaseName.set(name.substring(0, name.length - 3))
         manifest {
             attributes(manifestAttributes)
         }

diff --git a/Lushu/src/main/kotlin/lushu/TestApps/StressTest/Context/WithLushu/App.kt b/Lushu/src/main/kotlin/lushu/TestApps/StressTest/Context/WithLushu/App.kt
@@ -6,6 +6,8 @@ import java.io.File
 import kotlin.system.measureTimeMillis
 
 fun main(args: Array<String>) {
+    val runtime = Runtime.getRuntime()
+
     if (args.size < 4) {
         println(
             "Usage: <this-program> <merger-config-file>\n" +
@@ -26,13 +28,14 @@ fun main(args: Array<String>) {
         var file = File(patternsFilePath)
         grammar.trainMap(file)
     }
+
     var time: Long = 0
     time = measureTimeMillis {
+
         grammar.testMap(testFilePath, outputFilePath)
     }
-    val runtime = Runtime.getRuntime()
-    val memory = (runtime.totalMemory() - runtime.freeMemory())
-
+    val totalMemory = runtime.totalMemory()
+    val usedMemory = totalMemory - runtime.freeMemory()
     System.err.println("$time")
-    System.err.println("$memory")
+    System.err.println("$usedMemory")
 }
diff --git a/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestMemory.png b/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestMemory.png
diff --git a/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestMemoryBS.jpg b/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestMemoryBS.jpg
diff --git a/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestTime.png b/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestTime.png
diff --git a/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestTimeBS.jpg b/test/context_tests/compare_to_beautifulsoup/stress_test/StressTestTimeBS.jpg
diff --git a/test/context_tests/compare_to_comby/analysis.ipynb b/test/context_tests/compare_to_comby/analysis.ipynb
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1-0 b/test/context_tests/compare_to_comby/results/Lushu/1-0
@@ -1,2 +1,2 @@
-3
-4501008
+4
+20745816
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1-1 b/test/context_tests/compare_to_comby/results/Lushu/1-1
@@ -1,2 +1,2 @@
-2
-4500864
+4
+20749096
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1-2 b/test/context_tests/compare_to_comby/results/Lushu/1-2
@@ -1,2 +1,2 @@
-2
-4500864
+4
+20889472
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1-3 b/test/context_tests/compare_to_comby/results/Lushu/1-3
@@ -1,2 +1,2 @@
-2
-4500864
+4
+13411864
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1-4 b/test/context_tests/compare_to_comby/results/Lushu/1-4
@@ -1,2 +1,2 @@
-1
-4500656
+3
+14424312
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10-0 b/test/context_tests/compare_to_comby/results/Lushu/10-0
@@ -1,2 +1,2 @@
-4
-4500800
+7
+21043376
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10-1 b/test/context_tests/compare_to_comby/results/Lushu/10-1
@@ -1,2 +1,2 @@
-3
-4500656
+6
+9148904
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10-2 b/test/context_tests/compare_to_comby/results/Lushu/10-2
@@ -1,2 +1,2 @@
-3
-4500488
+9
+14686304
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10-3 b/test/context_tests/compare_to_comby/results/Lushu/10-3
@@ -1,2 +1,2 @@
-3
-4501008
+9
+6191848
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10-4 b/test/context_tests/compare_to_comby/results/Lushu/10-4
@@ -1,2 +1,2 @@
-2
-4500864
+9
+20924896
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100-0 b/test/context_tests/compare_to_comby/results/Lushu/100-0
@@ -1,2 +1,2 @@
-20
-4504608
+54
+5935768
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100-1 b/test/context_tests/compare_to_comby/results/Lushu/100-1
@@ -1,2 +1,2 @@
-21
-4504248
+39
+15548392
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100-2 b/test/context_tests/compare_to_comby/results/Lushu/100-2
@@ -1,2 +1,2 @@
-13
-4504000
+51
+8880800
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100-3 b/test/context_tests/compare_to_comby/results/Lushu/100-3
@@ -1,2 +1,2 @@
-21
-4504392
+53
+6897920
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100-4 b/test/context_tests/compare_to_comby/results/Lushu/100-4
@@ -1,2 +1,2 @@
-16
-4504080
+55
+6913968
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000-0 b/test/context_tests/compare_to_comby/results/Lushu/1000-0
@@ -1,2 +1,2 @@
-85
-4506488
+218
+8084176
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000-1 b/test/context_tests/compare_to_comby/results/Lushu/1000-1
@@ -1,2 +1,2 @@
-60
-4504760
+200
+23665712
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000-2 b/test/context_tests/compare_to_comby/results/Lushu/1000-2
@@ -1,2 +1,2 @@
-53
-4504840
+231
+13275944
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000-3 b/test/context_tests/compare_to_comby/results/Lushu/1000-3
@@ -1,2 +1,2 @@
-73
-4505112
+178
+22647728
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000-4 b/test/context_tests/compare_to_comby/results/Lushu/1000-4
@@ -1,2 +1,2 @@
-70
-4505824
+193
+22634592
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000-0 b/test/context_tests/compare_to_comby/results/Lushu/10000-0
@@ -1,2 +1,2 @@
-230
-4507552
+691
+40646688
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000-1 b/test/context_tests/compare_to_comby/results/Lushu/10000-1
@@ -1,2 +1,2 @@
-213
-4506760
+734
+27910512
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000-2 b/test/context_tests/compare_to_comby/results/Lushu/10000-2
@@ -1,2 +1,2 @@
-242
-4507272
+760
+21787712
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000-3 b/test/context_tests/compare_to_comby/results/Lushu/10000-3
@@ -1,2 +1,2 @@
-230
-4507480
+857
+53226384
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000-4 b/test/context_tests/compare_to_comby/results/Lushu/10000-4
@@ -1,2 +1,2 @@
-236
-4507480
+671
+97106976
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100000-0 b/test/context_tests/compare_to_comby/results/Lushu/100000-0
@@ -1,2 +1,2 @@
-1555
-4507040
+4339
+86115376
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100000-1 b/test/context_tests/compare_to_comby/results/Lushu/100000-1
@@ -1,2 +1,2 @@
-1424
-4507112
+4029
+87379536
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100000-2 b/test/context_tests/compare_to_comby/results/Lushu/100000-2
@@ -1,2 +1,2 @@
-1492
-4507760
+3866
+27392048
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100000-3 b/test/context_tests/compare_to_comby/results/Lushu/100000-3
@@ -1,2 +1,2 @@
-1640
-4507320
+3888
+40063552
diff --git a/test/context_tests/compare_to_comby/results/Lushu/100000-4 b/test/context_tests/compare_to_comby/results/Lushu/100000-4
@@ -1,2 +1,2 @@
-1473
-4506800
+3792
+53654576
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000000-0 b/test/context_tests/compare_to_comby/results/Lushu/1000000-0
@@ -1,2 +1,2 @@
-16941
-4507312
+35522
+131937152
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000000-1 b/test/context_tests/compare_to_comby/results/Lushu/1000000-1
@@ -1,2 +1,2 @@
-14805
-4507864
+38970
+76254048
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000000-2 b/test/context_tests/compare_to_comby/results/Lushu/1000000-2
@@ -1,2 +1,2 @@
-15097
-4507880
+47122
+9093184
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000000-3 b/test/context_tests/compare_to_comby/results/Lushu/1000000-3
@@ -1,2 +1,2 @@
-13186
-4507424
+37979
+23731808
diff --git a/test/context_tests/compare_to_comby/results/Lushu/1000000-4 b/test/context_tests/compare_to_comby/results/Lushu/1000000-4
@@ -1,2 +1,2 @@
-14818
-4507520
+37154
+58330672
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000000-0 b/test/context_tests/compare_to_comby/results/Lushu/10000000-0
@@ -1,2 +1,2 @@
-158779
-4507416
+239249
+95039024
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000000-1 b/test/context_tests/compare_to_comby/results/Lushu/10000000-1
@@ -1,2 +1,2 @@
-148593
-4507416
+167604
+58400864
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000000-2 b/test/context_tests/compare_to_comby/results/Lushu/10000000-2
@@ -1,2 +1,2 @@
-164726
-4507760
+165382
+144452704
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000000-3 b/test/context_tests/compare_to_comby/results/Lushu/10000000-3
@@ -1,2 +1,2 @@
-166293
-4508136
+163725
+114485328
diff --git a/test/context_tests/compare_to_comby/results/Lushu/10000000-4 b/test/context_tests/compare_to_comby/results/Lushu/10000000-4
@@ -1,2 +1,2 @@
-155655
-4507616
+136982
+146422352
diff --git a/test/context_tests/compare_to_comby/stress_test/StressTestMemory.png b/test/context_tests/compare_to_comby/stress_test/StressTestMemory.png
diff --git a/test/context_tests/compare_to_comby/stress_test/StressTestMemoryC.jpg b/test/context_tests/compare_to_comby/stress_test/StressTestMemoryC.jpg
diff --git a/test/context_tests/compare_to_comby/stress_test/StressTestTime.png b/test/context_tests/compare_to_comby/stress_test/StressTestTime.png
diff --git a/test/context_tests/compare_to_comby/stress_test/StressTestTimeC.jpg b/test/context_tests/compare_to_comby/stress_test/StressTestTimeC.jpg
diff --git a/...ess_test/run_lushu_woJVM_htmlfile copy.sh → ...s/stress_test/run_lushu_woJVM_htmlfile.sh b/...ess_test/run_lushu_woJVM_htmlfile copy.sh → ...s/stress_test/run_lushu_woJVM_htmlfile.sh