From 48b33c44d3e361e3a065b9a3a753b62bd88a4b57 Mon Sep 17 00:00:00 2001
From: Stephen Williams <stephen.vincent.williams@gmail.com>
Date: Thu, 21 Jun 2012 20:26:30 +0000
Subject: [PATCH] Added constructors from a BayesTree to the
 SymbolicFactorGraph

---
 gtsam/inference/SymbolicFactorGraph.cpp | 8 ++++++--
 gtsam/inference/SymbolicFactorGraph.h   | 9 +++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/gtsam/inference/SymbolicFactorGraph.cpp b/gtsam/inference/SymbolicFactorGraph.cpp
index 514ba156b..b58a69b6d 100644
--- a/gtsam/inference/SymbolicFactorGraph.cpp
+++ b/gtsam/inference/SymbolicFactorGraph.cpp
@@ -27,10 +27,14 @@ namespace gtsam {
 	using namespace std;
 
   /* ************************************************************************* */
-	SymbolicFactorGraph::SymbolicFactorGraph(const BayesNet<IndexConditional>& bayesNet) :
+	SymbolicFactorGraph::SymbolicFactorGraph(const SymbolicBayesNet& bayesNet) :
 	    FactorGraph<IndexFactor>(bayesNet) {}
 
-	/* ************************************************************************* */
+  /* ************************************************************************* */
+  SymbolicFactorGraph::SymbolicFactorGraph(const SymbolicBayesTree& bayesTree) :
+      FactorGraph<IndexFactor>(bayesTree) {}
+
+  /* ************************************************************************* */
   void SymbolicFactorGraph::push_factor(Index key) {
     push_back(boost::make_shared<IndexFactor>(key));
   }
diff --git a/gtsam/inference/SymbolicFactorGraph.h b/gtsam/inference/SymbolicFactorGraph.h
index 4da2baf13..d5d808f17 100644
--- a/gtsam/inference/SymbolicFactorGraph.h
+++ b/gtsam/inference/SymbolicFactorGraph.h
@@ -23,12 +23,14 @@
 
 namespace gtsam { template<class FACTOR> class EliminationTree; }
 namespace gtsam { template<class CONDITIONAL> class BayesNet; }
+namespace gtsam { template<class CONDITIONAL, class CLIQUE> class BayesTree; }
 namespace gtsam { class IndexConditional; }
 
 namespace gtsam {
 
+  typedef EliminationTree<IndexFactor> SymbolicEliminationTree;
 	typedef BayesNet<IndexConditional> SymbolicBayesNet;
-	typedef EliminationTree<IndexFactor> SymbolicEliminationTree;
+	typedef BayesTree<IndexConditional> SymbolicBayesTree;
 
 	/** Symbolic IndexFactor Graph
 	 *  \nosubgrouping
@@ -45,7 +47,10 @@ namespace gtsam {
 		}
 
 		/** Construct from a BayesNet */
-		SymbolicFactorGraph(const BayesNet<IndexConditional>& bayesNet);
+		SymbolicFactorGraph(const SymbolicBayesNet& bayesNet);
+
+    /** Construct from a BayesTree */
+    SymbolicFactorGraph(const SymbolicBayesTree& bayesTree);
 
 		/**
 		 * Construct from a factor graph of any type