From 956d65ea631d7696c1cf9a34554c7104297790e7 Mon Sep 17 00:00:00 2001
From: Thomas Capricelli <orzel@freehackers.org>
Date: Mon, 28 Sep 2009 00:18:14 +0200
Subject: define a generic functor and makes other ones inherit it

---
 unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'unsupported/Eigen/src/NonLinear')

diff --git a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
index 2f964358a..ed65a5651 100644
--- a/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
+++ b/unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
@@ -122,7 +122,7 @@ LevenbergMarquardt<FunctorType,Scalar>::lmder1(
         )
 {
     n = x.size();
-    m = functor.nbOfFunctions();
+    m = functor.values();
 
     /* check the input parameters for errors. */
     if (n <= 0 || m < n || tol < 0.)
@@ -158,7 +158,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeInit(
         )
 {
     n = x.size();
-    m = functor.nbOfFunctions();
+    m = functor.values();
 
     wa1.resize(n); wa2.resize(n); wa3.resize(n);
     wa4.resize(m);
@@ -400,7 +400,7 @@ LevenbergMarquardt<FunctorType,Scalar>::lmdif1(
         )
 {
     n = x.size();
-    m = functor.nbOfFunctions();
+    m = functor.values();
 
     /* check the input parameters for errors. */
     if (n <= 0 || m < n || tol < 0.)
@@ -422,7 +422,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiffInit(
         )
 {
     n = x.size();
-    m = functor.nbOfFunctions();
+    m = functor.values();
 
     wa1.resize(n); wa2.resize(n); wa3.resize(n);
     wa4.resize(m);
@@ -677,7 +677,7 @@ LevenbergMarquardt<FunctorType,Scalar>::lmstr1(
         )
 {
     n = x.size();
-    m = functor.nbOfFunctions();
+    m = functor.values();
     Matrix< Scalar, Dynamic, Dynamic > fjac(m, n);
     VectorXi ipvt;
 
@@ -701,7 +701,7 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorageInit(
         )
 {
     n = x.size();
-    m = functor.nbOfFunctions();
+    m = functor.values();
 
     wa1.resize(n); wa2.resize(n); wa3.resize(n);
     wa4.resize(m);
-- 
cgit v1.2.3