yay, my first commit

packages/CLPBN/clpbn/bp/LiftedUtils.h

@@ -18,11 +18,17 @@ class Symbol
 {
   public:
     Symbol (void) : id_(numeric_limits<unsigned>::max()) { }
+
     Symbol (unsigned id) : id_(id) { }
+
     operator unsigned (void) const { return id_; }
+
     bool valid (void) const { return id_ != numeric_limits<unsigned>::max(); }
+
     static Symbol invalid (void) { return Symbol(); }
+
     friend ostream& operator<< (ostream &os, const Symbol& s);
+
   private:
     unsigned id_;
 };
@@ -32,7 +38,9 @@ class LogVar
 {
   public:
     LogVar (void) : id_(numeric_limits<unsigned>::max()) { }
+
     LogVar (unsigned id) : id_(id) { }
+
     operator unsigned (void) const  { return id_; }
 
     LogVar& operator++ (void)
@@ -48,6 +56,7 @@ class LogVar
     }
 
     friend ostream& operator<< (ostream &os, const LogVar& X);
+
   private:
     unsigned id_;
 };
@@ -79,8 +88,8 @@ ostream& operator<< (ostream &os, const Tuple& t);
 
 
 namespace LiftedUtils {
-Symbol  getSymbol (const string&);
-void    printSymbolDictionary (void);
+Symbol getSymbol (const string&);
+void  printSymbolDictionary (void);
 }
 
 
@@ -89,69 +98,51 @@ class Ground
 {
   public:
     Ground (Symbol f) : functor_(f) { }
+
     Ground (Symbol f, const Symbols& args) : functor_(f), args_(args) { }
 
-    Symbol    functor (void) const  { return functor_; }
-    Symbols   args    (void) const  { return args_; }
-    unsigned  arity   (void) const  { return args_.size(); }
-    bool      isAtom  (void) const  { return args_.size() == 0; }
+    Symbol functor (void) const { return functor_; }
+
+    Symbols args (void) const { return args_; }
+
+    unsigned arity (void) const { return args_.size(); }
+
+    bool isAtom (void) const { return args_.size() == 0; }
+
     friend ostream& operator<< (ostream &os, const Ground& gr);
+
   private:
-    Symbol    functor_;
-    Symbols   args_;
+    Symbol   functor_;
+    Symbols  args_;
 };
+
 typedef vector<Ground> Grounds;
 
 
 
-class ConstraintTree;
-class ObservedFormula
-{
-  public:
-    ObservedFormula (Symbol f, unsigned a, unsigned ev) 
-        : functor_(f), arity_(a), evidence_(ev), constr_(0) { }
-
-    ObservedFormula (Symbol f, unsigned ev, const Tuple& tuple) 
-        : functor_(f), arity_(tuple.size()), evidence_(ev), constr_(0)
-    {
-      addTuple (tuple);
-    }
-
-    Symbol          functor   (void) const  { return functor_;    }
-    unsigned        arity     (void) const  { return arity_;      }
-    unsigned        evidence  (void) const  { return evidence_;   }
-    ConstraintTree* constr    (void) const  { return constr_;     }
-    bool            isAtom    (void) const  { return arity_ == 0; }
-
-    void addTuple (const Tuple& t);
-    friend ostream& operator<< (ostream &os, const ObservedFormula opv);
-  private:
-    Symbol            functor_;
-    unsigned          arity_;
-    unsigned          evidence_;
-    ConstraintTree*   constr_;
-};
-typedef vector<ObservedFormula*> ObservedFormulas;
-
-
-
 class Substitution
 {
   public:
     void add (LogVar X_old, LogVar X_new)
     {
+      assert (Util::contains (subs_, X_old) == false);
       subs_.insert (make_pair (X_old, X_new));
     }
+
     void rename (LogVar X_old, LogVar X_new)
     {
-      assert (subs_.find (X_old) != subs_.end());
+      assert (Util::contains (subs_, X_old));
       subs_.find (X_old)->second = X_new;
     }
+
     LogVar newNameFor (LogVar X) const
     {
-      assert (subs_.find (X) != subs_.end());
+      assert (Util::contains (subs_, X));
       return subs_.find (X)->second;
     }
+
+    friend ostream& operator<< (ostream &os, const Substitution& theta);
+
   private:
     unordered_map<LogVar, LogVar> subs_;
 };