From a06e8060aea2f3c08b959a5b96fdcc6f5181be45 Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Mon, 8 Oct 2012 23:56:31 +0000
Subject: [PATCH] Made new marginals with caching the default

---
 gtsam/inference/BayesTree-inl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gtsam/inference/BayesTree-inl.h b/gtsam/inference/BayesTree-inl.h
index 0baf8c99b..9df47af2c 100644
--- a/gtsam/inference/BayesTree-inl.h
+++ b/gtsam/inference/BayesTree-inl.h
@@ -500,10 +500,10 @@ namespace gtsam {
     sharedClique clique = (*this)[j];
 
     // calculate or retrieve its marginal P(C) = P(F,S)
-#ifdef MARGINAL2
-    FactorGraph<FactorType> cliqueMarginal = clique->marginal2(root_,function);
-#else
+#ifdef OLD_SHORTCUT_MARGINALS
     FactorGraph<FactorType> cliqueMarginal = clique->marginal(root_,function);
+#else
+    FactorGraph<FactorType> cliqueMarginal = clique->marginal2(root_,function);
 #endif
 
     // Reduce the variable indices to start at zero