Update class, struct and enum bracket style

packages/CLPBN/horus/BayesBall.h

@@ -11,8 +11,7 @@
 
 namespace Horus {
 
-struct ScheduleInfo
+struct ScheduleInfo {
-{
   ScheduleInfo (BBNode* n, bool vfp, bool vfc)
       : node(n), visitedFromParent(vfp), visitedFromChild(vfc) { }
 
@@ -25,8 +24,7 @@ struct ScheduleInfo
 typedef std::queue<ScheduleInfo, std::list<ScheduleInfo>> Scheduling;
 
 
-class BayesBall
+class BayesBall {
-{
   public:
     BayesBall (FactorGraph& fg);
 

packages/CLPBN/horus/BayesBallGraph.h

@@ -9,8 +9,7 @@
 
 namespace Horus {
 
-class BBNode : public Var
+class BBNode : public Var {
-{
   public:
     BBNode (Var* v) : Var (v), visited_(false),
         markedOnTop_(false), markedOnBottom_(false) { }
@@ -51,8 +50,7 @@ class BBNode : public Var
 };
 
 
-class BayesBallGraph
+class BayesBallGraph {
-{
   public:
     BayesBallGraph (void) { }
 

packages/CLPBN/horus/BeliefProp.h

@@ -19,8 +19,7 @@ enum MsgSchedule {
 };
 
 
-class BpLink
+class BpLink {
-{
   public:
     BpLink (FacNode* fn, VarNode* vn);
 
@@ -60,20 +59,22 @@ class BpLink
 typedef std::vector<BpLink*> BpLinks;
 
 
-class SPNodeInfo
+class SPNodeInfo {
-{
   public:
     SPNodeInfo (void) { }
+
     void addBpLink (BpLink* link) { links_.push_back (link); }
+
     const BpLinks& getLinks (void) { return links_; }
+
   private:
     BpLinks links_;
+
     DISALLOW_COPY_AND_ASSIGN (SPNodeInfo);
 };
 
 
-class BeliefProp : public GroundSolver
+class BeliefProp : public GroundSolver {
-{
   public:
     BeliefProp (const FactorGraph&);
 

packages/CLPBN/horus/ConstraintTree.h

@@ -22,8 +22,7 @@ typedef std::vector<CTNode*>          CTNodes;
 typedef std::vector<ConstraintTree*>  ConstraintTrees;
 
 
-class CTNode
+class CTNode {
-{
   private:
     struct CmpSymbol {
       bool operator() (const CTNode* n1, const CTNode* n2) const {
@@ -100,8 +99,7 @@ CTNode::findSymbol (Symbol symb)
 std::ostream& operator<< (std::ostream&, const CTNode&);
 
 
-class ConstraintTree
+class ConstraintTree {
-{
   public:
     ConstraintTree (unsigned);
 
@@ -209,8 +207,7 @@ class ConstraintTree
     std::vector<std::pair<CTNode*, unsigned>> countNormalize (
         const CTNode*, unsigned);
 
-    static void split (
+    static void split (CTNode*, CTNode*, CTChilds&, CTChilds&, unsigned);
-        CTNode*, CTNode*, CTChilds&, CTChilds&, unsigned);
 
     CTNode*    root_;
     LogVars    logVars_;

packages/CLPBN/horus/CountingBp.h

@@ -67,8 +67,7 @@ template <typename T> struct hash<std::vector<T>>
 
 namespace Horus {
 
-class VarCluster
+class VarCluster {
-{
   public:
     VarCluster (const VarNodes& vs) : members_(vs) { }
 
@@ -88,8 +87,7 @@ class VarCluster
 };
 
 
-class FacCluster
+class FacCluster {
-{
   public:
     FacCluster (const FacNodes& fcs, const VarClusters& vcs)
         : members_(fcs), varClusters_(vcs) { }
@@ -113,8 +111,7 @@ class FacCluster
 };
 
 
-class CountingBp : public GroundSolver
+class CountingBp : public GroundSolver {
-{
   public:
     CountingBp (const FactorGraph& fg);
 

packages/CLPBN/horus/ElimGraph.h

@@ -18,8 +18,7 @@ class EgNode;
 typedef TinySet<EgNode*> EGNeighs;
 
 
-enum ElimHeuristic
+enum ElimHeuristic {
-{
   SEQUENTIAL,
   MIN_NEIGHBORS,
   MIN_WEIGHT,
@@ -28,8 +27,7 @@ enum ElimHeuristic
 };
 
 
-class EgNode : public Var
+class EgNode : public Var {
-{
   public:
     EgNode (VarId vid, unsigned range) : Var (vid, range) { }
 
@@ -46,8 +44,7 @@ class EgNode : public Var
 };
 
 
-class ElimGraph
+class ElimGraph {
-{
   public:
     ElimGraph (const Factors&);
 

packages/CLPBN/horus/Factor.h

@@ -13,8 +13,7 @@
 namespace Horus {
 
 template <typename T>
-class TFactor
+class TFactor {
-{
   public:
     const std::vector<T>& arguments (void) const { return args_; }
 
@@ -327,8 +326,7 @@ TFactor<T>::cartesianProduct (
 
 
 
-class Factor : public TFactor<VarId>
+class Factor : public TFactor<VarId> {
-{
   public:
     Factor (void) { }
 

packages/CLPBN/horus/FactorGraph.h

@@ -16,8 +16,7 @@ namespace Horus {
 class FacNode;
 
 
-class VarNode : public Var
+class VarNode : public Var {
-{
   public:
     VarNode (VarId varId, unsigned nrStates,
         int evidence = Constants::NO_EVIDENCE)
@@ -37,8 +36,7 @@ class VarNode : public Var
 
 
 
-class FacNode
+class FacNode {
-{
   public:
     FacNode (const Factor& f) : factor_(f), index_(-1) { }
 
@@ -66,8 +64,7 @@ class FacNode
 
 
 
-class FactorGraph
+class FactorGraph {
-{
   public:
     FactorGraph (void) : bayesFactors_(false) { }
 

packages/CLPBN/horus/GroundSolver.h

@@ -7,8 +7,7 @@
 
 namespace Horus {
 
-class GroundSolver
+class GroundSolver {
-{
   public:
     GroundSolver (const FactorGraph& factorGraph) : fg(factorGraph) { }
 

packages/CLPBN/horus/Histogram.h

@@ -11,8 +11,7 @@ typedef std::vector<unsigned> Histogram;
 
 namespace Horus {
 
-class HistogramSet
+class HistogramSet {
-{
   public:
     HistogramSet (unsigned, unsigned);
 

packages/CLPBN/horus/Horus.h

@@ -34,16 +34,14 @@ typedef std::vector<unsigned>    Ranges;
 typedef unsigned long long       ullong;
 
 
-enum LiftedSolverType
+enum LiftedSolverType {
-{
   LVE,  // generalized counting first-order variable elimination (GC-FOVE)
   LBP,  // lifted first-order belief propagation
   LKC   // lifted first-order knowledge compilation
 };
 
 
-enum GroundSolverType
+enum GroundSolverType {
-{
   VE,   // variable elimination
   BP,   // belief propagation
   CBP   // counting belief propagation

packages/CLPBN/horus/Indexer.h

@@ -12,8 +12,7 @@
 
 namespace Horus {
 
-class Indexer
+class Indexer {
-{
   public:
     Indexer (const Ranges& ranges, bool calcOffsets = true);
 
@@ -200,8 +199,7 @@ operator<< (std::ostream& os, const Indexer& indexer)
 
 
 
-class MapIndexer
+class MapIndexer {
-{
   public:
     MapIndexer (const Ranges& ranges, const std::vector<bool>& mask);
 

packages/CLPBN/horus/LiftedBp.h

@@ -12,16 +12,15 @@ namespace Horus {
 class FactorGraph;
 class WeightedBp;
 
-class LiftedBp : public LiftedSolver
+class LiftedBp : public LiftedSolver{
-{
   public:
-   LiftedBp (const ParfactorList& pfList);
+    LiftedBp (const ParfactorList& pfList);
 
-  ~LiftedBp (void);
+   ~LiftedBp (void);
 
-   Params solveQuery (const Grounds&);
+    Params solveQuery (const Grounds&);
 
-   void printSolverFlags (void) const;
+    void printSolverFlags (void) const;
 
   private:
     void refineParfactors (void);

packages/CLPBN/horus/LiftedKc.h

@@ -27,8 +27,7 @@ enum CircuitNodeType {
 
 
 
-class CircuitNode
+class CircuitNode {
-{
   public:
     CircuitNode (void) { }
 
@@ -39,8 +38,7 @@ class CircuitNode
 
 
 
-class OrNode : public CircuitNode
+class OrNode : public CircuitNode {
-{
   public:
     OrNode (void) : CircuitNode(), leftBranch_(0), rightBranch_(0) { }
 
@@ -58,8 +56,7 @@ class OrNode : public CircuitNode
 
 
 
-class AndNode : public CircuitNode
+class AndNode : public CircuitNode {
-{
   public:
     AndNode (void) : CircuitNode(), leftBranch_(0), rightBranch_(0) { }
 
@@ -80,8 +77,7 @@ class AndNode : public CircuitNode
 
 
 
-class SetOrNode	: public CircuitNode
+class SetOrNode	: public CircuitNode {
-{
   public:
     SetOrNode (unsigned nrGroundings)
         : CircuitNode(), follow_(0), nrGroundings_(nrGroundings) { }
@@ -107,8 +103,7 @@ class SetOrNode	: public CircuitNode
 
 
 
-class SetAndNode : public CircuitNode
+class SetAndNode : public CircuitNode {
-{
   public:
     SetAndNode (unsigned nrGroundings)
         : CircuitNode(), follow_(0), nrGroundings_(nrGroundings) { }
@@ -126,8 +121,7 @@ class SetAndNode : public CircuitNode
 
 
 
-class IncExcNode : public CircuitNode
+class IncExcNode : public CircuitNode {
-{
   public:
     IncExcNode (void)
         : CircuitNode(), plus1Branch_(0), plus2Branch_(0), minusBranch_(0) { }
@@ -148,8 +142,7 @@ class IncExcNode : public CircuitNode
 
 
 
-class LeafNode : public CircuitNode
+class LeafNode : public CircuitNode {
-{
   public:
     LeafNode (Clause* clause, const LiftedWCNF& lwcnf)
         : CircuitNode(), clause_(clause), lwcnf_(lwcnf) { }
@@ -169,8 +162,7 @@ class LeafNode : public CircuitNode
 
 
 
-class SmoothNode : public CircuitNode
+class SmoothNode : public CircuitNode {
-{
   public:
     SmoothNode (const Clauses& clauses, const LiftedWCNF& lwcnf)
         : CircuitNode(), clauses_(clauses), lwcnf_(lwcnf) { }
@@ -190,8 +182,7 @@ class SmoothNode : public CircuitNode
 
 
 
-class TrueNode : public CircuitNode
+class TrueNode : public CircuitNode {
-{
   public:
     TrueNode (void) : CircuitNode() { }
 
@@ -200,8 +191,7 @@ class TrueNode : public CircuitNode
 
 
 
-class CompilationFailedNode : public CircuitNode
+class CompilationFailedNode : public CircuitNode {
-{
   public:
     CompilationFailedNode (void) : CircuitNode() { }
 
@@ -210,8 +200,7 @@ class CompilationFailedNode : public CircuitNode
 
 
 
-class LiftedCircuit
+class LiftedCircuit {
-{
   public:
     LiftedCircuit (const LiftedWCNF* lwcnf);
 
@@ -285,8 +274,7 @@ class LiftedCircuit
 
 
 
-class LiftedKc : public LiftedSolver
+class LiftedKc : public LiftedSolver {
-{
   public:
    LiftedKc (const ParfactorList& pfList)
        : LiftedSolver(pfList) { }

packages/CLPBN/horus/LiftedOperations.h

@@ -6,8 +6,7 @@
 
 namespace Horus {
 
-class LiftedOperations
+class LiftedOperations {
-{
   public:
     static void shatterAgainstQuery (
         ParfactorList& pfList, const Grounds& query);

packages/CLPBN/horus/LiftedSolver.h

@@ -6,8 +6,7 @@
 
 namespace Horus {
 
-class LiftedSolver
+class LiftedSolver {
-{
   public:
     LiftedSolver (const ParfactorList& pfList)
         : parfactorList(pfList) { }

packages/CLPBN/horus/LiftedUtils.h

@@ -12,8 +12,7 @@
 
 namespace Horus {
 
-class Symbol
+class Symbol {
-{
   public:
     Symbol (void) : id_(Util::maxUnsigned()) { }
 
@@ -32,8 +31,7 @@ class Symbol
 };
 
 
-class LogVar
+class LogVar {
-{
   public:
     LogVar (void) : id_(Util::maxUnsigned()) { }
 
@@ -111,8 +109,7 @@ void printSymbolDictionary (void);
 
 
 
-class Ground
+class Ground {
-{
   public:
     Ground (Symbol f) : functor_(f) { }
 
@@ -138,8 +135,7 @@ typedef std::vector<Ground> Grounds;
 
 
 
-class Substitution
+class Substitution {
-{
   public:
     void add (LogVar X_old, LogVar X_new);
 

packages/CLPBN/horus/LiftedVe.h

@@ -10,8 +10,7 @@
 
 namespace Horus {
 
-class LiftedOperator
+class LiftedOperator {
-{
   public:
     virtual ~LiftedOperator (void) { }
 
@@ -35,8 +34,7 @@ class LiftedOperator
 
 
 
-class ProductOperator : public LiftedOperator
+class ProductOperator : public LiftedOperator {
-{
   public:
     ProductOperator (
         ParfactorList::iterator g1, ParfactorList::iterator g2,
@@ -62,8 +60,7 @@ class ProductOperator : public LiftedOperator
 
 
 
-class SumOutOperator : public LiftedOperator
+class SumOutOperator : public LiftedOperator {
-{
   public:
     SumOutOperator (PrvGroup group, ParfactorList& pfList)
         : group_(group), pfList_(pfList) { }
@@ -90,8 +87,7 @@ class SumOutOperator : public LiftedOperator
 
 
 
-class CountingOperator : public LiftedOperator
+class CountingOperator : public LiftedOperator {
-{
   public:
     CountingOperator (
         ParfactorList::iterator pfIter,
@@ -119,8 +115,7 @@ class CountingOperator : public LiftedOperator
 
 
 
-class GroundOperator : public LiftedOperator
+class GroundOperator : public LiftedOperator {
-{
   public:
     GroundOperator (
         PrvGroup group,
@@ -148,8 +143,7 @@ class GroundOperator : public LiftedOperator
 
 
 
-class LiftedVe : public LiftedSolver
+class LiftedVe : public LiftedSolver {
-{
   public:
    LiftedVe (const ParfactorList& pfList)
        : LiftedSolver(pfList) { }

packages/CLPBN/horus/LiftedWCNF.h

@@ -15,14 +15,17 @@ namespace Horus {
 
 class ParfactorList;
 
-enum LogVarType { FULL_LV, POS_LV, NEG_LV };
+enum LogVarType {
+  FULL_LV,
+  POS_LV,
+  NEG_LV
+};
 
 typedef long                     LiteralId;
 typedef std::vector<LogVarType>  LogVarTypes;
 
 
-class Literal
+class Literal {
-{
   public:
     Literal (LiteralId lid, const LogVars& lvs)
         : lid_(lid), logVars_(lvs), negated_(false) { }
@@ -65,8 +68,7 @@ typedef std::vector<Literal> Literals;
 
 
 
-class Clause
+class Clause {
-{
   public:
     Clause (const ConstraintTree& ct = ConstraintTree({})) : constr_(ct) { }
 
@@ -160,8 +162,7 @@ typedef std::vector<Clause*> Clauses;
 
 
 
-class LitLvTypes
+class LitLvTypes {
-{
   public:
     LitLvTypes (LiteralId lid, const LogVarTypes& lvTypes) :
         lid_(lid), lvTypes_(lvTypes) { }
@@ -201,8 +202,7 @@ typedef TinySet<LitLvTypes, CmpLitLvTypes> LitLvTypesSet;
 
 
 
-class LiftedWCNF
+class LiftedWCNF {
-{
   public:
     LiftedWCNF (const ParfactorList& pfList);
 

packages/CLPBN/horus/Parfactor.h

@@ -13,8 +13,7 @@
 
 namespace Horus {
 
-class Parfactor : public TFactor<ProbFormula>
+class Parfactor : public TFactor<ProbFormula> {
-{
   public:
     Parfactor (
         const ProbFormulas&,

packages/CLPBN/horus/ParfactorList.h

@@ -12,8 +12,7 @@ namespace Horus {
 class Parfactor;
 
 
-class ParfactorList
+class ParfactorList {
-{
   public:
     ParfactorList (void) { }
 
@@ -103,8 +102,7 @@ class ParfactorList
         const ProbFormula&, ConstraintTree,
         const ProbFormula&, ConstraintTree) const;
 
-    struct sortByParams
+    struct sortByParams {
-    {
       bool operator() (const Parfactor* pf1, const Parfactor* pf2)
       {
         if (pf1->params().size() < pf2->params().size()) {

packages/CLPBN/horus/ProbFormula.h

@@ -14,8 +14,7 @@ namespace Horus {
 
 typedef unsigned long PrvGroup;
 
-class ProbFormula
+class ProbFormula {
-{
   public:
     ProbFormula (Symbol f, const LogVars& lvs, unsigned range)
         : functor_(f), logVars_(lvs), range_(range),
@@ -81,8 +80,7 @@ class ProbFormula
 typedef std::vector<ProbFormula> ProbFormulas;
 
 
-class ObservedFormula
+class ObservedFormula {
-{
   public:
     ObservedFormula (Symbol f, unsigned a, unsigned ev);
 

packages/CLPBN/horus/TinySet.h

@@ -9,8 +9,7 @@
 namespace Horus {
 
 template <typename T, typename Compare = std::less<T>>
-class TinySet
+class TinySet {
-{
   public:
     typedef typename std::vector<T>::iterator       iterator;
     typedef typename std::vector<T>::const_iterator const_iterator;

packages/CLPBN/horus/Var.h

@@ -12,8 +12,7 @@
 
 namespace Horus {
 
-struct VarInfo
+struct VarInfo {
-{
   VarInfo (std::string l, const States& sts)
       : label(l), states(sts) { }
   std::string label;
@@ -21,8 +20,7 @@ struct VarInfo
 };
 
 
-class Var
+class Var {
-{
   public:
     Var (const Var*);
 

packages/CLPBN/horus/VarElim.h

@@ -11,8 +11,7 @@
 
 namespace Horus {
 
-class VarElim : public GroundSolver
+class VarElim : public GroundSolver {
-{
   public:
     VarElim (const FactorGraph& fg) : GroundSolver (fg) { }
 

packages/CLPBN/horus/WeightedBp.h

@@ -8,8 +8,7 @@
 
 namespace Horus {
 
-class WeightedLink : public BpLink
+class WeightedLink : public BpLink {
-{
   public:
     WeightedLink (FacNode* fn, VarNode* vn, size_t idx, unsigned weight)
         : BpLink (fn, vn), index_(idx), weight_(weight),
@@ -43,8 +42,7 @@ WeightedLink::updateMessage (void)
 
 
 
-class WeightedBp : public BeliefProp
+class WeightedBp : public BeliefProp {
-{
   public:
     WeightedBp (const FactorGraph& fg,
         const std::vector<std::vector<unsigned>>& weights)