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

Separate TFactor and Factor classes.

Browse Source 
Rename TFactor to GenericFactor. GenericFactor.cpp is empty for now.
This commit is contained in:
Tiago Gomes
2013-03-04 15:47:47 +00:00
parent 98efd54da7
commit 93fa793683
5 changed files with 11 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CLPBN/horus/Parfactor.cpp
View File

@@ -178,7 +178,7 @@ Parfactor::sumOutIndex (size_t fIdx)
}
constr_->remove (excl);
TFactor<ProbFormula>::sumOutIndex (fIdx);
GenericFactor<ProbFormula>::sumOutIndex (fIdx);
LogAware::pow (params_, exp);
}
@@ -188,7 +188,7 @@ void
Parfactor::multiply (Parfactor& g)
{
alignAndExponentiate (this, &g);
TFactor<ProbFormula>::multiply (g);
GenericFactor<ProbFormula>::multiply (g);
constr_->join (g.constr(), true);
simplifyGrounds();
assert (constr_->isCartesianProduct (countedLogVars()));
@@ -391,7 +391,7 @@ Parfactor::absorveEvidence (const ProbFormula& formula, unsigned evidence)
assert (args_[fIdx].isCounting() == false);
assert (constr_->isCountNormalized (excl));
LogAware::pow (params_, constr_->getConditionalCount (excl));
TFactor<ProbFormula>::absorveEvidence (formula, evidence);
GenericFactor<ProbFormula>::absorveEvidence (formula, evidence);
constr_->remove (excl);
}