From a4d181eb97bb633d576bfd6dd31e23673144faeb Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tgomes@fc.up.pt>
Date: Wed, 23 May 2012 12:40:34 +0100
Subject: [PATCH] update benchmarks

---
 packages/CLPBN/clpbn/bp/benchmarks/benchs.sh  |  6 +++---
 .../clpbn/bp/benchmarks/city/bp_tests.sh      | 19 +++++++++++++----
 .../clpbn/bp/benchmarks/city/cbp_tests.sh     | 17 ++++++++++++---
 .../clpbn/bp/benchmarks/city/fove_tests.sh    | 17 ++++++++++++---
 .../clpbn/bp/benchmarks/city/hve_tests.sh     | 19 +++++++++++++----
 .../bp/benchmarks/comp_workshops/bp_tests.sh  |  9 ++++++++
 .../bp/benchmarks/comp_workshops/cbp_tests.sh |  8 +++++++
 .../clpbn/bp/benchmarks/comp_workshops/cw.sh  |  1 -
 .../benchmarks/comp_workshops/fove_tests.sh   |  8 +++++++
 .../bp/benchmarks/comp_workshops/hve_tests.sh |  8 +++++++
 .../clpbn/bp/benchmarks/smokers/bp_tests.sh   | 21 +++++++++++++------
 .../clpbn/bp/benchmarks/smokers/cbp_tests.sh  | 21 +++++++++++++------
 .../clpbn/bp/benchmarks/smokers/fove_tests.sh | 21 +++++++++++++------
 .../clpbn/bp/benchmarks/smokers/hve_tests.sh  | 21 +++++++++++++------
 .../CLPBN/clpbn/bp/benchmarks/smokers/sm.sh   |  2 +-
 .../bp/benchmarks/workshop_attrs/bp_tests.sh  | 15 +++++++++++++
 .../bp/benchmarks/workshop_attrs/cbp_tests.sh | 14 +++++++++++++
 .../benchmarks/workshop_attrs/fove_tests.sh   | 14 +++++++++++++
 .../bp/benchmarks/workshop_attrs/hve_tests.sh | 14 +++++++++++++
 19 files changed, 212 insertions(+), 43 deletions(-)

diff --git a/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh b/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh
index 6bcc32abf..7ceb25cef 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh
@@ -30,7 +30,7 @@ function run_solver
       echo "unknow flag $2"
     fi
   fi
-  /usr/bin/time -o $LOG_FILE -a -f "real:%e\tuser:%U\tsys:%S\tmem:%MkB" \
+  /usr/bin/time -o $LOG_FILE -a -f "%U\t%S\t%e\t%M" \
       $YAP << EOF >> $LOG_FILE &>> ignore.$LOG_FILE
 nogc.
 [$NETWORK].
@@ -40,7 +40,7 @@ clpbn_horus:set_horus_flag(use_logarithms, true).
 clpbn_horus:set_horus_flag(verbosity, 1).
 $solver_flag.
 $QUERY.
-open("$LOG_FILE", 'append', S), format(S, '$constraint: ~15+ ', []), close(S).
+open("$LOG_FILE", 'append', S), format(S, '$constraint ~15+ ', []), close(S).
 EOF
 }
 
@@ -65,7 +65,7 @@ function write_header
 {
   echo -n "****************************************" >> $LOG_FILE
   echo    "****************************************" >> $LOG_FILE
-  echo    "results for solver $1"                >> $LOG_FILE
+  echo    "results for solver $1 user(s) sys(s) real(s), mem(kB)" >> $LOG_FILE
   echo -n "****************************************" >> $LOG_FILE
   echo    "****************************************" >> $LOG_FILE
 }
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/city/bp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/city/bp_tests.sh
index 33f48c389..cfd74d818 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/city/bp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/city/bp_tests.sh
@@ -11,14 +11,25 @@ function run_all_graphs
   run_solver city1000     $2
   run_solver city5000     $2
   run_solver city10000    $2
+  run_solver city15000    $2
   run_solver city20000    $2
+  run_solver city25000    $2
   run_solver city30000    $2
+  run_solver city35000    $2
   run_solver city40000    $2
+  run_solver city45000    $2
   run_solver city50000    $2
