ok, second try

packages/CLPBN/horus/ProbFormula.cpp

@@ -0,0 +1,139 @@
+#include "ProbFormula.h"
+
+
+int ProbFormula::freeGroup_ = 0;
+
+
+
+bool
+ProbFormula::sameSkeletonAs (const ProbFormula& f) const
+{
+  return functor_ == f.functor() && logVars_.size() == f.arity();
+}
+
+
+
+bool
+ProbFormula::contains (LogVar lv) const
+{
+  return Util::contains (logVars_, lv);
+}
+
+
+
+bool
+ProbFormula::contains (LogVarSet s) const
+{
+  return LogVarSet (logVars_).contains (s);
+}
+
+
+
+int
+ProbFormula::indexOf (LogVar X) const
+{
+  return Util::indexOf (logVars_, X);
+}
+
+
+
+bool
+ProbFormula::isAtom (void) const
+{
+  return logVars_.size() == 0;
+}
+
+
+
+bool
+ProbFormula::isCounting (void) const
+{
+  return countedLogVar_.valid();
+}
+
+
+
+LogVar
+ProbFormula::countedLogVar (void) const
+{
+  assert (isCounting());
+  return countedLogVar_;
+}
+
+
+    
+void
+ProbFormula::setCountedLogVar (LogVar lv)
+{
+  countedLogVar_ = lv;
+}
+
+
+
+void
+ProbFormula::clearCountedLogVar (void)
+{
+  countedLogVar_ = LogVar();
+}
+
+
+
+void
+ProbFormula::rename (LogVar oldName, LogVar newName)
+{
+  for (unsigned i = 0; i < logVars_.size(); i++) {
+    if (logVars_[i] == oldName) {
+      logVars_[i] = newName;
+    }
+  }
+  if (isCounting() && countedLogVar_ == oldName) {
+    countedLogVar_ = newName;
+  }
+}
+
+
+bool operator== (const ProbFormula& f1, const ProbFormula& f2)
+{ 
+  return f1.group_   == f2.group_ && 
+         f1.logVars_ == f2.logVars_;
+}
+
+
+
+std::ostream& operator<< (ostream &os, const ProbFormula& f)
+{
+  os << f.functor_;
+  if (f.isAtom() == false) {
+    os << "(" ;
+    for (unsigned i = 0; i < f.logVars_.size(); i++) {
+     if (i != 0) os << ",";
+      if (f.isCounting() && f.logVars_[i] == f.countedLogVar_) {
+        os << "#" ;
+      }
+      os << f.logVars_[i];
+    }
+    os << ")" ;
+  }
+  os << "::" << f.range_;
+  return os;
+}
+
+
+
+unsigned
+ProbFormula::getNewGroup (void)
+{
+  freeGroup_ ++;
+  return freeGroup_;
+}
+
+
+
+ostream& operator<< (ostream &os, const ObservedFormula& of)
+{
+  os << of.functor_ << "/" << of.arity_;
+  os << "|" << of.constr_.tupleSet();
+  os << " [evidence=" << of.evidence_ << "]";
+  return os;
+}
+