* replace intersection login into other object

* replace Java7 sources in `examples` subproject
* update `bench_run.sh` script for independent generation and running

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Generate files
         run: |
-          ./benchmarks/generate.sh
+          ./run_bench
 
       - name: Build with Gradle
         uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0

.gitignore

@@ -52,8 +52,6 @@ out/
 hs_err_pid*
 
 .gradle
-build/
-out/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
@@ -90,5 +88,6 @@ bin/
 /gen/
 /benchmarks/src/main/java/org/antlr/*
 !/benchmarks/src/main/java/org/antlr/Java8.g4
-/benchmarks/src/main/kotlin/org/ucfs/Java8Parser.kt
-/benchmarks/src/main/java/org/ucfs/JavaLexer.java
+/benchmarks/src/main/kotlin/org/ucfs/*
+/benchmarks/src/main/java/org/ucfs/*
+/benchmarks/logs/

benchmarks/README.md

@@ -8,43 +8,11 @@
 (3) Jflex
 ```
 
-## Build project 
-
-#### Step 1. Clone repository
-
-`git clone https://github.com/cyb3r-b4stard/UCFSBenchmarks.git`
-
-or
-
-`git@github.com:cyb3r-b4stard/UCFSBenchmarks.git`
-
-or
-
-`gh repo clone cyb3r-b4stard/UCFSBenchmarks`
-
-#### Step 2. Go to the project folder
-
-`cd UCFSBenchmarks`
-
-#### Step 3. Install dependencies
-
-`./ucfs_install.sh`
-
-#### Step 4. Build project
-
-`./ucfs_build.sh`
-
-## Execute Benchmarks
-
-#### Step 1. Run benchmarks
-
-`./ucfs_bench.sh`
+## Run benchmarks
+Run script `run_bench.sh` stored in root folder
 
 ## Logging
 
-Logs are stored in build/libs/Benchmarks.log
-
-## Results
+Logs are stored in `logs`
 
-After executing all benchmarks, results file will be located in the `/build` folder
-under name `results.csv`. That file shall be transfered back to Ivan Lomikovskiy
+Results are stored in  `build/reports/benchmarks`

benchmarks/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     // 1. for ucfs
     implementation(project(":solver"))
     implementation(project(":generator"))
-
+    implementation(project(":examples"))
     // 2. for java_cup (?)
     implementation("java_cup:java_cup:0.9e")
     // 3. for antlr
@@ -36,49 +36,39 @@ fun getArgs(strFolder: String): Array<String> {
     val files = resourcesDir.listFiles()!!
     return files.map { it.toString() }.sorted().toTypedArray()
 }
+
 benchmark {
     configurations {
-        named("main") {}
-        targets {
-            register("main")
+        named("main") {
+            val dataset = "dataset"
+            if (!hasProperty(dataset)) {
+                println("BENCHMARKS FAILED! Set dataset folder by property '$dataset'")
+            }
+            else{
+                param("fileName", *getArgs(property(dataset).toString()))
+            }
+            this.reportFormat = "csv"
+            iterations = 15
+            iterationTime = 1000
+            iterationTimeUnit = "ms"
+            warmups = 5
+            outputTimeUnit = "ms"
+            mode = "avgt"
+            val tools = "toolName"
+            if (hasProperty(tools)) {
+                println("Run benchmarks for: .*${property(tools)}.*")
+                include(".*${property(tools)}.*")
+            }
+
         }
     }
+    targets {
+        register("main")
+    }
 }
-//benchmark {
-//    configurations {
-//        named("main") {
-//            val dataset = "dataset"
-//            if (!hasProperty(dataset)) {
-//                println("Error! Set dataset folder by property '$dataset'")
-//                throw Exception("Error! Set dataset folder by property '$dataset'")
-//            }
-//            param("fileName", *getArgs(property(dataset).toString()))
-//            this.reportFormat = "csv"
-//            iterations = 15
-//            iterationTime = 1000
-//            iterationTimeUnit = "ms"
-//            warmups = 5
-//            outputTimeUnit = "ms"
-//            mode = "avgt"
-//            val tools = "toolName"
-//            if (hasProperty(tools)) {
-//                println("Run benchmarks for: .*${property(tools)}.*")
-//                include(".*${property(tools)}.*")
-//            }
-//
-//        }
-//    }
-//    targets {
-//        register("main")
-//    }
-//}
-
 
 allOpen {
     annotation("org.openjdk.jmh.annotations.State")
 }
 
-kotlin { jvmToolchain(11) }
-
-
-
+kotlin { jvmToolchain(11) }