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

make diag be an internal variable too

Browse Source
This commit is contained in:
Thomas Capricelli
2009-08-25 21:59:10 +02:00
parent e465ea82e1
commit fa0183e7c7
3 changed files with 66 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
unsupported/Eigen/src/NonLinear/HybridNonLinearSolver.h
View File

@@ -34,7 +34,6 @@ public:
Status solve(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev, int &njev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode=1
);
@@ -46,7 +45,6 @@ public:
Status solveNumericalDiff(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode=1,
int nb_of_subdiagonals = -1,
@@ -58,6 +56,7 @@ public:
Matrix< Scalar, Dynamic, Dynamic > fjac;
Matrix< Scalar, Dynamic, 1 > R;
Matrix< Scalar, Dynamic, 1 > qtf;
Matrix< Scalar, Dynamic, 1 > diag;
private:
const FunctorType &functor;
};
@@ -73,7 +72,6 @@ HybridNonLinearSolver<FunctorType,Scalar>::solve(
{
const int n = x.size();
int nfev=0, njev=0;
Matrix< Scalar, Dynamic, 1> diag;
Parameters parameters;
/* check the input parameters for errors. */
@@ -88,7 +86,6 @@ HybridNonLinearSolver<FunctorType,Scalar>::solve(
return solve(
x,
nfev, njev,
diag,
parameters,
2
);
@@ -102,7 +99,6 @@ HybridNonLinearSolver<FunctorType,Scalar>::solve(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
int &njev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode
)
@@ -115,6 +111,8 @@ HybridNonLinearSolver<FunctorType,Scalar>::solve(
R.resize( (n*(n+1))/2);
fjac.resize(n, n);
fvec.resize(n);
if (mode != 2)
diag.resize(n);
/* Local variables */
int i, j, l, iwa[1];
@@ -388,7 +386,6 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiff(
{
const int n = x.size();
int nfev=0;
Matrix< Scalar, Dynamic, 1> diag;
Parameters parameters;
/* check the input parameters for errors. */
@@ -404,7 +401,6 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiff(
return solveNumericalDiff(
x,
nfev,
diag,
parameters,
2,
-1, -1,
@@ -418,7 +414,6 @@ typename HybridNonLinearSolver<FunctorType,Scalar>::Status
HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiff(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode,
int nb_of_subdiagonals,
@@ -436,6 +431,8 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiff(
R.resize( (n*(n+1))/2);
fjac.resize(n, n);
fvec.resize(n);
if (mode != 2)
diag.resize(n);
/* Local variables */
int i, j, l, iwa[1];

26
unsupported/Eigen/src/NonLinear/LevenbergMarquardt.h
View File

@@ -43,7 +43,6 @@ public:
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
int &njev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode=1
);
@@ -56,7 +55,6 @@ public:
Status minimizeNumericalDiff(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode=1,
const Scalar epsfcn = Scalar(0.)
@@ -71,7 +69,6 @@ public:
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
int &njev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode=1
);
@@ -80,6 +77,7 @@ public:
Matrix< Scalar, Dynamic, Dynamic > fjac;
VectorXi ipvt;
Matrix< Scalar, Dynamic, 1 > qtf;
Matrix< Scalar, Dynamic, 1 > diag;
private:
const FunctorType &functor;
};
@@ -94,9 +92,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimize(
const int n = x.size();
const int m = functor.nbOfFunctions();
int nfev=0, njev=0;
Matrix< Scalar, Dynamic, Dynamic > fjac(m, n);
Matrix< Scalar, Dynamic, 1> diag, qtf;
VectorXi ipvt;
Parameters parameters;
/* check the input parameters for errors. */
@@ -112,7 +107,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimize(
return minimize(
x,
nfev, njev,
diag,
parameters,
1
);
@@ -125,7 +119,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimize(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
int &njev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode
)
@@ -137,7 +130,8 @@ LevenbergMarquardt<FunctorType,Scalar>::minimize(
fvec.resize(m);
ipvt.resize(n);
fjac.resize(m, n);
diag.resize(n);
if (mode != 2)
diag.resize(n);
qtf.resize(n);
/* Local variables */
@@ -376,9 +370,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiff(
const int n = x.size();
const int m = functor.nbOfFunctions();
int nfev=0;
Matrix< Scalar, Dynamic, Dynamic > fjac(m, n);
Matrix< Scalar, Dynamic, 1> diag, qtf;
VectorXi ipvt;
Parameters parameters;
/* check the input parameters for errors. */
@@ -394,7 +385,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiff(
return minimizeNumericalDiff(
x,
nfev,
diag,
parameters,
1,
Scalar(0.)
@@ -406,7 +396,6 @@ typename LevenbergMarquardt<FunctorType,Scalar>::Status
LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiff(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode,
const Scalar epsfcn
@@ -419,7 +408,8 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeNumericalDiff(
fvec.resize(m);
ipvt.resize(n);
fjac.resize(m, n);
diag.resize(n);
if (mode != 2 )
diag.resize(n);
qtf.resize(n);
/* Local variables */
@@ -658,7 +648,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorage(
const int m = functor.nbOfFunctions();
int nfev=0, njev=0;
Matrix< Scalar, Dynamic, Dynamic > fjac(m, n);
Matrix< Scalar, Dynamic, 1> diag, qtf;
VectorXi ipvt;
Parameters parameters;
@@ -675,7 +664,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorage(
return minimizeOptimumStorage(
x,
nfev, njev,
diag,
parameters,
1
);
@@ -687,7 +675,6 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorage(
Matrix< Scalar, Dynamic, 1 > &x,
int &nfev,
int &njev,
Matrix< Scalar, Dynamic, 1 > &diag,
const Parameters &parameters,
const int mode
)
@@ -699,7 +686,8 @@ LevenbergMarquardt<FunctorType,Scalar>::minimizeOptimumStorage(
fvec.resize(m);
ipvt.resize(n);
fjac.resize(m, n);
diag.resize(n);
if (mode != 2)
diag.resize(n);
qtf.resize(n);
/* Local variables */