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

add a sequential elimination heuristic

Browse Source
This commit is contained in:
Tiago Gomes 2012-05-29 17:12:57 +01:00
parent 0315cd51a3
commit 02395daed3
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/CLPBN/horus/ElimGraph.cpp
View File

@ -139,12 +139,23 @@ ElimGraph::exportToGraphViz (
VarIds VarIds
ElimGraph::getEliminationOrder ( ElimGraph::getEliminationOrder (
const vector<Factor*> factors, const Factors& factors,
VarIds excludedVids) VarIds excludedVids)
{ {
if (elimHeuristic == ElimHeuristic::SEQUENTIAL) {
VarIds allVids;
Factors::const_iterator first = factors.begin();
Factors::const_iterator end = factors.end();
for (; first != end; ++first) {
Util::addToVector (allVids, (*first)->arguments());
}
TinySet<VarId> elimOrder (allVids);
for (size_t i = 0; i < excludedVids.size(); i++) {
elimOrder.remove (excludedVids[i]);
}
return elimOrder.elements();
}
ElimGraph graph (factors); ElimGraph graph (factors);
// graph.print();
// graph.exportToGraphViz ("_egg.dot");
return graph.getEliminatingOrder (excludedVids); return graph.getEliminatingOrder (excludedVids);
} }

5
packages/CLPBN/horus/ElimGraph.h
View File

@ -12,6 +12,7 @@ using namespace std;
enum ElimHeuristic enum ElimHeuristic
{ {
SEQUENTIAL,
MIN_NEIGHBORS, MIN_NEIGHBORS,
MIN_WEIGHT, MIN_WEIGHT,
MIN_FILL, MIN_FILL,
@ -45,7 +46,7 @@ class EgNode : public Var
class ElimGraph class ElimGraph
{ {
public: public:
ElimGraph (const vector<Factor*>&); // TODO ElimGraph (const Factors&);
~ElimGraph (void); ~ElimGraph (void);
@ -56,7 +57,7 @@ class ElimGraph
void exportToGraphViz (const char*, bool = true, void exportToGraphViz (const char*, bool = true,
const VarIds& = VarIds()) const; const VarIds& = VarIds()) const;
static VarIds getEliminationOrder (const vector<Factor*>, VarIds); static VarIds getEliminationOrder (const Factors&, VarIds);
static ElimHeuristic elimHeuristic; static ElimHeuristic elimHeuristic;

4
packages/CLPBN/horus/Util.cpp
View File

@ -219,7 +219,9 @@ setHorusFlag (string key, string value)
returnVal = false; returnVal = false;
} }
} else if (key == "elim_heuristic") { } else if (key == "elim_heuristic") {
if ( value == "min_neighbors") { if ( value == "sequential") {
ElimGraph::elimHeuristic = ElimHeuristic::SEQUENTIAL;
} else if (value == "min_neighbors") {
ElimGraph::elimHeuristic = ElimHeuristic::MIN_NEIGHBORS; ElimGraph::elimHeuristic = ElimHeuristic::MIN_NEIGHBORS;
} else if (value == "min_weight") { } else if (value == "min_weight") {
ElimGraph::elimHeuristic = ElimHeuristic::MIN_WEIGHT; ElimGraph::elimHeuristic = ElimHeuristic::MIN_WEIGHT;

1
packages/CLPBN/horus/VarElimSolver.cpp
View File

@ -48,6 +48,7 @@ VarElimSolver::printSolverFlags (void) const
ss << "elim_heuristic=" ; ss << "elim_heuristic=" ;
ElimHeuristic eh = ElimGraph::elimHeuristic; ElimHeuristic eh = ElimGraph::elimHeuristic;
switch (eh) { switch (eh) {
case SEQUENTIAL: ss << "sequential"; break;
case MIN_NEIGHBORS: ss << "min_neighbors"; break; case MIN_NEIGHBORS: ss << "min_neighbors"; break;
case MIN_WEIGHT: ss << "min_weight"; break; case MIN_WEIGHT: ss << "min_weight"; break;
case MIN_FILL: ss << "min_fill"; break; case MIN_FILL: ss << "min_fill"; break;