Improve header guards (again)

packages/CLPBN/horus/BayesBall.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_BAYESBALL_H
-#define PACKAGES_CLPBN_HORUS_BAYESBALL_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_BAYESBALL_H_
+#define YAP_PACKAGES_CLPBN_HORUS_BAYESBALL_H_
 
 #include <vector>
 #include <queue>
@@ -70,5 +70,5 @@ BayesBall::scheduleChilds (const BBNode* n, Scheduling& sch) const
   }
 }
 
-#endif // PACKAGES_CLPBN_HORUS_BAYESBALL_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_BAYESBALL_H_
 

packages/CLPBN/horus/BayesBallGraph.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H
-#define PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H_
+#define YAP_PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H_
 
 #include <vector>
 #include <unordered_map>
@@ -76,5 +76,5 @@ class BayesBallGraph
     std::unordered_map<VarId, BBNode*> varMap_;
 };
 
-#endif // PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H_
 

packages/CLPBN/horus/BeliefProp.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_BELIEFPROP_H
-#define PACKAGES_CLPBN_HORUS_BELIEFPROP_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_BELIEFPROP_H_
+#define YAP_PACKAGES_CLPBN_HORUS_BELIEFPROP_H_
 
 #include <set>
 #include <vector>
@@ -173,5 +173,5 @@ BeliefProp::ninf (const FacNode* fac) const
   return facsI_[fac->getIndex()];
 }
 
-#endif // PACKAGES_CLPBN_HORUS_BELIEFPROP_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_BELIEFPROP_H_
 

packages/CLPBN/horus/ConstraintTree.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H
-#define PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H_
+#define YAP_PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H_
 
 #include <cassert>
 #include <algorithm>
@@ -244,5 +244,5 @@ ConstraintTree::nrLogVars (void) const
   assert (LogVarSet (logVars_) == logVarSet_);
 }
 
-#endif // PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H_
 

packages/CLPBN/horus/CountingBp.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_COUNTINGBP_H
-#define PACKAGES_CLPBN_HORUS_COUNTINGBP_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_COUNTINGBP_H_
+#define YAP_PACKAGES_CLPBN_HORUS_COUNTINGBP_H_
 
 #include <unordered_map>
 
@@ -213,5 +213,5 @@ CountingBp::setColor (const FacNode* fn, Color  c)
   facColors_[fn->getIndex()] = c;
 }
 
-#endif // PACKAGES_CLPBN_HORUS_COUNTINGBP_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_COUNTINGBP_H_
 

packages/CLPBN/horus/ElimGraph.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_ELIMGRAPH_H
-#define PACKAGES_CLPBN_HORUS_ELIMGRAPH_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_ELIMGRAPH_H_
+#define YAP_PACKAGES_CLPBN_HORUS_ELIMGRAPH_H_
 
 #include "unordered_map"
 
@@ -168,5 +168,5 @@ ElimGraph::neighbors (EgNode* n1, EgNode* n2) const
   return n1->isNeighbor (n2);
 }
 
-#endif // PACKAGES_CLPBN_HORUS_ELIMGRAPH_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_ELIMGRAPH_H_
 

packages/CLPBN/horus/Factor.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_FACTOR_H
-#define PACKAGES_CLPBN_HORUS_FACTOR_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_FACTOR_H_
+#define YAP_PACKAGES_CLPBN_HORUS_FACTOR_H_
 
 #include <vector>
 
@@ -360,5 +360,5 @@ class Factor : public TFactor<VarId>
     DISALLOW_ASSIGN (Factor);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_FACTOR_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_FACTOR_H_
 

packages/CLPBN/horus/FactorGraph.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_FACTORGRAPH_H
-#define PACKAGES_CLPBN_HORUS_FACTORGRAPH_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_FACTORGRAPH_H_
+#define YAP_PACKAGES_CLPBN_HORUS_FACTORGRAPH_H_
 
 #include <vector>
 
@@ -178,5 +178,5 @@ struct sortByVarId
 };
 
 
-#endif // PACKAGES_CLPBN_HORUS_FACTORGRAPH_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_FACTORGRAPH_H_
 

packages/CLPBN/horus/GroundSolver.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H
-#define PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H_
+#define YAP_PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H_
 
 #include "FactorGraph.h"
 #include "Horus.h"
