attempt to fix CI (2)

FormalLanguageConstrainedPathQuerying · May 29, 2024 · 11708cb · 11708cb
1 parent 8ea8512
commit 11708cb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,4 @@ bin/
 /benchmarks/src/main/kotlin/org/ucfs/*
 /benchmarks/src/main/java/org/ucfs/*
 /benchmarks/logs/
+/examples/src/main/java/java7/JavaLexer.java
diff --git a/benchmarks/README.md b/benchmarks/README.md
@@ -7,9 +7,10 @@
 (2) Antlr V4
 (3) Jflex
 ```
-
+## Generate files
+Run `/scripts/generate_all.sh`
 ## Run benchmarks
-Run script `run_bench.sh` stored in root folder
+Set data-set folder and parser mode in script `/scripts/run_bench.sh` and run it
 
 ## Logging
 

diff --git a/benchmarks/src/main/kotlin/org/RecoveryOfflineGll.kt b/benchmarks/src/main/kotlin/org/RecoveryOfflineGll.kt
@@ -3,13 +3,12 @@ package org
 import kotlinx.benchmark.*
 import org.ucfs.input.LinearInputLabel
 
-
 @State(Scope.Benchmark)
 class RecoveryOfflineGll : BaseBench() {
 
     @Benchmark
     fun measureGll(blackhole: Blackhole) {
-        val parser = org.ucfs.Java7RecoveryParser<Int, LinearInputLabel>()
+        val parser = org.ucfs.Java7ParserRecovery<Int, LinearInputLabel>()
         parser.input = getTokenStream(fileContents)
         blackhole.consume(parser.parse())
     }

diff --git a/examples/src/main/kotlin/java7/Generator.kt b/examples/src/main/kotlin/java7/Generator.kt
@@ -4,7 +4,6 @@ import org.ucfs.parser.RecoveryParserGenerator
 import java.nio.file.Path
 class Generator
 fun main(args: Array<String>){
-    println(args.contentToString())
     if(args.size != 1){
         throw IllegalArgumentException("Set first argument as path to generation")
     }

diff --git a/run_bench.sh → scripts/generate_all.sh b/run_bench.sh → scripts/generate_all.sh
@@ -27,16 +27,4 @@ cd $rootPrj
 
 printf "\nGenerate UCFS parser files at"
 echo $parserDest
-./gradlew :examples:run --args=$parserDest
-
-printf "\n\nRUN BENCHMARKS\n"
-mkdir benchmarks/logs
-for dataset in /home/olga/gllgen/java7/junit #/home/olga/gllgen/dataset_black_box/too_little
-do
-  for tool in Recovery #Antlr Online Offline
-  do
-    echo "running $tool on $dataset, start at $(date)"
-    ./gradlew benchmark -PtoolName=$tool -Pdataset=$dataset >> benchmarks/logs/stdout_$tool.txt 2>> benchmarks/logs/stderr_$tool.txt
-  done
-done
-
+./gradlew :examples:run --args=$parserDest
diff --git a/scripts/run_bench.sh b/scripts/run_bench.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+shopt -s nullglob     #ingore failed patterns
+rootPrj=$(pwd)
+
+printf "\n\nRUN BENCHMARKS\n"
+mkdir -p benchmarks/logs
+for dataset in #/home/olga/gllgen/java7/junit #/home/olga/gllgen/dataset_black_box/too_little
+do
+  for tool in Recovery #Antlr Online Offline
+  do
+    echo "running $tool on $dataset, start at $(date)"
+    ./gradlew benchmark -PtoolName=$tool -Pdataset=$dataset >> benchmarks/logs/stdout_$tool.txt 2>> benchmarks/logs/stderr_$tool.txt
+  done
+done