-  #run_solver city100000   $2
-  # > 24h
-  #run_solver city500000   $2
-  #run_solver city1000000  $2
+  run_solver city55000    $2
+  run_solver city60000    $2
+  run_solver city65000    $2
+  return
+  run_solver city70000    $2
+  run_solver city75000    $2
+  run_solver city80000    $2
+  run_solver city85000    $2
+  run_solver city90000    $2
+  run_solver city95000    $2
+  run_solver city100000   $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/city/cbp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/city/cbp_tests.sh
index e43bcb1f3..dd9868ae2 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/city/cbp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/city/cbp_tests.sh
@@ -11,13 +11,24 @@ function run_all_graphs
   run_solver city1000     $2
   run_solver city5000     $2
   run_solver city10000    $2
+  run_solver city15000    $2
   run_solver city20000    $2
+  run_solver city25000    $2
   run_solver city30000    $2
+  run_solver city35000    $2
   run_solver city40000    $2
+  run_solver city45000    $2
   run_solver city50000    $2
-  #run_solver city100000   $2
-  #run_solver city500000   $2
-  #run_solver city1000000  $2
+  run_solver city55000    $2
+  run_solver city60000    $2
+  run_solver city65000    $2
+  run_solver city70000    $2
+  run_solver city75000    $2
+  run_solver city80000    $2
+  run_solver city85000    $2
+  run_solver city90000    $2
+  run_solver city95000    $2
+  run_solver city100000   $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/city/fove_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/city/fove_tests.sh
index 1ae343345..149d3b332 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/city/fove_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/city/fove_tests.sh
@@ -11,13 +11,24 @@ function run_all_graphs
   run_solver city1000     $2
   run_solver city5000     $2
   run_solver city10000    $2
+  run_solver city15000    $2
   run_solver city20000    $2
+  run_solver city25000    $2
   run_solver city30000    $2
+  run_solver city35000    $2
   run_solver city40000    $2
+  run_solver city45000    $2
   run_solver city50000    $2
-  #run_solver city100000   $2
-  #run_solver city500000   $2
-  #run_solver city1000000  $2
+  run_solver city55000    $2
+  run_solver city60000    $2
+  run_solver city65000    $2
+  run_solver city70000    $2
+  run_solver city75000    $2
+  run_solver city80000    $2
+  run_solver city85000    $2
+  run_solver city90000    $2
+  run_solver city95000    $2
+  run_solver city100000   $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/city/hve_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/city/hve_tests.sh
index 42eb6b239..1893d21ab 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/city/hve_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/city/hve_tests.sh
@@ -11,14 +11,25 @@ function run_all_graphs
   run_solver city1000     $2
   run_solver city5000     $2
   run_solver city10000    $2
+  run_solver city15000    $2
   run_solver city20000    $2
+  run_solver city25000    $2
   run_solver city30000    $2
+  run_solver city35000    $2
   run_solver city40000    $2
+  run_solver city45000    $2
   run_solver city50000    $2
-  #run_solver city100000   $2
-  # > 24h
-  #run_solver city500000   $2
-  #run_solver city1000000  $2
+  run_solver city55000    $2
+  run_solver city60000    $2
+  run_solver city65000    $2
+  run_solver city70000    $2
+
+  run_solver city75000    $2
+  run_solver city80000    $2
+  run_solver city85000    $2
+  run_solver city90000    $2
+  run_solver city95000    $2
+  run_solver city100000   $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh
index 4cabcb531..6120edf5d 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh
@@ -11,10 +11,19 @@ function run_all_graphs
   run_solver p1000w$N_WORKSHOPS   $2
   run_solver p5000w$N_WORKSHOPS   $2
   run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p15000w$N_WORKSHOPS  $2
   run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p25000w$N_WORKSHOPS  $2
+  return
   run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p35000w$N_WORKSHOPS  $2
   run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p45000w$N_WORKSHOPS  $2
   run_solver p50000w$N_WORKSHOPS  $2
