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

Improve includes

Browse Source
This commit is contained in:
Tiago Gomes 2013-02-07 20:09:10 +00:00
parent 544d0aa39e
commit 5c84a2f532
42 changed files with 110 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CLPBN/horus/BayesBallGraph.cpp
View File

@ -1,9 +1,8 @@
#include <cstdlib>
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>
#include <sstream>
#include <fstream> #include <fstream>
#include <sstream>
#include "BayesBallGraph.h" #include "BayesBallGraph.h"
#include "Util.h" #include "Util.h"

2
packages/CLPBN/horus/BeliefProp.cpp
View File

@ -1,8 +1,8 @@
#include <cassert> #include <cassert>
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <sstream>
#include "BeliefProp.h" #include "BeliefProp.h"
#include "Indexer.h" #include "Indexer.h"

5
packages/CLPBN/horus/BeliefProp.h
View File

@ -1,10 +1,9 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_BELIEFPROP_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_BELIEFPROP_H_
#define YAP_PACKAGES_CLPBN_HORUS_BELIEFPROP_H_ #define YAP_PACKAGES_CLPBN_HORUS_BELIEFPROP_H_
#include <set>
#include <vector> #include <vector>
#include <set>
#include <sstream> #include <string>
#include "GroundSolver.h" #include "GroundSolver.h"
#include "FactorGraph.h" #include "FactorGraph.h"

1
packages/CLPBN/horus/ConstraintTree.cpp
View File

@ -1,5 +1,6 @@
#include <queue> #include <queue>
#include <iostream>
#include <fstream> #include <fstream>
#include "ConstraintTree.h" #include "ConstraintTree.h"

7
packages/CLPBN/horus/ConstraintTree.h
View File

@ -2,10 +2,11 @@
#define YAP_PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H_ #define YAP_PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H_
#include <cassert> #include <cassert>
#include <algorithm>
#include <iostream> #include <vector>
#include <sstream> #include <algorithm>
#include <string>
#include <ostream>
#include "TinySet.h" #include "TinySet.h"
#include "LiftedUtils.h" #include "LiftedUtils.h"

5
packages/CLPBN/horus/CountingBp.cpp
View File

@ -1,3 +1,8 @@
#include <cassert>
#include <iostream>
#include <sstream>
#include "CountingBp.h" #include "CountingBp.h"
#include "WeightedBp.h" #include "WeightedBp.h"

1
packages/CLPBN/horus/CountingBp.h
View File

@ -1,6 +1,7 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_COUNTINGBP_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_COUNTINGBP_H_
#define YAP_PACKAGES_CLPBN_HORUS_COUNTINGBP_H_ #define YAP_PACKAGES_CLPBN_HORUS_COUNTINGBP_H_
#include <vector>
#include <unordered_map> #include <unordered_map>
#include "GroundSolver.h" #include "GroundSolver.h"

1
packages/CLPBN/horus/ElimGraph.cpp
View File

@ -1,3 +1,4 @@
#include <iostream>
#include <fstream> #include <fstream>
#include "ElimGraph.h" #include "ElimGraph.h"

5
packages/CLPBN/horus/ElimGraph.h
View File

@ -1,7 +1,10 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_ELIMGRAPH_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_ELIMGRAPH_H_
#define YAP_PACKAGES_CLPBN_HORUS_ELIMGRAPH_H_ #define YAP_PACKAGES_CLPBN_HORUS_ELIMGRAPH_H_
#include "unordered_map" #include <cassert>
#include <vector>
#include <unordered_map>
#include "FactorGraph.h" #include "FactorGraph.h"
#include "TinySet.h" #include "TinySet.h"

2
packages/CLPBN/horus/Factor.cpp
View File

@ -1,8 +1,6 @@
#include <cstdlib>
#include <cassert> #include <cassert>
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

3
packages/CLPBN/horus/Factor.h
View File

@ -1,7 +1,10 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_FACTOR_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_FACTOR_H_
#define YAP_PACKAGES_CLPBN_HORUS_FACTOR_H_ #define YAP_PACKAGES_CLPBN_HORUS_FACTOR_H_
#include <cassert>
#include <vector> #include <vector>
#include <string>
#include "Indexer.h" #include "Indexer.h"
#include "Util.h" #include "Util.h"

7
packages/CLPBN/horus/FactorGraph.cpp
View File

@ -1,10 +1,7 @@
#include <cassert>
#include <algorithm> #include <algorithm>
#include <vector>
#include <iostream> #include <iostream>
#include <sstream>
#include <fstream>
#include "FactorGraph.h" #include "FactorGraph.h"
#include "BayesBall.h" #include "BayesBall.h"

3
packages/CLPBN/horus/FactorGraph.h
View File

@ -2,6 +2,9 @@
#define YAP_PACKAGES_CLPBN_HORUS_FACTORGRAPH_H_ #define YAP_PACKAGES_CLPBN_HORUS_FACTORGRAPH_H_
#include <vector> #include <vector>
#include <unordered_map>
#include <string>
#include <fstream>
#include "Factor.h" #include "Factor.h"
#include "BayesBallGraph.h" #include "BayesBallGraph.h"

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

