From f5198d6fe808b0a723e5f30534d78f45fe96e4ad Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 23 Apr 2021 18:34:05 +0200
Subject: [PATCH] further improvements
- fix error in benchmark scripts
- set more needed env variables
- disable incremental-debug
- ignore results directory for git
---
.gitignore | 1 +
all-timed-benchmark.sh | 2 +-
solve/gradle-parts/01-inc-incremental.gradle | 2 +-
timedBenchmark.sh | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6b6d7a1..15a6694 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 b004deb..2663eb9 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 39e8592..3a5a18a 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 c734c78..5f3771f 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"
--
GitLab