Updated old timing statements in discrete examples and reenabled the examples
							parent
							
								
									19796465bf
								
							
						
					
					
						commit
						55ff10a1c2
					
				|  | @ -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) | ||||
|  |  | |||
|  | @ -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()); | ||||
|  |  | |||
|  | @ -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()); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue