Merged 'develop'.

2015-06-12 15:34:05 -04:00 · 2015-06-12 15:34:05 -04:00 · 950cdec3b6
parent 4c9b1de675 b4ec622525
commit 950cdec3b6
1 changed files with 2 additions and 0 deletions
--- a/gtsam/slam/RegularJacobianFactor.h
+++ b/gtsam/slam/RegularJacobianFactor.h
@ -68,6 +68,8 @@ public:
      JacobianFactor(keys, augmentedMatrix, sigmas) {
  }

+  using JacobianFactor::multiplyHessianAdd;
+
  /** y += alpha * A'*A*x */
  virtual void multiplyHessianAdd(double alpha, const VectorValues& x,
      VectorValues& y) const {