In make_params, extract common options from template file.

diff --git a/Experimentations/ag_parameters b/Experimentations/ag_parameters
index de7856fc4cc8386d3c46b4fa3f97a220a6036389..9906b5ee1c79724261c19f943eb28afc8dbc40bb 100644 (file)
--- a/Experimentations/ag_parameters
+++ b/Experimentations/ag_parameters
@@ -39,7 +39,7 @@ LOAD=-1000
 DEADLINE=10000
 
 # optional: additional arguments for loba (default: empty)
 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
 
 # optional: path to binary (default: ./loba)
 #LOBA=./loba

diff --git a/Experimentations/make_params b/Experimentations/make_params
index d2098c9dd54263aa2be00aef403d72858d9c7a16..dd7e201c1a473c9cf0e3be610cfdd8b427e67959 100755 (executable)
--- a/Experimentations/make_params
+++ b/Experimentations/make_params
@@ -16,10 +16,13 @@ die() {
 
 test -r "$TEMPLATE" || die "file not found: $TEMPLATE"
 
 
 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
 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") : ;;
             case "$flavour" in
                 "I") opts+=( -Z ) ;;
                 "R") : ;;