+  run_solver p55000w$N_WORKSHOPS  $2
+  run_solver p60000w$N_WORKSHOPS  $2
+  run_solver p65000w$N_WORKSHOPS  $2
+  run_solver p70000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh
index 01b620c83..26b5fc5ad 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh
@@ -11,10 +11,18 @@ function run_all_graphs
   run_solver p1000w$N_WORKSHOPS   $2
   run_solver p5000w$N_WORKSHOPS   $2
   run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p15000w$N_WORKSHOPS  $2
   run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p25000w$N_WORKSHOPS  $2
   run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p35000w$N_WORKSHOPS  $2
   run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p45000w$N_WORKSHOPS  $2
   run_solver p50000w$N_WORKSHOPS  $2
+  run_solver p55000w$N_WORKSHOPS  $2
+  run_solver p60000w$N_WORKSHOPS  $2
+  run_solver p65000w$N_WORKSHOPS  $2
+  run_solver p70000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cw.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cw.sh
index 3f805f33c..cf5c8215b 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cw.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cw.sh
@@ -4,6 +4,5 @@ NETWORK="'../../examples/comp_workshops'"
 SHORTNAME="cw"
 QUERY="series(X)"
 
-
 N_WORKSHOPS=10
 
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh
index f280f7814..68e0c8d07 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh
@@ -11,10 +11,18 @@ function run_all_graphs
   run_solver p1000w$N_WORKSHOPS   $2
   run_solver p5000w$N_WORKSHOPS   $2
   run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p15000w$N_WORKSHOPS  $2
   run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p25000w$N_WORKSHOPS  $2
   run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p35000w$N_WORKSHOPS  $2
   run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p45000w$N_WORKSHOPS  $2
   run_solver p50000w$N_WORKSHOPS  $2
+  run_solver p55000w$N_WORKSHOPS  $2
+  run_solver p60000w$N_WORKSHOPS  $2
+  run_solver p65000w$N_WORKSHOPS  $2
+  run_solver p70000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh
index a0f2f3d34..3fa724e96 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh
@@ -11,10 +11,18 @@ function run_all_graphs
   run_solver p1000w$N_WORKSHOPS   $2
   run_solver p5000w$N_WORKSHOPS   $2
   run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p15000w$N_WORKSHOPS  $2
   run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p25000w$N_WORKSHOPS  $2
   run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p35000w$N_WORKSHOPS  $2
   run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p45000w$N_WORKSHOPS  $2
   run_solver p50000w$N_WORKSHOPS  $2
