From 55ff10a1c2d7cc302fd5b09e9a89f91920eee8fe Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Wed, 6 Jun 2012 12:51:44 +0000
Subject: [PATCH] Updated old timing statements in discrete examples and
 reenabled the examples

---
 gtsam_unstable/discrete/CMakeLists.txt                 | 4 ++--
 gtsam_unstable/discrete/examples/schedulingExample.cpp | 5 ++---
 gtsam_unstable/discrete/examples/schedulingQuals12.cpp | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gtsam_unstable/discrete/CMakeLists.txt b/gtsam_unstable/discrete/CMakeLists.txt
index d40d4e48f..edec85416 100644
--- a/gtsam_unstable/discrete/CMakeLists.txt
+++ b/gtsam_unstable/discrete/CMakeLists.txt
@@ -27,8 +27,8 @@ add_dependencies(check.unstable check.discrete_unstable)
 
 # List examples to build - comment out here to exclude from compilation
 set(discrete_unstable_examples
-#schedulingExample
-#schedulingQuals12
+schedulingExample
+schedulingQuals12
 )
 
 if (GTSAM_BUILD_EXAMPLES)
diff --git a/gtsam_unstable/discrete/examples/schedulingExample.cpp b/gtsam_unstable/discrete/examples/schedulingExample.cpp
index 14e4367f5..0f9854007 100644
--- a/gtsam_unstable/discrete/examples/schedulingExample.cpp
+++ b/gtsam_unstable/discrete/examples/schedulingExample.cpp
@@ -8,7 +8,6 @@
 //#define ENABLE_TIMING
 #define ADD_NO_CACHING
 #define ADD_NO_PRUNING
-#define ENABLE_OLD_TIMING
 #include <gtsam_unstable/discrete/Scheduler.h>
 #include <gtsam/base/debug.h>
 #include <gtsam/base/timing.h>
@@ -152,9 +151,9 @@ void solveStaged(size_t addMutex = 2) {
 		scheduler.buildGraph(addMutex);
 
 		// Do EXACT INFERENCE
-		tic_("eliminate");
+		tic_(3,"eliminate");
 		DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate();
-		toc_("eliminate");
+		toc_(3,"eliminate");
 
 		// find root node
 		DiscreteConditional::shared_ptr root = *(chordal->rbegin());
diff --git a/gtsam_unstable/discrete/examples/schedulingQuals12.cpp b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp
index 19357fdcf..4221eb755 100644
--- a/gtsam_unstable/discrete/examples/schedulingQuals12.cpp
+++ b/gtsam_unstable/discrete/examples/schedulingQuals12.cpp
@@ -8,7 +8,6 @@
 #define ENABLE_TIMING
 #define ADD_NO_CACHING
 #define ADD_NO_PRUNING
-#define ENABLE_OLD_TIMING
 #include <gtsam_unstable/discrete/Scheduler.h>
 #include <gtsam/base/debug.h>
 #include <gtsam/base/timing.h>
@@ -179,9 +178,9 @@ void solveStaged(size_t addMutex = 2) {
 		scheduler.buildGraph(addMutex);
 
 		// Do EXACT INFERENCE
-		tic_("eliminate");
+		tic_(3,"eliminate");
 		DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate();
-		toc_("eliminate");
+		toc_(3,"eliminate");
 
 		// find root node
 		DiscreteConditional::shared_ptr root = *(chordal->rbegin());