@ -1,3 +1,9 @@
#include <cassert>
#include <vector>
#include <string>
#include <iostream>
#include "GroundSolver.h" #include "GroundSolver.h"
#include "VarElim.h" #include "VarElim.h"
#include "BeliefProp.h" #include "BeliefProp.h"

1
packages/CLPBN/horus/Histogram.h
View File

@ -2,7 +2,6 @@
#define YAP_PACKAGES_CLPBN_HORUS_HISTOGRAM_H_ #define YAP_PACKAGES_CLPBN_HORUS_HISTOGRAM_H_
#include <vector> #include <vector>
#include <ostream> #include <ostream>
#include "Horus.h" #include "Horus.h"

5
packages/CLPBN/horus/HorusCli.cpp
View File

@ -1,4 +1,7 @@
#include <cstdlib> #include <cassert>
#include <string>
#include <iostream>
#include "FactorGraph.h" #include "FactorGraph.h"
#include "VarElim.h" #include "VarElim.h"

5
packages/CLPBN/horus/HorusYap.cpp
View File

@ -1,7 +1,8 @@
#include <cstdlib> #include <cassert>
#include <vector> #include <vector>
#include <unordered_map>
#include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

2
packages/CLPBN/horus/Indexer.h
View File

@ -1,9 +1,9 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_INDEXER_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_INDEXER_H_
#define YAP_PACKAGES_CLPBN_HORUS_INDEXER_H_ #define YAP_PACKAGES_CLPBN_HORUS_INDEXER_H_
#include <vector>
#include <algorithm> #include <algorithm>
#include <numeric> #include <numeric>
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>

4
packages/CLPBN/horus/LiftedBp.cpp
View File

@ -1,3 +1,7 @@
#include <cassert>
#include <sstream>
#include "LiftedBp.h" #include "LiftedBp.h"
#include "LiftedOperations.h" #include "LiftedOperations.h"
#include "WeightedBp.h" #include "WeightedBp.h"

2
packages/CLPBN/horus/LiftedBp.h
View File

@ -1,6 +1,8 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDBP_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDBP_H_
#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDBP_H_ #define YAP_PACKAGES_CLPBN_HORUS_LIFTEDBP_H_
#include <vector>
#include "LiftedSolver.h" #include "LiftedSolver.h"
#include "ParfactorList.h" #include "ParfactorList.h"

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

@ -1,4 +1,6 @@
#include <fstream> #include <cassert>
#include <iostream>
#include "LiftedKc.h" #include "LiftedKc.h"
#include "LiftedOperations.h" #include "LiftedOperations.h"

5
packages/CLPBN/horus/LiftedKc.h
View File

@ -1,6 +1,11 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDKC_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDKC_H_
#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDKC_H_ #define YAP_PACKAGES_CLPBN_HORUS_LIFTEDKC_H_
#include <vector>
#include <unordered_map>
#include <string>
#include <fstream>
#include "LiftedSolver.h" #include "LiftedSolver.h"
#include "LiftedWCNF.h" #include "LiftedWCNF.h"
#include "ParfactorList.h" #include "ParfactorList.h"

4
packages/CLPBN/horus/LiftedOperations.cpp
View File

@ -1,3 +1,7 @@
#include <vector>
#include <queue>
#include <iostream>
#include "LiftedOperations.h" #include "LiftedOperations.h"

2
packages/CLPBN/horus/LiftedSolver.h
View File