@@ -30,5 +30,5 @@ class GroundSolver
     DISALLOW_COPY_AND_ASSIGN (GroundSolver);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H_
 

packages/CLPBN/horus/Histogram.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_HISTOGRAM_H
-#define PACKAGES_CLPBN_HORUS_HISTOGRAM_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_HISTOGRAM_H_
+#define YAP_PACKAGES_CLPBN_HORUS_HISTOGRAM_H_
 
 #include <vector>
 
@@ -45,5 +45,5 @@ class HistogramSet
     DISALLOW_COPY_AND_ASSIGN (HistogramSet);
 };
 
-#endif // HORUS_HISTOGRAM_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_HISTOGRAM_H_
 

packages/CLPBN/horus/Horus.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_HORUS_H
-#define PACKAGES_CLPBN_HORUS_HORUS_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_HORUS_H_
+#define YAP_PACKAGES_CLPBN_HORUS_HORUS_H_
 
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&);               \
@@ -72,5 +72,5 @@ const unsigned PRECISION = 6;
 
 };
 
-#endif // PACKAGES_CLPBN_HORUS_HORUS_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_HORUS_H_
 

packages/CLPBN/horus/Indexer.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_INDEXER_H
-#define PACKAGES_CLPBN_HORUS_INDEXER_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_INDEXER_H_
+#define YAP_PACKAGES_CLPBN_HORUS_INDEXER_H_
 
 #include <algorithm>
 #include <numeric>
@@ -361,5 +361,5 @@ operator<< (std::ostream &os, const MapIndexer& indexer)
   return os;
 }
 
-#endif // PACKAGES_CLPBN_HORUS_INDEXER_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_INDEXER_H_
 

packages/CLPBN/horus/LiftedBp.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_LIFTEDBP_H
-#define PACKAGES_CLPBN_HORUS_LIFTEDBP_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDBP_H_
+#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDBP_H_
 
 #include "LiftedSolver.h"
 #include "ParfactorList.h"
@@ -41,5 +41,5 @@ class LiftedBp : public LiftedSolver
     DISALLOW_COPY_AND_ASSIGN (LiftedBp);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_LIFTEDBP_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_LIFTEDBP_H_
 

packages/CLPBN/horus/LiftedKc.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_LIFTEDKC_H
-#define PACKAGES_CLPBN_HORUS_LIFTEDKC_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDKC_H_
+#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDKC_H_
 
 #include "LiftedSolver.h"
 #include "LiftedWCNF.h"
@@ -298,5 +298,5 @@ class LiftedKc : public LiftedSolver
     DISALLOW_COPY_AND_ASSIGN (LiftedKc);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_LIFTEDKC_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_LIFTEDKC_H_
 

packages/CLPBN/horus/LiftedOperations.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H
-#define PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H_
+#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H_
 
 #include "ParfactorList.h"
 
@@ -25,5 +25,5 @@ class LiftedOperations
     DISALLOW_COPY_AND_ASSIGN (LiftedOperations);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H_
 

packages/CLPBN/horus/LiftedSolver.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H
-#define PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H_
+#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H_
 
 #include "ParfactorList.h"
 #include "Horus.h"
@@ -23,5 +23,5 @@ class LiftedSolver
     DISALLOW_COPY_AND_ASSIGN (LiftedSolver);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H_
 

packages/CLPBN/horus/LiftedUtils.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H
-#define PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H_
+#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H_
 
 #include <string>
 
@@ -206,5 +206,5 @@ Substitution::nrReplacements (void) const
 }
 
 
-#endif // PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H_
 

packages/CLPBN/horus/LiftedVe.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_LIFTEDVE_H
-#define PACKAGES_CLPBN_HORUS_LIFTEDVE_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDVE_H_
+#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDVE_H_
 
 #include <vector>
 #include <string>
@@ -167,5 +167,5 @@ class LiftedVe : public LiftedSolver
     DISALLOW_COPY_AND_ASSIGN (LiftedVe);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_LIFTEDVE_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_LIFTEDVE_H_
 

packages/CLPBN/horus/LiftedWCNF.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H
-#define PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H_
+#define YAP_PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H_
 
 #include <unordered_map>
 
@@ -238,5 +238,5 @@ class LiftedWCNF
     DISALLOW_COPY_AND_ASSIGN (LiftedWCNF);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H_
 

