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

Move MsgSchedule enum to inside class BeliefProp.

Browse Source 
Move also SPNodeInfo to inside BeliefProp. Improve also some using of enums.
This commit is contained in:
Tiago Gomes
2013-02-20 23:34:03 +00:00
parent ce8152d7a0
commit 6b0e125e3b
6 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,20 +225,22 @@ setHorusFlag (std::string option, std::string value)
else returnVal = invalidValue (option, value);
} else if (option == "hve_elim_heuristic") {
typedef ElimGraph::ElimHeuristic ElimHeuristic;
if (value == "sequential")
ElimGraph::setElimHeuristic (ElimGraph::ElimHeuristic::sequentialEh);
ElimGraph::setElimHeuristic (ElimHeuristic::sequentialEh);
else if (value == "min_neighbors")
ElimGraph::setElimHeuristic (ElimGraph::ElimHeuristic::minNeighborsEh);
ElimGraph::setElimHeuristic (ElimHeuristic::minNeighborsEh);
else if (value == "min_weight")
ElimGraph::setElimHeuristic (ElimGraph::ElimHeuristic::minWeightEh);
ElimGraph::setElimHeuristic (ElimHeuristic::minWeightEh);
else if (value == "min_fill")
ElimGraph::setElimHeuristic (ElimGraph::ElimHeuristic::minFillEh);
ElimGraph::setElimHeuristic (ElimHeuristic::minFillEh);
else if (value == "weighted_min_fill")
ElimGraph::setElimHeuristic (ElimGraph::ElimHeuristic::weightedMinFillEh);
ElimGraph::setElimHeuristic (ElimHeuristic::weightedMinFillEh);
else
returnVal = invalidValue (option, value);
} else if (option == "bp_msg_schedule") {
typedef BeliefProp::MsgSchedule MsgSchedule;
if (value == "seq_fixed")
BeliefProp::setMsgSchedule (MsgSchedule::seqFixedSch);
else if (value == "seq_random")