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

version level patch

Browse Source
This commit is contained in:
Vitor Santos Costa
2013-04-16 09:44:29 -05:00
parent 78410ade1a
commit cf7e904e9e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/CLPBN/horus/LiftedWCNF.h
View File

@@ -191,9 +191,11 @@ struct CmpLitLvTypes
if (types1.lid() < types2.lid()) {
return true;
}
// vsc if (types1.lid() == types2.lid()){
// return types1.logVarTypes() < types2.logVarTypes();
//}
if (types1.lid() == types2.lid()){
#if !defined(__GNUC__) || ( __GNUC__ == 4 && __GNUC_MINOR__ > 4)
return types1.logVarTypes() < types2.logVarTypes();
#endif
}
return false;
}
};

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

@@ -122,7 +122,7 @@ void
ParfactorList::print() const
{
struct sortByParams {
bool operator() (const Parfactor* pf1, const Parfactor* pf2)
bool operator() (const Parfactor* pf1, const Parfactor* pf2) const
{
if (pf1->params().size() < pf2->params().size()) {
return true;
@@ -134,7 +134,9 @@ ParfactorList::print() const
}
};
Parfactors pfVec (pfList_.begin(), pfList_.end());
// vsc std::sort (pfVec.begin(), pfVec.end(), sortByParams());
#if !defined(__GNUC__) || ( __GNUC__ == 4 && __GNUC_MINOR__ > 4)
std::sort (pfVec.begin(), pfVec.end(), sortByParams());
#endif
for (size_t i = 0; i < pfVec.size(); i++) {
pfVec[i]->print();
std::cout << std::endl;