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

Added missing header and reverted debugging change from quaternion merge

release/4.3a0
Richard Roberts 2011-11-09 03:33:13 +00:00
parent 716c5175ab
commit 711535e818
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtsam/geometry/Makefile.am
View File

@ -14,7 +14,8 @@ check_PROGRAMS =
headers += concepts.h headers += concepts.h
# Points and poses # Points and poses
sources += Point2.cpp Rot2.cpp Pose2.cpp Point3.cpp Rot3M.cpp Rot3Q.cpp Pose3.cpp sources += Point2.cpp Rot2.cpp Pose2.cpp Point3.cpp Rot3M.cpp Rot3Q.cpp Pose3.cpp
headers += Rot3.h
check_PROGRAMS += tests/testPoint2 tests/testRot2 tests/testPose2 tests/testPoint3 tests/testRot3M tests/testRot3Q tests/testPose3 check_PROGRAMS += tests/testPoint2 tests/testRot2 tests/testPose2 tests/testPoint3 tests/testRot3M tests/testRot3Q tests/testPose3
# Cameras # Cameras

2
gtsam/geometry/Rot3M.cpp
View File

@ -170,7 +170,7 @@ namespace gtsam {
R.r2().z()-R.r3().y(), R.r2().z()-R.r3().y(),
R.r3().x()-R.r1().z(), R.r3().x()-R.r1().z(),
R.r1().y()-R.r2().x()); R.r1().y()-R.r2().x());
} else if (fabs(tr) - -1.0 < 1e-10) { // when theta = +-pi, +-3pi, +-5pi, etc. } else if (fabs(tr - -1.0) < 1e-10) { // when theta = +-pi, +-3pi, +-5pi, etc.
if(fabs(R.r3().z() - -1.0) > 1e-10) if(fabs(R.r3().z() - -1.0) > 1e-10)
return (boost::math::constants::pi<double>() / sqrt(2.0+2.0*R.r3().z())) * return (boost::math::constants::pi<double>() / sqrt(2.0+2.0*R.r3().z())) *
Vector_(3, R.r3().x(), R.r3().y(), 1.0+R.r3().z()); Vector_(3, R.r3().x(), R.r3().y(), 1.0+R.r3().z());