From 69bbbeb24586daa2e1c32d0c796a188336b09498 Mon Sep 17 00:00:00 2001 From: Reiner Jung <reiner.jung@email.uni-kiel.de> Date: Wed, 22 Jun 2022 15:55:08 +0200 Subject: [PATCH] Renamed R_SCRIPT_DIR --- .../benchmark-kieker-days-ffi-remote.sh | 12 ++++++------ .../benchmark-kieker-days-ffi.sh | 12 ++++++------ .../benchmark-kieker-days-kieker.sh | 12 ++++++------ .../benchmark-kieker-days-ffi-remote.sh | 4 ++-- bin/2013-kieker-days/benchmark-kieker-days-ffi.sh | 12 ++++++------ .../benchmark-kieker-days-kieker-remote.sh | 4 ++-- bin/2013-kieker-days/benchmark-kieker-days-kieker.sh | 12 ++++++------ bin/2013-kieker-days/only_r.sh | 10 +++++----- bin/2014-icpe/benchmark-disk-writer.sh | 12 ++++++------ bin/2014-icpe/benchmark-tcp-kieker.sh | 12 ++++++------ frameworks/SPASSmeter/benchmark-tcp.sh | 2 +- 11 files changed, 52 insertions(+), 52 deletions(-) diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh index cd6233c..c14eaa6 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh @@ -4,7 +4,7 @@ JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/" REMOTEHOST="blade1" REMOTEBASEDIR="/localhome/ffi/" -RSCRIPTDIR=bin/icpe/r/ +R_SCRIPT_DIR=bin/icpe/r/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/" REMOTERESULTS_DIR="${REMOTEBASEDIR}tmp/results-benchmark-kieker-days-ffi/" @@ -202,7 +202,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -215,7 +215,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -226,7 +226,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -237,7 +237,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF # Bars R --vanilla --silent <<EOF @@ -251,7 +251,7 @@ results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 bars.minval=(${METHODTIME}/1000) bars.maxval=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}bar.r") +source("${R_SCRIPT_DIR}bar.r") EOF ## Clean up raw results diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh index b68109e..15eb8e0 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh @@ -2,7 +2,7 @@ JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/" -RSCRIPTDIR=bin/icpe/r/ +R_SCRIPT_DIR=bin/icpe/r/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/" @@ -191,7 +191,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -204,7 +204,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -215,7 +215,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -226,7 +226,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF # Bars R --vanilla --silent <<EOF @@ -240,7 +240,7 @@ results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 bars.minval=(${METHODTIME}/1000) bars.maxval=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}bar.r") +source("${R_SCRIPT_DIR}bar.r") EOF ## Clean up raw results diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh index c637b2c..b6a6240 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh @@ -2,7 +2,7 @@ JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/" -RSCRIPTDIR=bin/icpe/r/ +R_SCRIPT_DIR=bin/icpe/r/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-kieker/" @@ -235,7 +235,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -248,7 +248,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -259,7 +259,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -270,7 +270,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF # Bars R --vanilla --silent <<EOF @@ -284,7 +284,7 @@ results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 bars.minval=(${METHODTIME}/1000) bars.maxval=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}bar.r") +source("${R_SCRIPT_DIR}bar.r") EOF ## Clean up raw results diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh index 602d578..05ceba0 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh @@ -4,7 +4,7 @@ JAVABIN="" REMOTEHOST="ubuntu@10.50.0.4" REMOTEBASEDIR="/home/ubuntu/" -RSCRIPTDIR=bin/r-scripts/ +R_SCRIPT_DIR=bin/r-scripts/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/" REMOTERESULTS_DIR="${REMOTEBASEDIR}tmp/results-benchmark-kieker-days-ffi/" @@ -200,7 +200,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 -source("${RSCRIPTDIR}stats.r") +source("${R_SCRIPT_DIR}stats.r") EOF ## Clean up raw results diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh index b68109e..15eb8e0 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh @@ -2,7 +2,7 @@ JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/" -RSCRIPTDIR=bin/icpe/r/ +R_SCRIPT_DIR=bin/icpe/r/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/" @@ -191,7 +191,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -204,7 +204,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -215,7 +215,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -226,7 +226,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF # Bars R --vanilla --silent <<EOF @@ -240,7 +240,7 @@ results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 bars.minval=(${METHODTIME}/1000) bars.maxval=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}bar.r") +source("${R_SCRIPT_DIR}bar.r") EOF ## Clean up raw results diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh index 3974024..07ad1f4 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh @@ -4,7 +4,7 @@ JAVABIN="" REMOTEHOST="ubuntu@10.50.0.7" REMOTEBASEDIR="/home/ubuntu/" -RSCRIPTDIR=bin/r-scripts/ +R_SCRIPT_DIR=bin/r-scripts/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-kieker/" REMOTERESULTS_DIR="${REMOTEBASEDIR}tmp/results-benchmark-kieker-days-kieker/" @@ -219,7 +219,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 -source("${RSCRIPTDIR}stats.r") +source("${R_SCRIPT_DIR}stats.r") EOF ## Clean up raw results diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh index c637b2c..b6a6240 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh @@ -2,7 +2,7 @@ JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/" -RSCRIPTDIR=bin/icpe/r/ +R_SCRIPT_DIR=bin/icpe/r/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-kieker/" @@ -235,7 +235,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -248,7 +248,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -259,7 +259,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -270,7 +270,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF # Bars R --vanilla --silent <<EOF @@ -284,7 +284,7 @@ results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 bars.minval=(${METHODTIME}/1000) bars.maxval=(${METHODTIME}/1000)+40 -source("${RSCRIPTDIR}bar.r") +source("${R_SCRIPT_DIR}bar.r") EOF ## Clean up raw results diff --git a/bin/2013-kieker-days/only_r.sh b/bin/2013-kieker-days/only_r.sh index 7d89530..930d1fd 100644 --- a/bin/2013-kieker-days/only_r.sh +++ b/bin/2013-kieker-days/only_r.sh @@ -2,7 +2,7 @@ JAVABIN="" -RSCRIPTDIR=bin/r-scripts/ +R_SCRIPT_DIR=bin/r-scripts/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/ffi-exp/" @@ -26,7 +26,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=0 tsconf.max=25 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -39,7 +39,7 @@ configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} tsconf.min=0 tsconf.max=25 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -50,7 +50,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -61,5 +61,5 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF diff --git a/bin/2014-icpe/benchmark-disk-writer.sh b/bin/2014-icpe/benchmark-disk-writer.sh index cfad754..bd09aff 100644 --- a/bin/2014-icpe/benchmark-disk-writer.sh +++ b/bin/2014-icpe/benchmark-disk-writer.sh @@ -2,7 +2,7 @@ JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/" -RSCRIPTDIR=bin/icpe/r/ +R_SCRIPT_DIR=bin/icpe/r/ BASEDIR=./ RESULTS_DIR="${BASEDIR}tmp/results-benchmark-disk/" @@ -228,7 +228,7 @@ configs.colors=c("black","red","blue","green","purple","pink") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+200 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -241,7 +241,7 @@ configs.colors=c("black","red","blue","green","purple","pink") results.count=${TOTALCALLS} tsconf.min=(${METHODTIME}/1000) tsconf.max=(${METHODTIME}/1000)+200 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -252,7 +252,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3") configs.colors=c("black","red","blue","green","purple","pink") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -263,7 +263,7 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3") configs.colors=c("black","red","blue","green","purple","pink") results.count=${TOTALCALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF # Bars R --vanilla --silent <<EOF @@ -277,7 +277,7 @@ results.count=${TOTALCALLS} results.skip=${TOTALCALLS}/2 bars.minval=(${METHODTIME}/1000) bars.maxval=(${METHODTIME}/1000)+200 -source("${RSCRIPTDIR}bar.r") +source("${R_SCRIPT_DIR}bar.r") EOF ## Clean up raw results diff --git a/bin/2014-icpe/benchmark-tcp-kieker.sh b/bin/2014-icpe/benchmark-tcp-kieker.sh index 203df41..d26112e 100644 --- a/bin/2014-icpe/benchmark-tcp-kieker.sh +++ b/bin/2014-icpe/benchmark-tcp-kieker.sh @@ -2,7 +2,7 @@ JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/" -RSCRIPTDIR=bin/icpe/r/ +R_SCRIPT_DIR=bin/icpe/r/ BASEDIR=./ RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-tcp-kieker/" @@ -181,7 +181,7 @@ configs.colors=c("black","red","blue","green") results.count=${TOTAL_CALLS} tsconf.min=(${METHOD_TIME}/1000) tsconf.max=(${METHOD_TIME}/1000)+200 -source("${RSCRIPTDIR}timeseries.r") +source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average R --vanilla --silent <<EOF @@ -194,7 +194,7 @@ configs.colors=c("black","red","blue","green") results.count=${TOTAL_CALLS} tsconf.min=(${METHOD_TIME}/1000) tsconf.max=(${METHOD_TIME}/1000)+200 -source("${RSCRIPTDIR}timeseries-average.r") +source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput R --vanilla --silent <<EOF @@ -205,7 +205,7 @@ configs.recursion=c(${RECURSION_DEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer") configs.colors=c("black","red","blue","green") results.count=${TOTAL_CALLS} -source("${RSCRIPTDIR}throughput.r") +source("${R_SCRIPT_DIR}throughput.r") EOF # Throughput-Average R --vanilla --silent <<EOF @@ -216,7 +216,7 @@ configs.recursion=c(${RECURSION_DEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer") configs.colors=c("black","red","blue","green") results.count=${TOTAL_CALLS} -source("${RSCRIPTDIR}throughput-average.r") +source("${R_SCRIPT_DIR}throughput-average.r") EOF # Bars R --vanilla --silent <<EOF @@ -230,7 +230,7 @@ results.count=${TOTAL_CALLS} results.skip=${TOTAL_CALLS}/2 bars.minval=(${METHOD_TIME}/1000) bars.maxval=(${METHOD_TIME}/1000)+200 -source("${RSCRIPTDIR}bar.r") +source("${R_SCRIPT_DIR}bar.r") EOF ## Clean up raw results diff --git a/frameworks/SPASSmeter/benchmark-tcp.sh b/frameworks/SPASSmeter/benchmark-tcp.sh index 61608b3..68616f9 100644 --- a/frameworks/SPASSmeter/benchmark-tcp.sh +++ b/frameworks/SPASSmeter/benchmark-tcp.sh @@ -3,7 +3,7 @@ JAVABIN="" -RSCRIPTDIR=r/ +R_SCRIPT_DIR=r/ BASEDIR=./ RESULTS_DIR="${BASE_DIR}/tmp/results-spassmeter/" -- GitLab