From 977a97eacffa006246eaf9b1fb4c6c4e76d497fa Mon Sep 17 00:00:00 2001 From: Kai Ni Date: Wed, 20 Jan 2010 09:47:09 +0000 Subject: [PATCH] rename variable --- cpp/SubgraphPreconditioner.h | 2 +- cpp/iterative-inl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/SubgraphPreconditioner.h b/cpp/SubgraphPreconditioner.h index 5f82f8eb3..ea0fc19ab 100644 --- a/cpp/SubgraphPreconditioner.h +++ b/cpp/SubgraphPreconditioner.h @@ -90,7 +90,7 @@ namespace gtsam { G T_, C_; public: - SubgraphPCG(const G& g, const T& config); + SubgraphPCG(const G& g, const T& theta0); boost::shared_ptr ordering() const { return ordering_; } diff --git a/cpp/iterative-inl.h b/cpp/iterative-inl.h index 07e716986..a41336cb4 100644 --- a/cpp/iterative-inl.h +++ b/cpp/iterative-inl.h @@ -49,7 +49,7 @@ namespace gtsam { if (k==maxIterations) break; // update gradient (or re-calculate at reset time) - g = (k%reset==0) ? Ab.gradient(x) : g + alpha * (Ab ^ Ad); + g = (k%reset==0) ? Ab.gradient(x) : g + (Ab ^ Ad) * alpha; // g = g + alpha * (Ab ^ Ad); // g = Ab.gradient(x);