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

log domain calculations fixes for lifted knowledge compilation

Browse Source
This commit is contained in:
Tiago Gomes
2012-11-14 18:40:03 +00:00
parent 9202e286f8
commit d9e48e6290
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/CLPBN/horus/LiftedKc.cpp
View File

@@ -51,9 +51,11 @@ LiftedKc::solveQuery (const Grounds& query)
vector<LiteralId> litIds = lwcnf_->prvGroupLiterals (groups[i]);
for (size_t j = 0; j < litIds.size(); j++) {
if (indexer[i] == j) {
lwcnf_->addWeight (litIds[j], 1.0, 1.0); // TODO not log aware
lwcnf_->addWeight (litIds[j], LogAware::one(),
LogAware::one());
} else {
lwcnf_->addWeight (litIds[j], 0.0, 1.0); // TODO not log aware
lwcnf_->addWeight (litIds[j], LogAware::zero(),
LogAware::one());
}
}
}
@@ -63,8 +65,10 @@ LiftedKc::solveQuery (const Grounds& query)
params.push_back (circuit_->getWeightedModelCount());
++ indexer;
}
cout << "params: " << params << endl;
LogAware::normalize (params);
if (Globals::logDomain) {
Util::exp (params);
}
return params;
}