Windows fixes. Made global test variables static

release/4.3a0
Chris Beall 2014-06-01 13:49:19 -04:00
parent 07772b011a
commit e66cd56bf5
2 changed files with 8 additions and 8 deletions

View File

@ -33,7 +33,7 @@ using namespace std;
using namespace gtsam; using namespace gtsam;
using namespace boost::assign; using namespace boost::assign;
Symbol x0('x', 0), x1('x', 1), x2('x', 2), x3('x', 3); static Symbol x0('x', 0), x1('x', 1), x2('x', 2), x3('x', 3);
static SharedNoiseModel model(noiseModel::Isotropic::Sigma(3, 0.1)); static SharedNoiseModel model(noiseModel::Isotropic::Sigma(3, 0.1));
namespace simple { namespace simple {
@ -48,10 +48,10 @@ namespace simple {
// x0 // x0
// //
Pose2 pose0 = Pose2(0.000000, 0.000000, 0.000000); static Pose2 pose0 = Pose2(0.000000, 0.000000, 0.000000);
Pose2 pose1 = Pose2(1.000000, 1.000000, 1.570796); static Pose2 pose1 = Pose2(1.000000, 1.000000, 1.570796);
Pose2 pose2 = Pose2(0.000000, 2.000000, 3.141593); static Pose2 pose2 = Pose2(0.000000, 2.000000, 3.141593);
Pose2 pose3 = Pose2(-1.000000, 1.000000, 4.712389); static Pose2 pose3 = Pose2(-1.000000, 1.000000, 4.712389);
NonlinearFactorGraph graph() { NonlinearFactorGraph graph() {
NonlinearFactorGraph g; NonlinearFactorGraph g;

View File

@ -52,9 +52,9 @@ using symbol_shorthand::X;
using symbol_shorthand::L; using symbol_shorthand::L;
// tests data // tests data
Symbol x1('X', 1); static Symbol x1('X', 1);
Symbol x2('X', 2); static Symbol x2('X', 2);
Symbol x3('X', 3); static Symbol x3('X', 3);
static Key poseKey1(x1); static Key poseKey1(x1);
static Point2 measurement1(323.0, 240.0); static Point2 measurement1(323.0, 240.0);