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

fix: compile issue in previous jacobians...

release/4.3a0
lvzhaoyang 2015-06-23 02:03:44 -04:00
parent d8b9cae25d
commit 1c3ab0ce30
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtsam/geometry/Cal3_S2.cpp
View File

@ -90,23 +90,22 @@ Point2 Cal3_S2::calibrate(const Point2& p) const {
} }
/* ************************************************************************* */ /* ************************************************************************* */
Point2 Cal3_S2::calibrate(const Point2& p, OptionalJacobian<2,5> Dcal = boost::none, Point2 Cal3_S2::calibrate(const Point2& p, OptionalJacobian<2,5> Dcal,
OptionalJacobian<2,2> Dp = boost::none) const { OptionalJacobian<2,2> Dp) const {
const double u = p.x(), v = p.y(); const double u = p.x(), v = p.y();
double delta_u = u - u0_, delta_v = v - v0_; double delta_u = u - u0_, delta_v = v - v0_;
double inv_fx = 1/ fx_, inv_fy = 1/fy_; double inv_fx = 1/ fx_, inv_fy = 1/fy_;
if(Dcal) if(Dcal)
*Dcal << - inv_fx * inv_fx * (delta_u - s_ * inv_fy * delta_v) *Dcal << - inv_fx * inv_fx * (delta_u - s_ * inv_fy * delta_v) ,
<< inv_fx * (s_ * inv_fy * inv_fy) * delta_v << -inv_fx * inv_fy * delta_v inv_fx * (s_ * inv_fy * inv_fy) * delta_v, -inv_fx * inv_fy * delta_v,
<< -inv_fx << inv_fx * s_ * inv_fy -inv_fx, inv_fx * s_ * inv_fy,
<< 0 << -inv_fy * inv_fy * delta_v << 0 << 0 << -inv_fy; 0, -inv_fy * inv_fy * delta_v, 0, 0, -inv_fy;
if(Dp) if(Dp)
*Dp << inv_fx << -inv_fx * s_ * inv_fy << 0 << inv_fy; *Dp << inv_fx, -inv_fx * s_ * inv_fy, 0, inv_fy;
return Point2(inv_fx * (delta_u - s_ * inv_fy * delta_v), return Point2(inv_fx * (delta_u - s_ * inv_fy * delta_v),
inv_fy * delta_v); inv_fy * delta_v);
} }
/* ************************************************************************* */ /* ************************************************************************* */
Vector3 Cal3_S2::calibrate(const Vector3& p) const { Vector3 Cal3_S2::calibrate(const Vector3& p) const {
return matrix_inverse() * p; return matrix_inverse() * p;