diff --git a/packages/CLPBN/clpbn/bp/CbpSolver.cpp b/packages/CLPBN/clpbn/bp/CbpSolver.cpp index 0989dc465..e385eaf11 100644 --- a/packages/CLPBN/clpbn/bp/CbpSolver.cpp +++ b/packages/CLPBN/clpbn/bp/CbpSolver.cpp @@ -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 << "]" ; diff --git a/packages/CLPBN/clpbn/bp/FactorGraph.cpp b/packages/CLPBN/clpbn/bp/FactorGraph.cpp index acf5d3adf..314489652 100644 --- a/packages/CLPBN/clpbn/bp/FactorGraph.cpp +++ b/packages/CLPBN/clpbn/bp/FactorGraph.cpp @@ -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++) { diff --git a/packages/CLPBN/clpbn/bp/FactorGraph.h b/packages/CLPBN/clpbn/bp/FactorGraph.h index a8e4880dc..ab1057ca0 100644 --- a/packages/CLPBN/clpbn/bp/FactorGraph.h +++ b/packages/CLPBN/clpbn/bp/FactorGraph.h @@ -118,8 +118,6 @@ class FactorGraph void exportToLibDaiFormat (const char*) const; - static bool orderVars; - private: // DISALLOW_COPY_AND_ASSIGN (FactorGraph); diff --git a/packages/CLPBN/clpbn/bp/Util.cpp b/packages/CLPBN/clpbn/bp/Util.cpp index f131512e2..9f8f1955f 100644 --- a/packages/CLPBN/clpbn/bp/Util.cpp +++ b/packages/CLPBN/clpbn/bp/Util.cpp @@ -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; diff --git a/packages/CLPBN/clpbn/horus.yap b/packages/CLPBN/clpbn/horus.yap index 299cc1dbc..946ec5b27 100644 --- a/packages/CLPBN/clpbn/horus.yap +++ b/packages/CLPBN/clpbn/horus.yap @@ -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).