use PrvGroup

This commit is contained in:
Tiago Gomes
2012-05-24 23:38:44 +01:00
parent af6601837c
commit 18d4777d9a
8 changed files with 69 additions and 65 deletions

View File

@@ -340,7 +340,7 @@ ParfactorList::shatterAgainstMySelf (
return { };
}
unsigned newGroup = ProbFormula::getNewGroup();
PrvGroup newGroup = ProbFormula::getNewGroup();
Parfactors res1 = shatter (g, fIdx1, commCt1, exclCt1, newGroup);
if (res1.empty()) {
res1.push_back (g);
@@ -488,7 +488,7 @@ ParfactorList::shatter (
return { };
}
unsigned group;
PrvGroup group;
if (exclCt1->empty()) {
group = f1.group();
} else if (exclCt2->empty()) {
@@ -509,7 +509,7 @@ ParfactorList::shatter (
size_t fIdx,
ConstraintTree* commCt,
ConstraintTree* exclCt,
unsigned commGroup)
PrvGroup commGroup)
{
ProbFormula& f = g->argument (fIdx);
if (exclCt->empty()) {
@@ -556,7 +556,7 @@ ParfactorList::shatter (
void
ParfactorList::updateGroups (unsigned oldGroup, unsigned newGroup)
ParfactorList::updateGroups (PrvGroup oldGroup, PrvGroup newGroup)
{
for (ParfactorList::iterator it = pfList_.begin();
it != pfList_.end(); it++) {