Explicit template instantiation in .cpp files, so we can link with the code without having to include -inl.h everywhere...

cpp/ConstrainedLinearFactorGraph.cpp

@@ -4,8 +4,9 @@
  */
 
 #include <iostream>
+#include <boost/tuple/tuple.hpp>
+#include <boost/foreach.hpp>
 #include "ConstrainedLinearFactorGraph.h"
-#include "FactorGraph-inl.h" // for getOrdering
 using namespace std;
 
 // trick from some reading group

cpp/LinearFactorGraph.cpp

@@ -20,6 +20,9 @@
 using namespace std;
 using namespace gtsam;
 
+// Explicitly instantiate so we don't have to include everywhere
+template class FactorGraph<LinearFactor>;
+
 // explicitly instantiate conversion from LinearFG to SymbolicFG
 template SymbolicBayesChain::SymbolicBayesChain
 	(FactorGraph<LinearFactor> const&, Ordering const&);

cpp/SymbolicFactorGraph.cpp

@@ -7,6 +7,7 @@
 
 #include <boost/foreach.hpp>
 #include "Ordering.h"
+#include "FactorGraph-inl.h"
 #include "SymbolicFactorGraph.h"
 #include "SymbolicBayesChain.h"
 
@@ -14,6 +15,9 @@ using namespace std;
 
 namespace gtsam {
 
+	// Explicitly instantiate so we don't have to include everywhere
+	template class FactorGraph<SymbolicFactor>;
+
 	/* ************************************************************************* */
 	SymbolicBayesChain::shared_ptr
 	SymbolicFactorGraph::eliminate(const Ordering& ordering)

cpp/testConstrainedLinearFactorGraph.cpp

@@ -6,7 +6,6 @@
 #include <iostream>
 #include <CppUnitLite/TestHarness.h>
 #include "ConstrainedLinearFactorGraph.h"
-#include "FactorGraph-inl.h"
 #include "LinearFactorGraph.h"
 #include "smallExample.h"
 

cpp/testLinearFactorGraph.cpp

@@ -14,9 +14,6 @@ using namespace std;
 #include "Matrix.h"
 #include "smallExample.h"
 
-// template definitions
-#include "FactorGraph-inl.h"
-
 using namespace gtsam;
 
 double tol=1e-4;

cpp/testSymbolicBayesChain.cpp

@@ -7,7 +7,6 @@
 #include <CppUnitLite/TestHarness.h>
 
 #include "smallExample.h"
-#include "FactorGraph-inl.h"
 #include "SymbolicBayesChain.h"
 
 using namespace std;

cpp/testSymbolicFactorGraph.cpp

@@ -7,9 +7,7 @@
 #include <CppUnitLite/TestHarness.h>
 
 #include "smallExample.h"
-#include "FactorGraph-inl.h"
 #include "SymbolicFactorGraph.h"
-#include "SymbolicConditional.h"
 #include "SymbolicBayesChain.h"
 
 using namespace std;