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

delete order vars flag

This commit is contained in:
Tiago Gomes 2012-04-30 13:02:53 +01:00
parent fa8ff6d5b6
commit d6e11ca84d
5 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/CLPBN/clpbn/bp/CbpSolver.cpp
View File

@ -56,7 +56,6 @@ CbpSolver::printSolverFlags (void) const
ss << ",max_iter=" << BpOptions::maxIter;
ss << ",accuracy=" << BpOptions::accuracy;
ss << ",log_domain=" << Util::toString (Globals::logDomain);
ss << ",order_vars=" << Util::toString (FactorGraph::orderVars);
ss << ",chkif=" <<
Util::toString (CFactorGraph::checkForIdenticalFactors);
ss << "]" ;

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

@ -13,9 +13,6 @@
#include "Util.h"
bool FactorGraph::orderVars = false;
FactorGraph::FactorGraph (const FactorGraph& fg)
{
const VarNodes& varNodes = fg.varNodes();
@ -187,9 +184,6 @@ void
FactorGraph::addFactor (const Factor& factor)
{
FacNode* fn = new FacNode (factor);
if (orderVars) {
fn->factor().reorderAccordingVarIds();
}
addFacNode (fn);
const VarIds& vids = fn->factor().arguments();
for (unsigned i = 0; i < vids.size(); i++) {

2
packages/CLPBN/clpbn/bp/FactorGraph.h
View File

@ -118,8 +118,6 @@ class FactorGraph
void exportToLibDaiFormat (const char*) const;
static bool orderVars;
private:
// DISALLOW_COPY_AND_ASSIGN (FactorGraph);

10
packages/CLPBN/clpbn/bp/Util.cpp
View File

@ -288,16 +288,6 @@ setHorusFlag (string key, string value)
cerr << "for `" << key << "'" << endl;
returnVal = false;
}
} else if (key == "order_vars") {
if ( value == "true") {
FactorGraph::orderVars = true;
} else if (value == "false") {
FactorGraph::orderVars = false;
} else {
cerr << "warning: invalid value `" << value << "' " ;
cerr << "for `" << key << "'" << endl;
returnVal = false;
}
} else {
cerr << "warning: invalid key `" << key << "'" << endl;
returnVal = false;

4
packages/CLPBN/clpbn/horus.yap
View File

@ -45,7 +45,6 @@ set_solver(bp) :- set_pfl_flag(solver,bp), set_horus_flag(inf_alg, bp).
set_solver(cbp) :- set_pfl_flag(solver,bp), set_horus_flag(inf_alg, cbp).
set_solver(S) :- throw(error('unknow solver ', S)).
%:- set_horus_flag(inf_alg, ve).
%:- set_horus_flag(inf_alg, bp).
%: -set_horus_flag(inf_alg, cbp).
@ -59,9 +58,6 @@ set_solver(S) :- throw(error('unknow solver ', S)).
:- set_horus_flag(max_iter, 1000).
:- set_horus_flag(order_vars, false).
%:- set_horus_flag(order_vars, true).
:- set_horus_flag(use_logarithms, false).
% :- set_horus_flag(use_logarithms, true).