diff --git a/CppUnitLite/TestResult.h b/CppUnitLite/TestResult.h index a30275647..b64b40d75 100644 --- a/CppUnitLite/TestResult.h +++ b/CppUnitLite/TestResult.h @@ -18,8 +18,6 @@ // /////////////////////////////////////////////////////////////////////////////// - - #ifndef TESTRESULT_H #define TESTRESULT_H diff --git a/gtsam_unstable/linear/QPSolver.cpp b/gtsam_unstable/linear/QPSolver.cpp index 85cbb69e7..86a8b6dbf 100644 --- a/gtsam_unstable/linear/QPSolver.cpp +++ b/gtsam_unstable/linear/QPSolver.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "LPInitSolverMatlab.h" +#include using namespace std; diff --git a/gtsam_unstable/nonlinear/tests/testLinearConstraintSQP.cpp b/gtsam_unstable/nonlinear/tests/testLinearConstraintSQP.cpp index a73677cff..c12514156 100644 --- a/gtsam_unstable/nonlinear/tests/testLinearConstraintSQP.cpp +++ b/gtsam_unstable/nonlinear/tests/testLinearConstraintSQP.cpp @@ -125,15 +125,15 @@ TEST(testlcnlpSolver, poseOnALine) { //Instantiate LinearConstraintNLP LinearConstraintNLP lcnlp; - lcnlp.cost.add(PriorFactor(X(1), Pose3(Rot3::ypr(0.1, 0.2, 0.3), Point3(1, 0, 0)), noiseModel::Unit::Create(6))); + lcnlp.cost.add(PriorFactor(X(1), Pose3(Rot3::Ypr(0.1, 0.2, 0.3), Point3(1, 0, 0)), noiseModel::Unit::Create(6))); LineConstraintX constraint(X(1), dualKey); lcnlp.linearEqualities.add(constraint); Values initialValues; - initialValues.insert(X(1), Pose3(Rot3::ypr(0.3, 0.2, 0.3), Point3(1,0,0))); + initialValues.insert(X(1), Pose3(Rot3::Ypr(0.3, 0.2, 0.3), Point3(1,0,0))); Values expectedSolution; - expectedSolution.insert(X(1), Pose3(Rot3::ypr(0.1, 0.2, 0.3), Point3())); + expectedSolution.insert(X(1), Pose3(Rot3::Ypr(0.1, 0.2, 0.3), Point3())); // Instantiate LinearConstraintSQP LinearConstraintSQP lcnlpSolver(lcnlp); diff --git a/gtsam_unstable/slam/tests/testPositionConstraints.cpp b/gtsam_unstable/slam/tests/testPositionConstraints.cpp index 04eb4a260..bacf5dcbf 100644 --- a/gtsam_unstable/slam/tests/testPositionConstraints.cpp +++ b/gtsam_unstable/slam/tests/testPositionConstraints.cpp @@ -146,7 +146,7 @@ TEST(PositionUpperBoundX, evaluateError ) { // Instantiate a class PositionUpperBoundX PositionUpperBoundX ineq(X(1), 45.6); - Pose3 pose(Rot3::ypr(0.1, 0.3, 0.2), Point3(43.0, 27.8, 91.1)); + Pose3 pose(Rot3::Ypr(0.1, 0.3, 0.2), Point3(43.0, 27.8, 91.1)); Matrix H; Vector error = ineq.evaluateError(pose, H);