From 9def6c2b15a1b8c5aedb665267bf824e1a84af62 Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tgomes@fc.up.pt>
Date: Thu, 12 Apr 2012 00:42:55 +0100
Subject: [PATCH] tempary hack to fix cbp and clean in benchs.sh

---
 packages/CLPBN/clpbn/bp/CFactorGraph.cpp                | 6 +-----
 packages/CLPBN/clpbn/bp/benchmarks/benchs.sh            | 9 ++++++++-
 packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/wa.sh | 4 +---
 packages/CLPBN/clpbn/bp/examples/workshop_attrs.yap     | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 packages/CLPBN/clpbn/bp/benchmarks/benchs.sh

diff --git a/packages/CLPBN/clpbn/bp/CFactorGraph.cpp b/packages/CLPBN/clpbn/bp/CFactorGraph.cpp
index 998e7fc2d..d442209f2 100644
--- a/packages/CLPBN/clpbn/bp/CFactorGraph.cpp
+++ b/packages/CLPBN/clpbn/bp/CFactorGraph.cpp
@@ -74,10 +74,8 @@ CFactorGraph::setInitialColors (void)
   for (unsigned i = 0; i < facNodes.size(); i++) {
     facNodes[i]->factor().setDistId (Util::maxUnsigned());
   }
-  Util::printHeader ("Before check for identical factors");
-  groundFg_->print();
   // FIXME FIXME FIXME : pfl should give correct dist ids.
-  if (checkForIdenticalFactors || false) {
+  if (checkForIdenticalFactors || true) {
     unsigned groupCount = 1;
     for (unsigned i = 0; i < facNodes.size(); i++) {
       Factor& f1 = facNodes[i]->factor();
@@ -99,8 +97,6 @@ CFactorGraph::setInitialColors (void)
       groupCount ++;
     }
   }
-  Util::printHeader ("After check for identical factors");
-  groundFg_->print();
   // create the initial factor colors
   DistColorMap distColors;
   for (unsigned i = 0; i < facNodes.size(); i++) {
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh b/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh
old mode 100644
new mode 100755
index d45721668..1ac0547d8
--- a/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/benchs.sh
@@ -1,4 +1,11 @@
 
+if [ $1 ] && [ $1 == "clear" ]; then
+  rm *~
+  rm -f school/*.log school/*~
+  rm -f city/*.log city/*~
+  rm -f workshop_attrs/*.log workshop_attrs/*~
+fi
+
 function run_solver
 {
   constraint=$1
@@ -19,7 +26,7 @@ function run_solver
 [$NETWORK].
 [$constraint].
 clpbn_horus:set_solver($SOLVER).
-%clpbn_horus:set_horus_flag(use_logarithms, true).
+clpbn_horus:set_horus_flag(use_logarithms, true).
 $solver_flag.
 $QUERY.
 open("$LOG_FILE", 'append', S), format(S, '$constraint: ~15+ ', []), close(S).
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/wa.sh b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/wa.sh
index 3d30dc257..921ce640c 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/wa.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/wa.sh
@@ -20,9 +20,7 @@ function run_all_graphs
   echo    "results for solver $1"              >> $LOG_FILE
   echo -n "**********************************" >> $LOG_FILE
   echo    "**********************************" >> $LOG_FILE
-
-  run_solver "nn"       $2
-  #run_solver pop_10       $2
+   run_solver pop_10       $2
   #run_solver pop_1000     $2
   #run_solver pop_5000     $2
   #run_solver pop_10000    $2
diff --git a/packages/CLPBN/clpbn/bp/examples/workshop_attrs.yap b/packages/CLPBN/clpbn/bp/examples/workshop_attrs.yap
index 282d2782d..78dcc93bb 100644
--- a/packages/CLPBN/clpbn/bp/examples/workshop_attrs.yap
+++ b/packages/CLPBN/clpbn/bp/examples/workshop_attrs.yap
@@ -23,5 +23,5 @@ markov attends(P)::[t,f], attr6::[t,f] ;  [0.1, 0.2, 0.3, 0.46] ; [people(P)].
 
 markov attends(P)::[t,f], series::[t,f] ; [0.5, 0.6, 0.7, 0.87] ; [people(P)].
 
-?- series(X).
+% ?- series(X).