+  run_solver p55000w$N_WORKSHOPS  $2
+  run_solver p60000w$N_WORKSHOPS  $2
+  run_solver p65000w$N_WORKSHOPS  $2
+  run_solver p70000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/smokers/bp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/smokers/bp_tests.sh
index 1c43c5fa8..65891401e 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/smokers/bp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/smokers/bp_tests.sh
@@ -8,12 +8,21 @@ SOLVER="bp"
 function run_all_graphs
 {
   write_header $1
-  run_solver pop25   $2
-  run_solver pop50   $2
-  run_solver pop75   $2
-  run_solver pop100  $2
-  run_solver pop125  $2
-  run_solver pop150  $2
+  run_solver pop100   $2
+  run_solver pop200   $2
+  run_solver pop300   $2
+  run_solver pop400   $2
+  run_solver pop500   $2
+  run_solver pop600   $2
+  run_solver pop700   $2
+  run_solver pop800   $2
+  run_solver pop900   $2
+  run_solver pop1000  $2
+  run_solver pop1100  $2
+  run_solver pop1200  $2
+  run_solver pop1300  $2
+  run_solver pop1400  $2
+  run_solver pop1500  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/smokers/cbp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/smokers/cbp_tests.sh
index 26fc85f6f..169a90bf6 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/smokers/cbp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/smokers/cbp_tests.sh
@@ -8,12 +8,21 @@ SOLVER="cbp"
 function run_all_graphs
 {
   write_header $1
-  run_solver pop25   $2
-  run_solver pop50   $2
-  run_solver pop75   $2
-  run_solver pop100  $2
-  run_solver pop125  $2
-  run_solver pop150  $2
+  run_solver pop100   $2
+  run_solver pop200   $2
+  run_solver pop300   $2
+  run_solver pop400   $2
+  run_solver pop500   $2
+  run_solver pop600   $2
+  run_solver pop700   $2
+  run_solver pop800   $2
+  run_solver pop900   $2
+  run_solver pop1000  $2
+  run_solver pop1100  $2
+  run_solver pop1200  $2
+  run_solver pop1300  $2
+  run_solver pop1400  $2
+  run_solver pop1500  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/smokers/fove_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/smokers/fove_tests.sh
index f0dc5c093..d36f9fd46 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/smokers/fove_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/smokers/fove_tests.sh
@@ -8,12 +8,21 @@ SOLVER="fove"
 function run_all_graphs
 {
   write_header $1
-  run_solver pop25   $2
-  run_solver pop50   $2
-  run_solver pop75   $2
-  run_solver pop100  $2
-  run_solver pop125  $2
-  run_solver pop150  $2
+  run_solver pop100   $2
+  run_solver pop200   $2
+  run_solver pop300   $2
+  run_solver pop400   $2
+  run_solver pop500   $2
+  run_solver pop600   $2
+  run_solver pop700   $2
+  run_solver pop800   $2
+  run_solver pop900   $2
+  run_solver pop1000  $2
+  run_solver pop1100  $2
+  run_solver pop1200  $2
+  run_solver pop1300  $2
+  run_solver pop1400  $2
+  run_solver pop1500  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh
index 179e80acd..14e7c6daf 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh
@@ -8,12 +8,21 @@ SOLVER="hve"
 function run_all_graphs
 {
   write_header $1
-  run_solver pop25   $2
-  run_solver pop50   $2
-  #run_solver pop75   $2
-  #run_solver pop100  $2
-  #run_solver pop125  $2
-  #run_solver pop150  $2
+  run_solver pop100   $2
+  #run_solver pop200   $2
+  #run_solver pop300   $2
+  #run_solver pop400   $2
+  #run_solver pop500   $2
+  #run_solver pop600   $2
+  #run_solver pop700   $2
+  #run_solver pop800   $2
+  #run_solver pop900   $2
+  #run_solver pop1000  $2
+  #run_solver pop1100  $2
+  #run_solver pop1200  $2
+  #run_solver pop1300  $2
+  #run_solver pop1400  $2
+  #run_solver pop1500  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/smokers/sm.sh b/packages/CLPBN/clpbn/bp/benchmarks/smokers/sm.sh
index 8d5f6eb19..17136dd93 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/smokers/sm.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/smokers/sm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NETWORK="'../../examples/smokers'"
+NETWORK="'../../examples/smokers2'"
 SHORTNAME="sm"
 QUERY="smokes(p1,t), smokes(p2,t), friends(p1,p2,X)"
 
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/bp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/bp_tests.sh
index dc1d99b6d..0b265de7e 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/bp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/bp_tests.sh
@@ -11,10 +11,25 @@ function run_all_graphs
   run_solver p1000attrs$N_ATTRS   $2
   run_solver p5000attrs$N_ATTRS   $2
   run_solver p10000attrs$N_ATTRS  $2
+  run_solver p15000attrs$N_ATTRS  $2
   run_solver p20000attrs$N_ATTRS  $2
+  run_solver p25000attrs$N_ATTRS  $2
   run_solver p30000attrs$N_ATTRS  $2
+  run_solver p35000attrs$N_ATTRS  $2
+  return
   run_solver p40000attrs$N_ATTRS  $2
+  run_solver p45000attrs$N_ATTRS  $2
   run_solver p50000attrs$N_ATTRS  $2
+  run_solver p55000attrs$N_ATTRS  $2
+  run_solver p60000attrs$N_ATTRS  $2
+  run_solver p65000attrs$N_ATTRS  $2
+  run_solver p70000attrs$N_ATTRS  $2
+  run_solver p75000attrs$N_ATTRS  $2
+  run_solver p80000attrs$N_ATTRS  $2
+  run_solver p85000attrs$N_ATTRS  $2
+  run_solver p90000attrs$N_ATTRS  $2
+  run_solver p95000attrs$N_ATTRS  $2
+  run_solver p100000attrs$N_ATTRS $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/cbp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/cbp_tests.sh
index b5aed6da4..7b649584f 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/cbp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/cbp_tests.sh
@@ -11,10 +11,24 @@ function run_all_graphs
   run_solver p1000attrs$N_ATTRS   $2
   run_solver p5000attrs$N_ATTRS   $2
   run_solver p10000attrs$N_ATTRS  $2
+  run_solver p15000attrs$N_ATTRS  $2
   run_solver p20000attrs$N_ATTRS  $2
+  run_solver p25000attrs$N_ATTRS  $2
   run_solver p30000attrs$N_ATTRS  $2
+  run_solver p35000attrs$N_ATTRS  $2
   run_solver p40000attrs$N_ATTRS  $2
+  run_solver p45000attrs$N_ATTRS  $2
   run_solver p50000attrs$N_ATTRS  $2
+  run_solver p55000attrs$N_ATTRS  $2
+  run_solver p60000attrs$N_ATTRS  $2
+  run_solver p65000attrs$N_ATTRS  $2
+  run_solver p70000attrs$N_ATTRS  $2
+  run_solver p75000attrs$N_ATTRS  $2
+  run_solver p80000attrs$N_ATTRS  $2
+  run_solver p85000attrs$N_ATTRS  $2
+  run_solver p90000attrs$N_ATTRS  $2
+  run_solver p95000attrs$N_ATTRS  $2
+  run_solver p100000attrs$N_ATTRS $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/fove_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/fove_tests.sh
index 7263a11a2..2edc90919 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/fove_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/fove_tests.sh
@@ -11,10 +11,24 @@ function run_all_graphs
   run_solver p1000attrs$N_ATTRS   $2
   run_solver p5000attrs$N_ATTRS   $2
   run_solver p10000attrs$N_ATTRS  $2
+  run_solver p15000attrs$N_ATTRS  $2
   run_solver p20000attrs$N_ATTRS  $2
+  run_solver p25000attrs$N_ATTRS  $2
   run_solver p30000attrs$N_ATTRS  $2
+  run_solver p35000attrs$N_ATTRS  $2
   run_solver p40000attrs$N_ATTRS  $2
+  run_solver p45000attrs$N_ATTRS  $2
   run_solver p50000attrs$N_ATTRS  $2
+  run_solver p55000attrs$N_ATTRS  $2
+  run_solver p60000attrs$N_ATTRS  $2
+  run_solver p65000attrs$N_ATTRS  $2
+  run_solver p70000attrs$N_ATTRS  $2
+  run_solver p75000attrs$N_ATTRS  $2
+  run_solver p80000attrs$N_ATTRS  $2
+  run_solver p85000attrs$N_ATTRS  $2
+  run_solver p90000attrs$N_ATTRS  $2
+  run_solver p95000attrs$N_ATTRS  $2
+  run_solver p100000attrs$N_ATTRS $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/hve_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/hve_tests.sh
index a63dbfed7..aaabfe08e 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/hve_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/hve_tests.sh
@@ -11,10 +11,24 @@ function run_all_graphs
   run_solver p1000attrs$N_ATTRS   $2
   run_solver p5000attrs$N_ATTRS   $2
   run_solver p10000attrs$N_ATTRS  $2
+  run_solver p15000attrs$N_ATTRS  $2
   run_solver p20000attrs$N_ATTRS  $2
+  run_solver p25000attrs$N_ATTRS  $2
   run_solver p30000attrs$N_ATTRS  $2
+  run_solver p35000attrs$N_ATTRS  $2
   run_solver p40000attrs$N_ATTRS  $2
+  run_solver p45000attrs$N_ATTRS  $2
   run_solver p50000attrs$N_ATTRS  $2
+  run_solver p55000attrs$N_ATTRS  $2
+  run_solver p60000attrs$N_ATTRS  $2
+  run_solver p65000attrs$N_ATTRS  $2
+  run_solver p70000attrs$N_ATTRS  $2
+  run_solver p75000attrs$N_ATTRS  $2
+  run_solver p80000attrs$N_ATTRS  $2
+  run_solver p85000attrs$N_ATTRS  $2
+  run_solver p90000attrs$N_ATTRS  $2
+  run_solver p95000attrs$N_ATTRS  $2
+  run_solver p100000attrs$N_ATTRS $2
 }
 
 prepare_new_run