Move template definitions to source file and use explicite template instantiation.

packages/CLPBN/horus/Factor.cpp

@@ -5,6 +5,7 @@
 #include <sstream>
 
 #include "Factor.h"
+#include "Indexer.h"
 #include "Var.h"
 
 

packages/CLPBN/horus/Factor.h

@@ -7,7 +7,6 @@
 #include <string>
 
 #include "GenericFactor.h"
-#include "Indexer.h"
 #include "Util.h"
 
 

packages/CLPBN/horus/GroundSolver.cpp

@@ -9,6 +9,7 @@
 #include "VarElim.h"
 #include "BeliefProp.h"
 #include "CountingBp.h"
+#include "Indexer.h"
 #include "Util.h"
 
 

packages/CLPBN/horus/LiftedBp.h

@@ -5,6 +5,7 @@
 
 #include "LiftedSolver.h"
 #include "ParfactorList.h"
+#include "Indexer.h"
 
 
 namespace Horus {

packages/CLPBN/horus/Parfactor.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "Factor.h"
+#include "GenericFactor.h"
 #include "ProbFormula.h"
 #include "ConstraintTree.h"
 #include "LiftedUtils.h"

packages/CLPBN/horus/ProbFormula.cpp

@@ -100,15 +100,6 @@ ProbFormula::rename (LogVar oldName, LogVar newName)
 
 
 
-bool
-operator== (const ProbFormula& f1, const ProbFormula& f2)
-{
-  return f1.group_   == f2.group_ &&
-         f1.logVars_ == f2.logVars_;
-}
-
-
-
 std::ostream&
 operator<< (std::ostream& os, const ProbFormula& f)
 {

packages/CLPBN/horus/ProbFormula.h

@@ -63,6 +63,7 @@ class ProbFormula {
     static PrvGroup getNewGroup();
 
   private:
+
     friend bool operator== (
         const ProbFormula& f1, const ProbFormula& f2);
 
@@ -80,6 +81,14 @@ class ProbFormula {
 typedef std::vector<ProbFormula> ProbFormulas;
 
 
+inline bool
+operator== (const ProbFormula& f1, const ProbFormula& f2)
+{
+  return f1.group_ == f2.group_ && f1.logVars_ == f2.logVars_;
+}
+
+
+
 class ObservedFormula {
   public:
     ObservedFormula (Symbol f, unsigned a, unsigned ev);