yay, my first commit

packages/CLPBN/clpbn/bp/ProbFormula.h

@@ -8,14 +8,16 @@
 #include "Horus.h"
 
 
+
 class ProbFormula
 {
   public:
     ProbFormula (Symbol f, const LogVars& lvs, unsigned range) 
         : functor_(f), logVars_(lvs), range_(range),
-          countedLogVar_() { }
+          countedLogVar_(), group_(Util::maxUnsigned()) { }
 
-    ProbFormula (Symbol f, unsigned r) : functor_(f), range_(r) { }
+    ProbFormula (Symbol f, unsigned r) 
+        : functor_(f), range_(r), group_(Util::maxUnsigned()) { }
 
     Symbol functor (void) const { return functor_; }
 
@@ -29,9 +31,9 @@ class ProbFormula
 
     LogVarSet logVarSet (void) const { return LogVarSet (logVars_); }
   
-    unsigned group (void) const { return groupId_; }
+    unsigned group (void) const { return group_; }
 
-    void setGroup (unsigned g) { groupId_ = g; }
+    void setGroup (unsigned g) { group_ = g; }
    
     bool sameSkeletonAs (const ProbFormula&) const;
 
@@ -49,23 +51,58 @@ class ProbFormula
  
     void rename (LogVar, LogVar);
     
-    bool operator== (const ProbFormula& f) const;
-
-    friend ostream& operator<< (ostream &out, const ProbFormula& f);
-
     static unsigned getNewGroup (void);
 
+    friend std::ostream& operator<< (ostream &os, const ProbFormula& f);
+
+    friend bool operator== (const ProbFormula& f1, const ProbFormula& f2);
+
   private: 
-    Symbol          functor_;
-    LogVars         logVars_;
-    unsigned        range_;
-    LogVar          countedLogVar_;
-    unsigned        groupId_;
-    static int      freeGroup_;
+    Symbol     functor_;
+    LogVars    logVars_;
+    unsigned   range_;
+    LogVar     countedLogVar_;
+    unsigned   group_;
+    static int freeGroup_;
 };
 
 typedef vector<ProbFormula> ProbFormulas;
 
 
+class ObservedFormula
+{
+  public:
+    ObservedFormula (Symbol f, unsigned a, unsigned ev) 
+        : functor_(f), arity_(a), evidence_(ev), constr_(a) { }
+
+    ObservedFormula (Symbol f, unsigned ev, const Tuple& tuple) 
+        : functor_(f), arity_(tuple.size()), evidence_(ev), constr_(arity_)
+    {
+      constr_.addTuple (tuple);
+    }
+
+    Symbol functor (void) const { return functor_; }
+
+    unsigned arity (void) const { return arity_; }
+
+    unsigned evidence (void) const  { return evidence_; }
+
+    ConstraintTree& constr (void) { return constr_; }
+
+    bool isAtom (void) const { return arity_ == 0; }
+
+    void addTuple (const Tuple& tuple) { constr_.addTuple (tuple); }
+
+    friend ostream& operator<< (ostream &os, const ObservedFormula& of);
+
+  private:
+    Symbol          functor_;
+    unsigned        arity_;
+    unsigned        evidence_;
+    ConstraintTree  constr_;
+};
+
+typedef vector<ObservedFormula> ObservedFormulas;
+
 #endif // HORUS_PROBFORMULA_H