devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

use eigen objects for hybrj and lmstr

Browse Source
This commit is contained in:
Thomas Capricelli
2009-08-23 03:14:42 +02:00
parent 3251e12258
commit 8a27e774f8
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
unsupported/test/NonLinear.cpp
View File

@@ -217,13 +217,17 @@ void testLmder()
}
struct hybrj_functor {
static int f(int n, const double *x, double *fvec, double *fjac, int ldfjac,
int iflag)
static int f(const VectorXd &x, VectorXd &fvec, MatrixXd &fjac, int iflag)
{
/* subroutine fcn for hybrj1 example. */
int j, k;
double one=1, temp, temp1, temp2, three=3, two=2, zero=0, four=4;
const int n = x.size();
assert(fvec.size()==n);
assert(fjac.rows()==n);
assert(fjac.cols()==n);
if (iflag != 2)
{
@@ -242,12 +246,10 @@ struct hybrj_functor {
for (k = 0; k < n; k++)
{
for (j = 0; j < n; j++)
{
fjac[k + ldfjac*(j)] = zero;
}
fjac[k + ldfjac*(k)] = three - four*x[k];
if (k) fjac[k + ldfjac*(k-1)] = -one;
if (k != n-1) fjac[k + ldfjac*(k+1)] = -two;
fjac(k,j) = zero;
fjac(k,k) = three - four*x[k];
if (k) fjac(k,k-1) = -one;
if (k != n-1) fjac(k,k+1) = -two;
}
}
return 0;
@@ -398,7 +400,7 @@ void testHybrd()
}
struct lmstr_functor {
static int f(int /*m*/, int /*n*/, const double *x, double *fvec, double *fjrow, int iflag)
static int f(const VectorXd &x, VectorXd &fvec, VectorXd &fjrow, int iflag)
{
/* subroutine fcn for lmstr1 example. */
int i;
@@ -406,6 +408,10 @@ struct lmstr_functor {
double y[15]={1.4e-1, 1.8e-1, 2.2e-1, 2.5e-1, 2.9e-1, 3.2e-1, 3.5e-1,
3.9e-1, 3.7e-1, 5.8e-1, 7.3e-1, 9.6e-1, 1.34, 2.1, 4.39};
assert(15==fvec.size());
assert(3==x.size());
assert(fjrow.size()==x.size());
if (iflag < 2)
{
for (i=0; i<15; i++)