From 0421d05d44ad567f82b1919361fe17f537819a75 Mon Sep 17 00:00:00 2001 From: Sungtae An Date: Sun, 5 Oct 2014 17:36:53 -0400 Subject: [PATCH] add forward() in TernaryExpression --- gtsam_unstable/nonlinear/Expression-inl.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtsam_unstable/nonlinear/Expression-inl.h b/gtsam_unstable/nonlinear/Expression-inl.h index c4319c0ba..7d375e737 100644 --- a/gtsam_unstable/nonlinear/Expression-inl.h +++ b/gtsam_unstable/nonlinear/Expression-inl.h @@ -520,17 +520,17 @@ public: } /// Return value and derivatives - virtual Augmented augmented(const Values& values) const { + virtual Augmented forward(const Values& values) const { using boost::none; - Augmented argument1 = this->expressionA1_->augmented(values); - Augmented argument2 = this->expressionA2_->augmented(values); - Augmented argument3 = this->expressionA3_->augmented(values); + Augmented argument1 = this->expressionA1_->forward(values); + Augmented argument2 = this->expressionA2_->forward(values); + Augmented argument3 = this->expressionA3_->forward(values); Matrix H1, H2, H3; T t = function_(argument1.value(), argument2.value(), argument3.value(), argument1.constant() ? none : boost::optional(H1), argument2.constant() ? none : boost::optional(H2), argument3.constant() ? none : boost::optional(H3)); - return Augmented(t, H1, argument1.jacobians(), H2, argument2.jacobians()); + return Augmented(t, H1, argument1.jacobians(), H2, argument2.jacobians(), H3, argument3.jacobians()); } };