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

compilation issue

release/4.3a0
Frank Dellaert 2021-12-19 22:40:18 -05:00
parent 74951bee33
commit e45641e71a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/base/tests/testMatrix.cpp
View File

@ -173,7 +173,7 @@ TEST(Matrix, stack )
{ {
Matrix A = (Matrix(2, 2) << -5.0, 3.0, 00.0, -5.0).finished(); Matrix A = (Matrix(2, 2) << -5.0, 3.0, 00.0, -5.0).finished();
Matrix B = (Matrix(3, 2) << -0.5, 2.1, 1.1, 3.4, 2.6, 7.1).finished(); Matrix B = (Matrix(3, 2) << -0.5, 2.1, 1.1, 3.4, 2.6, 7.1).finished();
Matrix AB = stack(2, &A, &B); Matrix AB = gtsam::stack(2, &A, &B);
Matrix C(5, 2); Matrix C(5, 2);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
for (int j = 0; j < 2; j++) for (int j = 0; j < 2; j++)
@ -187,7 +187,7 @@ TEST(Matrix, stack )
std::vector<gtsam::Matrix> matrices; std::vector<gtsam::Matrix> matrices;
matrices.push_back(A); matrices.push_back(A);
matrices.push_back(B); matrices.push_back(B);
Matrix AB2 = stack(matrices); Matrix AB2 = gtsam::stack(matrices);
EQUALITY(C,AB2); EQUALITY(C,AB2);
} }

2
gtsam/linear/GaussianFactorGraph.cpp
View File

@ -379,7 +379,7 @@ namespace gtsam {
gttic(Compute_minimizing_step_size); gttic(Compute_minimizing_step_size);
// Compute minimizing step size // Compute minimizing step size
double step = -gradientSqNorm / dot(Rg, Rg); double step = -gradientSqNorm / gtsam::dot(Rg, Rg);
gttoc(Compute_minimizing_step_size); gttoc(Compute_minimizing_step_size);
gttic(Compute_point); gttic(Compute_point);