diff --git a/.gitignore b/.gitignore index 6b6d7a15350d68d9ef903a26c72265d7930b4c14..15a6694a71dc5448558ae225fcdcb3ea01916c41 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ logs/ out/ /events*.csv +/results/ diff --git a/all-timed-benchmark.sh b/all-timed-benchmark.sh index b004deba1a86e803633966df31d6e1f8e14ccf5d..2663eb9dbd5f1b181c0fb80c91780a7806a1bc08 100755 --- a/all-timed-benchmark.sh +++ b/all-timed-benchmark.sh @@ -10,4 +10,4 @@ for size in 8 16 32 64 128; do done done echo "Tool;View;ChangeSet;RunIndex;Iteration;PhaseName;MetricName;MetricValue" > "results/merged-${now}.csv" -cat "results/results-${now}-*" >> "results/merged-${now}.csv" +cat results/results-${now}-* >> "results/merged-${now}.csv" diff --git a/solve/gradle-parts/01-inc-incremental.gradle b/solve/gradle-parts/01-inc-incremental.gradle index 39e8592f3522865dbc23662decfd64dfa0302dee..3a5a18a9a3fdfff9d7588e45fa5d00eba681191b 100644 --- a/solve/gradle-parts/01-inc-incremental.gradle +++ b/solve/gradle-parts/01-inc-incremental.gradle @@ -2,6 +2,6 @@ project.ext.extraJastAddOptions = [ '--lineColumnNumbers', '--cache=all', "--flush=api", - "--incremental=param,debug", + "--incremental=param", "--tracing=api", ] diff --git a/timedBenchmark.sh b/timedBenchmark.sh index c734c78952b6c92c4b67bffa7d1b5381e0ad364d..5f3771f5ee756797f06309cccb80dc0aa9b1394c 100755 --- a/timedBenchmark.sh +++ b/timedBenchmark.sh @@ -2,4 +2,4 @@ project=$1 query=$2 size=$3 -ChangeSet=$size ChangePath=solve/src/test/resources/models/$size/ Sequences=20 Query=Q$query java -jar "$project/build/libs/solve-1.0-SNAPSHOT.jar" +Tool=$project RunIndex=0 ChangeSet=$size ChangePath=solve/src/test/resources/models/$size/ Sequences=20 Query=Q$query java -jar "$project/build/libs/solve-1.0-SNAPSHOT.jar"