12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated old timing statements in discrete examples and reenabled the examples

release/4.3a0
Richard Roberts 2012-06-06 12:51:44 +00:00
parent 19796465bf
commit 55ff10a1c2
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam_unstable/discrete/CMakeLists.txt
View File

@ -27,8 +27,8 @@ add_dependencies(check.unstable check.discrete_unstable)
# List examples to build - comment out here to exclude from compilation # List examples to build - comment out here to exclude from compilation
set(discrete_unstable_examples set(discrete_unstable_examples
#schedulingExample schedulingExample
#schedulingQuals12 schedulingQuals12
) )
if (GTSAM_BUILD_EXAMPLES) if (GTSAM_BUILD_EXAMPLES)

5
gtsam_unstable/discrete/examples/schedulingExample.cpp
View File

@ -8,7 +8,6 @@
//#define ENABLE_TIMING //#define ENABLE_TIMING
#define ADD_NO_CACHING #define ADD_NO_CACHING
#define ADD_NO_PRUNING #define ADD_NO_PRUNING
#define ENABLE_OLD_TIMING
#include <gtsam_unstable/discrete/Scheduler.h> #include <gtsam_unstable/discrete/Scheduler.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>
#include <gtsam/base/timing.h> #include <gtsam/base/timing.h>
@ -152,9 +151,9 @@ void solveStaged(size_t addMutex = 2) {
scheduler.buildGraph(addMutex); scheduler.buildGraph(addMutex);
// Do EXACT INFERENCE // Do EXACT INFERENCE
tic_("eliminate"); tic_(3,"eliminate");
DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate(); DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate();
toc_("eliminate"); toc_(3,"eliminate");
// find root node // find root node
DiscreteConditional::shared_ptr root = *(chordal->rbegin()); DiscreteConditional::shared_ptr root = *(chordal->rbegin());

5
gtsam_unstable/discrete/examples/schedulingQuals12.cpp
View File

@ -8,7 +8,6 @@
#define ENABLE_TIMING #define ENABLE_TIMING
#define ADD_NO_CACHING #define ADD_NO_CACHING
#define ADD_NO_PRUNING #define ADD_NO_PRUNING
#define ENABLE_OLD_TIMING
#include <gtsam_unstable/discrete/Scheduler.h> #include <gtsam_unstable/discrete/Scheduler.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>
#include <gtsam/base/timing.h> #include <gtsam/base/timing.h>
@ -179,9 +178,9 @@ void solveStaged(size_t addMutex = 2) {
scheduler.buildGraph(addMutex); scheduler.buildGraph(addMutex);
// Do EXACT INFERENCE // Do EXACT INFERENCE
tic_("eliminate"); tic_(3,"eliminate");
DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate(); DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate();
toc_("eliminate"); toc_(3,"eliminate");
// find root node // find root node
DiscreteConditional::shared_ptr root = *(chordal->rbegin()); DiscreteConditional::shared_ptr root = *(chordal->rbegin());