packages/CLPBN/horus/Parfactor.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_PARFACTOR_H
-#define PACKAGES_CLPBN_HORUS_PARFACTOR_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_PARFACTOR_H_
+#define YAP_PACKAGES_CLPBN_HORUS_PARFACTOR_H_
 
 #include "Factor.h"
 #include "ProbFormula.h"
@@ -117,5 +117,5 @@ class Parfactor : public TFactor<ProbFormula>
 
 typedef std::vector<Parfactor*> Parfactors;
 
-#endif // PACKAGES_CLPBN_HORUS_PARFACTOR_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_PARFACTOR_H_
 

packages/CLPBN/horus/ParfactorList.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_PARFACTORLIST_H
-#define PACKAGES_CLPBN_HORUS_PARFACTORLIST_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_PARFACTORLIST_H_
+#define YAP_PACKAGES_CLPBN_HORUS_PARFACTORLIST_H_
 
 #include <list>
 
@@ -117,5 +117,5 @@ class ParfactorList
     std::list<Parfactor*> pfList_;
 };
 
-#endif // PACKAGES_CLPBN_HORUS_PARFACTORLIST_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_PARFACTORLIST_H_
 

packages/CLPBN/horus/ProbFormula.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_PROBFORMULA_H
-#define PACKAGES_CLPBN_HORUS_PROBFORMULA_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_PROBFORMULA_H_
+#define YAP_PACKAGES_CLPBN_HORUS_PROBFORMULA_H_
 
 #include <limits>
 
@@ -109,5 +109,5 @@ class ObservedFormula
 
 typedef std::vector<ObservedFormula> ObservedFormulas;
 
-#endif // PACKAGES_CLPBN_HORUS_PROBFORMULA_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_PROBFORMULA_H_
 

packages/CLPBN/horus/TinySet.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_TINYSET_H
-#define PACKAGES_CLPBN_HORUS_TINYSET_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_TINYSET_H_
+#define YAP_PACKAGES_CLPBN_HORUS_TINYSET_H_
 
 #include <algorithm>
 #include <vector>
@@ -403,5 +403,5 @@ TinySet<T,C>::consistent (void) const
   return true;
 }
 
-#endif // PACKAGES_CLPBN_HORUS_TINYSET_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_TINYSET_H_
 

packages/CLPBN/horus/Util.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_UTIL_H
-#define PACKAGES_CLPBN_HORUS_UTIL_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_UTIL_H_
+#define YAP_PACKAGES_CLPBN_HORUS_UTIL_H_
 
 #include <cmath>
 #include <cassert>
@@ -433,5 +433,5 @@ struct abs_diff_exp : public std::binary_function<T, T, T>
 
 }
 
-#endif // PACKAGES_CLPBN_HORUS_UTIL_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_UTIL_H_
 

packages/CLPBN/horus/Var.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_VAR_H
-#define PACKAGES_CLPBN_HORUS_VAR_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_VAR_H_
+#define YAP_PACKAGES_CLPBN_HORUS_VAR_H_
 
 #include <cassert>
 
@@ -103,5 +103,5 @@ Var::operator!= (const Var& var) const
 }
 
 
-#endif // PACKAGES_CLPBN_HORUS_VAR_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_VAR_H_
 

packages/CLPBN/horus/VarElim.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_VARELIM_H
-#define PACKAGES_CLPBN_HORUS_VARELIM_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_VARELIM_H_
+#define YAP_PACKAGES_CLPBN_HORUS_VARELIM_H_
 
 #include "unordered_map"
 
@@ -38,5 +38,5 @@ class VarElim : public GroundSolver
     DISALLOW_COPY_AND_ASSIGN (VarElim);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_VARELIM_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_VARELIM_H_
 

packages/CLPBN/horus/WeightedBp.h

@@ -1,5 +1,5 @@
-#ifndef PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H
-#define PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H
+#ifndef YAP_PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H_
+#define YAP_PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H_
 
 #include "BeliefProp.h"
 
@@ -66,5 +66,5 @@ class WeightedBp : public BeliefProp
      DISALLOW_COPY_AND_ASSIGN (WeightedBp);
 };
 
-#endif // PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H
+#endif // YAP_PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H_