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

Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

Browse Source 
Conflicts:
	packages/CLPBN/horus/LiftedWCNF.h
	packages/CLPBN/horus/ParfactorList.cpp
This commit is contained in:
Vitor Santos Costa 2013-04-16 15:19:42 -05:00
commit bd9e840e8b
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,16 @@ enum class LogVarType {
negLvt negLvt
}; };
// Workaround GCC bug #38064
inline bool operator< (LogVarType lvt1, LogVarType lvt2)
{
return (int)lvt1 < (int)lvt2;
}
typedef long LiteralId; typedef long LiteralId;
typedef std::vector<LogVarType> LogVarTypes; typedef std::vector<LogVarType> LogVarTypes;
@ -192,9 +202,7 @@ struct CmpLitLvTypes
return true; return true;
} }
if (types1.lid() == types2.lid()){ if (types1.lid() == types2.lid()){
#if !defined(__GNUC__) || ( __GNUC__ == 4 && __GNUC_MINOR__ > 4) return types1.logVarTypes() < types2.logVarTypes();
return types1.logVarTypes() < types2.logVarTypes();
#endif
} }
return false; return false;
} }

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

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