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

support getting tuples of repeated log vars

Browse Source
This commit is contained in:
Tiago Gomes 2012-05-15 16:45:24 +01:00
parent 2061eefda2
commit 1380adcfb5
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/CLPBN/clpbn/bp/ConstraintTree.cpp
View File

@ -457,12 +457,39 @@ ConstraintTree::tupleSet (unsigned stopLevel) const
TupleSet TupleSet
ConstraintTree::tupleSet (const LogVars& lvs) ConstraintTree::tupleSet (const LogVars& originalLvs)
{ {
LogVars uniqueLvs;
for (unsigned i = 0; i < originalLvs.size(); i++) {
if (Util::contains (uniqueLvs, originalLvs[i]) == false) {
uniqueLvs.push_back (originalLvs[i]);
}
}
Tuples tuples; Tuples tuples;
moveToTop (lvs); moveToTop (uniqueLvs);
unsigned stopLevel = lvs.size(); unsigned stopLevel = uniqueLvs.size();
getTuples (root_, Tuples(), stopLevel, tuples, CTNodes() = {}); getTuples (root_, Tuples(), stopLevel, tuples, CTNodes() = {});
if (originalLvs.size() != uniqueLvs.size()) {
vector<int> indexes;
indexes.reserve (originalLvs.size());
for (unsigned i = 0; i < originalLvs.size(); i++) {
indexes.push_back (Util::vectorIndex (uniqueLvs, originalLvs[i]));
}
Tuples tuples2;
tuples2.reserve (tuples.size());
for (unsigned i = 0; i < tuples.size(); i++) {
Tuple t;
t.reserve (originalLvs.size());
for (unsigned j = 0; j < originalLvs.size(); j++) {
t.push_back (tuples[i][indexes[j]]);
}
tuples2.push_back (t);
}
return TupleSet (tuples2);
}
return TupleSet (tuples); return TupleSet (tuples);
} }