Small change to merge in compatibility patch

release/4.3a0
Alex Cunningham 2012-05-21 19:44:25 +00:00
parent 9dfc765696
commit b66dc3586d
1 changed files with 5 additions and 4 deletions

View File

@ -10,7 +10,8 @@
#include <gtsam/geometry/Pose2.h> #include <gtsam/geometry/Pose2.h>
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <boost/random/mersenne_twister.hpp> #include <boost/random/mersenne_twister.hpp>
#include <boost/random/uniform_int_distribution.hpp> //#include <boost/random/uniform_int_distribution.hpp> // FIXME: does not exist in boost 1.46
#include <boost/random/uniform_int.hpp> // Old header - should still exist
#include <vector> #include <vector>
#include <stdlib.h> #include <stdlib.h>
@ -225,9 +226,9 @@ public:
size_t size = cellCount(); size_t size = cellCount();
Marginals marginals(size); Marginals marginals(size);
boost::random::mt19937 rng; // NOTE: using older interface for boost.random due to interface changes after boost 1.46
boost::random::uniform_int_distribution<Index> random_cell(0,size-1); boost::mt19937 rng;
boost::uniform_int<Index> random_cell(0,size-1);
// run Metropolis for the requested number of operations // run Metropolis for the requested number of operations
// compute initial probability of occupancy grid, P(x_t) // compute initial probability of occupancy grid, P(x_t)