Moved template definitions to BayesTree-inl.h

cpp/BayesTree-inl.h

@@ -0,0 +1,27 @@
+/**
+ * @file    BayesTree.cpp
+ * @brief   Bayes Tree is a tree of cliques of a Bayes Chain
+ * @author  Frank Dellaert
+ */
+
+#include "BayesTree.h"
+
+using namespace std;
+
+namespace gtsam {
+
+	template<class Conditional>
+	BayesTree<Conditional>::BayesTree(BayesChain<Conditional>& bayesChain) {
+	}
+
+	template<class Conditional>
+	void BayesTree<Conditional>::print(const string& s) const {
+	}
+
+	template<class Conditional>
+	bool BayesTree<Conditional>::equals(const BayesTree<Conditional>& other,
+			double tol) const {
+		return false;
+	}
+
+} /// namespace gtsam

cpp/BayesTree.h

@@ -28,16 +28,16 @@ class BayesTree : public Testable<BayesTree<Conditional> >
 public:
 
 	/** Create a Bayes Tree from a SymbolicBayesChain */
-	BayesTree(BayesChain<Conditional>& bayesChain) {}
+	BayesTree(BayesChain<Conditional>& bayesChain);
 
 	/** Destructor */
 	virtual ~BayesTree() {}
 
 	/** print */
-	void print(const std::string& s = "") const {}
+	void print(const std::string& s = "") const;
 
 	/** check equality */
-	bool equals(const BayesTree<Conditional>& other, double tol = 1e-9) const { return false; }
+	bool equals(const BayesTree<Conditional>& other, double tol = 1e-9) const;
 
 }; // BayesTree
 

cpp/Makefile.am

@@ -86,7 +86,7 @@ timeLinearFactor: LDFLAGS += -L.libs -lgtsam
 
 # graphs 
 sources += SymbolicFactorGraph.cpp LinearFactorGraph.cpp 
-sources += SymbolicBayesChain.cpp ChordalBayesNet.cpp 
+sources += SymbolicBayesChain.cpp ChordalBayesNet.cpp
 sources += ConstrainedNonlinearFactorGraph.cpp ConstrainedLinearFactorGraph.cpp 
 check_PROGRAMS += testFactorgraph testSymbolicFactorGraph
 check_PROGRAMS += testLinearFactorGraph testNonlinearFactorGraph 
@@ -161,13 +161,14 @@ testVSLAMFactor_LDADD = libgtsam.la
 
 
 # The header files will be installed in ~/include/gtsam
-headers = gtsam.h Value.h Testable.h Factor.h LinearFactorSet.h BayesChain.h
+headers = gtsam.h Value.h Testable.h Factor.h LinearFactorSet.h 
 headers += Point2Prior.h Simulated2DOdometry.h Simulated2DMeasurement.h smallExample.h 
 headers += $(sources:.cpp=.h)
 # templates: 
 headers += FactorGraph.h FactorGraph-inl.h
 headers += NonlinearFactorGraph.h NonlinearFactorGraph-inl.h
 headers += NonlinearOptimizer.h NonlinearOptimizer-inl.h 
+headers += BayesChain.h BayesChain-inl.h BayesTree.h BayesTree-inl.h
 
 # create both dynamic and static libraries
 AM_CXXFLAGS = -I$(boost) -fPIC

cpp/testBayesTree.cpp

@@ -8,7 +8,7 @@
 
 #include "SymbolicBayesChain.h"
 #include "smallExample.h"
-#include "BayesTree.h"
+#include "BayesTree-inl.h"
 
 using namespace gtsam;