Reorganize

This commit is contained in:
Tiago Gomes 2012-12-27 15:05:40 +00:00
parent de0a118ae5
commit b996436b24

View File

@ -106,26 +106,12 @@ class BeliefProp : public GroundSolver
virtual Params getJointDistributionOf (const VarIds&); virtual Params getJointDistributionOf (const VarIds&);
Params getFactorJoint (FacNode* fn, const VarIds&);
static MsgSchedule schedule; static MsgSchedule schedule;
static double accuracy; static double accuracy;
static unsigned maxIter; static unsigned maxIter;
protected:
void runSolver (void);
virtual void createLinks (void);
virtual void maxResidualSchedule (void);
virtual void calcFactorToVarMsg (BpLink*);
virtual Params getVarToFactorMsg (const BpLink*) const;
virtual Params getJointByConditioning (const VarIds&) const;
public:
Params getFactorJoint (FacNode* fn, const VarIds&);
protected: protected:
SPNodeInfo* ninf (const VarNode* var) const SPNodeInfo* ninf (const VarNode* var) const
{ {
@ -176,6 +162,18 @@ class BeliefProp : public GroundSolver
} }
}; };
void runSolver (void);
virtual void createLinks (void);
virtual void maxResidualSchedule (void);
virtual void calcFactorToVarMsg (BpLink*);
virtual Params getVarToFactorMsg (const BpLink*) const;
virtual Params getJointByConditioning (const VarIds&) const;
BpLinks links_; BpLinks links_;
unsigned nIters_; unsigned nIters_;
vector<SPNodeInfo*> varsI_; vector<SPNodeInfo*> varsI_;