From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 23 Sep 2011 14:27:40 +0000 (+0200)
Subject: In make_params, extract common options from template file.
X-Git-Tag: exp_20120216~40
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/9697f93d664e3bce7ec34e334a9488ccaa3ff685

In make_params, extract common options from template file.
---

diff --git a/Experimentations/ag_parameters b/Experimentations/ag_parameters
index de7856f..9906b5e 100644
--- a/Experimentations/ag_parameters
+++ b/Experimentations/ag_parameters
@@ -39,7 +39,7 @@ LOAD=-1000
 DEADLINE=10000
 
 # optional: additional arguments for loba (default: empty)
-#MORE_ARGS=( -r 42 )
+MORE_ARGS=( -x4 -m1e-4 -M10 )
 
 # optional: path to binary (default: ./loba)
 #LOBA=./loba
diff --git a/Experimentations/make_params b/Experimentations/make_params
index d2098c9..dd7e201 100755
--- a/Experimentations/make_params
+++ b/Experimentations/make_params
@@ -16,10 +16,13 @@ die() {
 
 test -r "$TEMPLATE" || die "file not found: $TEMPLATE"
 
+source "$TEMPLATE" || die "cannot read file: $TEMPLATE"
+declare -a common_opts=( "${MORE_ARGS[@]}" )
+
 for flavour in "I" "R"; do
     for distrib in "1" "N"; do
         for ratio in "1000:1" "100:1" "10:1" "1:1" "1:10" "1:100" "1:1000"; do
-            declare -a opts=( -x4 -m1e-4 -M10 )
+            declare -a opts=( "${common_opts[@]}" )
             case "$flavour" in
                 "I") opts+=( -Z ) ;;
                 "R") : ;;