some more work on Functors

This commit is contained in:
Thomas Capricelli
2009-08-24 21:48:22 +02:00
parent 15d2c3af90
commit 45442b8d41
11 changed files with 63 additions and 49 deletions

View File

@@ -1,6 +1,7 @@
template<typename Functor, typename Scalar>
template<typename FunctorType, typename Scalar>
int ei_fdjac1(
const FunctorType &Functor,
Matrix< Scalar, Dynamic, 1 > &x,
Matrix< Scalar, Dynamic, 1 > &fvec,
Matrix< Scalar, Dynamic, Dynamic > &fjac,
@@ -30,7 +31,7 @@ int ei_fdjac1(
if (h == 0.)
h = eps;
x[j] = temp + h;
iflag = Functor::f(x, wa1);
iflag = Functor.f(x, wa1);
if (iflag < 0)
return iflag;
x[j] = temp;
@@ -46,7 +47,7 @@ int ei_fdjac1(
if (h == 0.) h = eps;
x[j] = wa2[j] + h;
}
iflag = Functor::f(x, wa1);
iflag = Functor.f(x, wa1);
if (iflag < 0) {
return iflag;
}