@ -2,7 +2,7 @@
#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H_ #define YAP_PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H_
#include "ParfactorList.h" #include "ParfactorList.h"
#include "Horus.h"
class LiftedSolver class LiftedSolver
{ {

2
packages/CLPBN/horus/LiftedUtils.cpp
View File

@ -1,10 +1,8 @@
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>
#include <sstream>
#include "LiftedUtils.h" #include "LiftedUtils.h"
#include "ConstraintTree.h"
namespace LiftedUtils { namespace LiftedUtils {

4
packages/CLPBN/horus/LiftedUtils.h
View File

@ -1,10 +1,10 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H_
#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H_ #define YAP_PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H_
#include <string>
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include <string>
#include <ostream>
#include "TinySet.h" #include "TinySet.h"
#include "Util.h" #include "Util.h"

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

@ -1,6 +1,10 @@
#include <algorithm> #include <cassert>
#include <set> #include <set>
#include <queue>
#include <algorithm>
#include <iostream>
#include <sstream>
#include "LiftedVe.h" #include "LiftedVe.h"
#include "LiftedOperations.h" #include "LiftedOperations.h"

5
packages/CLPBN/horus/LiftedWCNF.cpp
View File

@ -1,3 +1,8 @@
#include <cassert>
#include <iostream>
#include <sstream>
#include "LiftedWCNF.h" #include "LiftedWCNF.h"
#include "ConstraintTree.h" #include "ConstraintTree.h"
#include "Indexer.h" #include "Indexer.h"

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

@ -1,7 +1,10 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H_
#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H_ #define YAP_PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H_
#include <vector>
#include <unordered_map> #include <unordered_map>
#include <string>
#include <ostream>
#include "ParfactorList.h" #include "ParfactorList.h"

5
packages/CLPBN/horus/Parfactor.cpp
View File

@ -1,3 +1,8 @@
#include <cassert>
#include <iostream>
#include <sstream>
#include "Parfactor.h" #include "Parfactor.h"
#include "Histogram.h" #include "Histogram.h"
#include "Indexer.h" #include "Indexer.h"

3
packages/CLPBN/horus/Parfactor.h
View File

@ -1,6 +1,9 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_PARFACTOR_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_PARFACTOR_H_
#define YAP_PACKAGES_CLPBN_HORUS_PARFACTOR_H_ #define YAP_PACKAGES_CLPBN_HORUS_PARFACTOR_H_
#include <vector>
#include <string>
#include "Factor.h" #include "Factor.h"
#include "ProbFormula.h" #include "ProbFormula.h"
#include "ConstraintTree.h" #include "ConstraintTree.h"

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

@ -1,6 +1,8 @@
#include <cassert> #include <cassert>
#include <queue> #include <queue>
#include <iostream>
#include <sstream>
#include "ParfactorList.h" #include "ParfactorList.h"

4
packages/CLPBN/horus/ProbFormula.cpp
View File

@ -1,3 +1,7 @@
#include <cassert>
#include <iostream>
#include "ProbFormula.h" #include "ProbFormula.h"

2
packages/CLPBN/horus/ProbFormula.h
View File

@ -1,6 +1,8 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_PROBFORMULA_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_PROBFORMULA_H_
#define YAP_PACKAGES_CLPBN_HORUS_PROBFORMULA_H_ #define YAP_PACKAGES_CLPBN_HORUS_PROBFORMULA_H_
#include <vector>
#include <ostream>
#include <limits> #include <limits>
#include "ConstraintTree.h" #include "ConstraintTree.h"

3
packages/CLPBN/horus/TinySet.h
View File

@ -1,8 +1,9 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_TINYSET_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_TINYSET_H_
#define YAP_PACKAGES_CLPBN_HORUS_TINYSET_H_ #define YAP_PACKAGES_CLPBN_HORUS_TINYSET_H_
#include <algorithm>
#include <vector> #include <vector>
#include <algorithm>
#include <ostream>
template <typename T, typename Compare = std::less<T>> template <typename T, typename Compare = std::less<T>>

3
packages/CLPBN/horus/Util.cpp
View File

@ -1,5 +1,3 @@
#include <fstream>
#include "Util.h" #include "Util.h"
#include "Indexer.h" #include "Indexer.h"
#include "ElimGraph.h" #include "ElimGraph.h"
@ -22,7 +20,6 @@ GroundSolverType groundSolver = GroundSolverType::VE;
namespace Util { namespace Util {
template <> std::string template <> std::string
toString (const bool& b) toString (const bool& b)
{ {

7
packages/CLPBN/horus/Util.h
View File

@ -4,14 +4,13 @@
#include <cmath> #include <cmath>
#include <cassert> #include <cassert>
#include <algorithm>
#include <limits>
#include <vector> #include <vector>
#include <queue> #include <queue>
#include <set> #include <set>
#include <unordered_map> #include <unordered_map>
#include <algorithm>
#include <limits>
#include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

3
packages/CLPBN/horus/Var.h
View File

@ -3,6 +3,9 @@
#include <cassert> #include <cassert>
#include <unordered_map>
#include <string>
#include "Util.h" #include "Util.h"
#include "Horus.h" #include "Horus.h"

2
packages/CLPBN/horus/VarElim.cpp
View File

@ -1,4 +1,6 @@
#include <algorithm> #include <algorithm>
#include <iostream>
#include <sstream>
#include "VarElim.h" #include "VarElim.h"
#include "ElimGraph.h" #include "ElimGraph.h"

3
packages/CLPBN/horus/VarElim.h
View File

@ -1,7 +1,8 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_VARELIM_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_VARELIM_H_
#define YAP_PACKAGES_CLPBN_HORUS_VARELIM_H_ #define YAP_PACKAGES_CLPBN_HORUS_VARELIM_H_
#include "unordered_map" #include <vector>
#include <unordered_map>
#include "GroundSolver.h" #include "GroundSolver.h"
#include "FactorGraph.h" #include "FactorGraph.h"

4
packages/CLPBN/horus/WeightedBp.cpp
View File

@ -1,3 +1,7 @@
#include <cassert>
#include <iostream>
#include "WeightedBp.h" #include "WeightedBp.h"

2
packages/CLPBN/horus/WeightedBp.h
View File

@ -1,6 +1,8 @@
#ifndef YAP_PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H_ #ifndef YAP_PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H_
#define YAP_PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H_ #define YAP_PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H_
#include <vector>
#include "BeliefProp.h" #include "BeliefProp.h"