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

Clean ups

Browse Source
This commit is contained in:
Tiago Gomes 2013-02-16 16:17:14 +00:00
parent d0f5d0f9ab
commit 0852c4fe22
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/CLPBN/horus/BayesBall.cpp
View File

@ -38,22 +38,22 @@ BayesBall::getMinimalFactorGraph (const VarIds& queryIds)
BBNode* n = sch.node; BBNode* n = sch.node;
n->setAsVisited(); n->setAsVisited();
if (n->hasEvidence() == false && sch.visitedFromChild) { if (n->hasEvidence() == false && sch.visitedFromChild) {
if (n->isMarkedOnTop() == false) { if (n->isMarkedAbove() == false) {
n->markOnTop(); n->markAbove();
scheduleParents (n, scheduling); scheduleParents (n, scheduling);
} }
if (n->isMarkedOnBottom() == false) { if (n->isMarkedBelow() == false) {
n->markOnBottom(); n->markBelow();
scheduleChilds (n, scheduling); scheduleChilds (n, scheduling);
} }
} }
if (sch.visitedFromParent) { if (sch.visitedFromParent) {
if (n->hasEvidence() && n->isMarkedOnTop() == false) { if (n->hasEvidence() && n->isMarkedAbove() == false) {
n->markOnTop(); n->markAbove();
scheduleParents (n, scheduling); scheduleParents (n, scheduling);
} }
if (n->hasEvidence() == false && n->isMarkedOnBottom() == false) { if (n->hasEvidence() == false && n->isMarkedBelow() == false) {
n->markOnBottom(); n->markBelow();
scheduleChilds (n, scheduling); scheduleChilds (n, scheduling);
} }
} }
@ -74,7 +74,7 @@ BayesBall::constructGraph (FactorGraph* fg) const
for (size_t i = 0; i < facNodes.size(); i++) { for (size_t i = 0; i < facNodes.size(); i++) {
const BBNode* n = dag_.getNode ( const BBNode* n = dag_.getNode (
facNodes[i]->factor().argument (0)); facNodes[i]->factor().argument (0));
if (n->isMarkedOnTop()) { if (n->isMarkedAbove()) {
fg->addFactor (facNodes[i]->factor()); fg->addFactor (facNodes[i]->factor());
} else if (n->hasEvidence() && n->isVisited()) { } else if (n->hasEvidence() && n->isVisited()) {
VarIds varIds = { facNodes[i]->factor().argument (0) }; VarIds varIds = { facNodes[i]->factor().argument (0) };

6
packages/CLPBN/horus/BayesBall.h
View File

@ -9,6 +9,7 @@
#include "BayesBallGraph.h" #include "BayesBallGraph.h"
#include "Horus.h" #include "Horus.h"
namespace Horus { namespace Horus {
struct ScheduleInfo { struct ScheduleInfo {
@ -39,9 +40,8 @@ class BayesBall {
void scheduleChilds (const BBNode* n, Scheduling& sch) const; void scheduleChilds (const BBNode* n, Scheduling& sch) const;
FactorGraph& fg_; FactorGraph& fg_;
BayesBallGraph& dag_;
BayesBallGraph& dag_;
}; };

22
packages/CLPBN/horus/BayesBallGraph.h
View File

@ -7,12 +7,13 @@
#include "Var.h" #include "Var.h"
#include "Horus.h" #include "Horus.h"
namespace Horus { namespace Horus {
class BBNode : public Var { class BBNode : public Var {
public: public:
BBNode (Var* v) : Var (v), visited_(false), BBNode (Var* v) : Var (v), visited_(false),
markedOnTop_(false), markedOnBottom_(false) { } markedAbove_(false), markedBelow_(false) { }
const std::vector<BBNode*>& childs (void) const { return childs_; } const std::vector<BBNode*>& childs (void) const { return childs_; }
@ -30,20 +31,20 @@ class BBNode : public Var {
void setAsVisited (void) { visited_ = true; } void setAsVisited (void) { visited_ = true; }
bool isMarkedOnTop (void) const { return markedOnTop_; } bool isMarkedAbove (void) const { return markedAbove_; }
void markOnTop (void) { markedOnTop_ = true; } void markAbove (void) { markedAbove_ = true; }
bool isMarkedOnBottom (void) const { return markedOnBottom_; } bool isMarkedBelow (void) const { return markedBelow_; }
void markOnBottom (void) { markedOnBottom_ = true; } void markBelow (void) { markedBelow_ = true; }
void clear (void) { visited_ = markedOnTop_ = markedOnBottom_ = false; } void clear (void) { visited_ = markedAbove_ = markedBelow_ = false; }
private: private:
bool visited_; bool visited_;
bool markedOnTop_; bool markedAbove_;
bool markedOnBottom_; bool markedBelow_;
std::vector<BBNode*> childs_; std::vector<BBNode*> childs_;
std::vector<BBNode*> parents_; std::vector<BBNode*> parents_;
@ -71,9 +72,8 @@ class BayesBallGraph {
void exportToGraphViz (const char*); void exportToGraphViz (const char*);
private: private:
std::vector<BBNode*> nodes_; std::vector<BBNode*> nodes_;
std::unordered_map<VarId, BBNode*> varMap_;
std::unordered_map<VarId, BBNode*> varMap_;
}; };
} // namespace Horus } // namespace Horus

2
packages/CLPBN/horus/ConstraintTree.h
View File

@ -78,7 +78,7 @@ class CTNode {
void updateChildLevels (CTNode*, unsigned); void updateChildLevels (CTNode*, unsigned);
Symbol symbol_; Symbol symbol_;
CTChilds childs_; CTChilds childs_;
unsigned level_; unsigned level_;
DISALLOW_ASSIGN (CTNode); DISALLOW_ASSIGN (CTNode);