diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tempary hack to fix cbp and clean in benchs.sh

Browse Source
This commit is contained in:
Tiago Gomes 2012-04-12 00:42:55 +01:00
parent 564958ef8d
commit 9def6c2b15
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CLPBN/clpbn/bp/CFactorGraph.cpp
View File

@ -74,10 +74,8 @@ CFactorGraph::setInitialColors (void)
for (unsigned i = 0; i < facNodes.size(); i++) { for (unsigned i = 0; i < facNodes.size(); i++) {
facNodes[i]->factor().setDistId (Util::maxUnsigned()); facNodes[i]->factor().setDistId (Util::maxUnsigned());
} }
Util::printHeader ("Before check for identical factors");
groundFg_->print();
// FIXME FIXME FIXME : pfl should give correct dist ids. // FIXME FIXME FIXME : pfl should give correct dist ids.
if (checkForIdenticalFactors || false) { if (checkForIdenticalFactors || true) {
unsigned groupCount = 1; unsigned groupCount = 1;
for (unsigned i = 0; i < facNodes.size(); i++) { for (unsigned i = 0; i < facNodes.size(); i++) {
Factor& f1 = facNodes[i]->factor(); Factor& f1 = facNodes[i]->factor();
@ -99,8 +97,6 @@ CFactorGraph::setInitialColors (void)
groupCount ++; groupCount ++;
} }
} }
Util::printHeader ("After check for identical factors");
groundFg_->print();
// create the initial factor colors // create the initial factor colors
DistColorMap distColors; DistColorMap distColors;
for (unsigned i = 0; i < facNodes.size(); i++) { for (unsigned i = 0; i < facNodes.size(); i++) {

9
packages/CLPBN/clpbn/bp/benchmarks/benchs.sh Normal file → Executable file
View File

@ -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 function run_solver
{ {
constraint=$1 constraint=$1
@ -19,7 +26,7 @@ function run_solver
[$NETWORK]. [$NETWORK].
[$constraint]. [$constraint].
clpbn_horus:set_solver($SOLVER). clpbn_horus:set_solver($SOLVER).
%clpbn_horus:set_horus_flag(use_logarithms, true). clpbn_horus:set_horus_flag(use_logarithms, true).
$solver_flag. $solver_flag.
$QUERY. $QUERY.
open("$LOG_FILE", 'append', S), format(S, '$constraint: ~15+ ', []), close(S). open("$LOG_FILE", 'append', S), format(S, '$constraint: ~15+ ', []), close(S).

4
packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/wa.sh
View File

@ -20,9 +20,7 @@ function run_all_graphs
echo "results for solver $1" >> $LOG_FILE echo "results for solver $1" >> $LOG_FILE
echo -n "**********************************" >> $LOG_FILE echo -n "**********************************" >> $LOG_FILE
echo "**********************************" >> $LOG_FILE echo "**********************************" >> $LOG_FILE
run_solver pop_10 $2
run_solver "nn" $2
#run_solver pop_10 $2
#run_solver pop_1000 $2 #run_solver pop_1000 $2
#run_solver pop_5000 $2 #run_solver pop_5000 $2
#run_solver pop_10000 $2 #run_solver pop_10000 $2

2
packages/CLPBN/clpbn/bp/examples/workshop_attrs.yap
View File

@ -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)]. markov attends(P)::[t,f], series::[t,f] ; [0.5, 0.6, 0.7, 0.87] ; [people(P)].
?- series(X). % ?- series(X).