modif expe raph

[loba.git] / Experimentations / make_params

diff --git a/Experimentations/make_params b/Experimentations/make_params
index f034186db8a9e0e9424e79d0b5959fef9801ec14..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=( )
+            declare -a opts=( "${common_opts[@]}" )

             case "$flavour" in
                 "I") opts+=( -Z ) ;;
                 "R") : ;;
             case "$flavour" in
                 "I") opts+=( -Z ) ;;
                 "R") : ;;


@@ -31,7 +34,6 @@ for flavour in "I" "R"; do
                 *) die "unknown distribution: $distrib" ;;
             esac
             case "$ratio" in
                 *) die "unknown distribution: $distrib" ;;
             esac
             case "$ratio" in

-                *100*)    continue ;; ##### HACK, FIXME #####

                 "1000:1") opts+=( -c1e6,0 -C1.25e2,0 ) ;;
                 "100:1")  opts+=( -c1e6,0 -C1.25e3,0 ) ;;
                 "10:1")   opts+=( -c1e6,0 -C1.25e4,0 ) ;;
                 "1000:1") opts+=( -c1e6,0 -C1.25e2,0 ) ;;
                 "100:1")  opts+=( -c1e6,0 -C1.25e3,0 ) ;;
                 "10:1")   opts+=( -c1e6,0 -C1.25e4,0 ) ;;