This commit is contained in:
Thomas Capricelli 2009-08-25 23:47:22 +02:00
parent eac9293449
commit 6de3f5f0e7
2 changed files with 4 additions and 4 deletions

View File

@ -24,7 +24,7 @@ public:
, xtol(ei_sqrt(epsilon<Scalar>())) , xtol(ei_sqrt(epsilon<Scalar>()))
, nb_of_subdiagonals(-1) , nb_of_subdiagonals(-1)
, nb_of_superdiagonals(-1) , nb_of_superdiagonals(-1)
, epsfcn (Scalar(0.)) {} , epsfcn(Scalar(0.)) {}
Scalar factor; Scalar factor;
int maxfev; // maximum number of function evaluation int maxfev; // maximum number of function evaluation
Scalar xtol; Scalar xtol;
@ -82,12 +82,12 @@ public:
Matrix< Scalar, Dynamic, 1 > diag; Matrix< Scalar, Dynamic, 1 > diag;
int nfev; int nfev;
int njev; int njev;
int iter;
private: private:
const FunctorType &functor; const FunctorType &functor;
int n; int n;
Scalar sum; Scalar sum;
bool sing; bool sing;
int iter;
Scalar temp; Scalar temp;
Scalar delta; Scalar delta;
bool jeval; bool jeval;

View File

@ -27,7 +27,7 @@ public:
, ftol(ei_sqrt(epsilon<Scalar>())) , ftol(ei_sqrt(epsilon<Scalar>()))
, xtol(ei_sqrt(epsilon<Scalar>())) , xtol(ei_sqrt(epsilon<Scalar>()))
, gtol(Scalar(0.)) , gtol(Scalar(0.))
, epsfcn (Scalar(0.)) {} , epsfcn(Scalar(0.)) {}
Scalar factor; Scalar factor;
int maxfev; // maximum number of function evaluation int maxfev; // maximum number of function evaluation
Scalar ftol; Scalar ftol;
@ -106,6 +106,7 @@ public:
Matrix< Scalar, Dynamic, 1 > diag; Matrix< Scalar, Dynamic, 1 > diag;
int nfev; int nfev;
int njev; int njev;
int iter;
private: private:
const FunctorType &functor; const FunctorType &functor;
int n; int n;
@ -113,7 +114,6 @@ private:
Matrix< Scalar, Dynamic, 1 > wa1, wa2, wa3, wa4; Matrix< Scalar, Dynamic, 1 > wa1, wa2, wa3, wa4;
Scalar par, sum; Scalar par, sum;
int iter;
Scalar temp, temp1, temp2; Scalar temp, temp1, temp2;
Scalar delta; Scalar delta;
Scalar ratio; Scalar ratio;