GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-22 09:39:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warning on implicit integer conversion in test case code by using type VectorXd::Index instead of int.

Browse Source
This commit is contained in:
Georg Drenkhahn 2014-09-20 14:57:42 +02:00
parent 74cde0c925
commit 75e269c77b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unsupported/test/NonLinearOptimization.cpp
View File

@ -246,9 +246,9 @@ struct hybrj_functor : Functor<double>
int operator()(const VectorXd &x, VectorXd &fvec) int operator()(const VectorXd &x, VectorXd &fvec)
{ {
double temp, temp1, temp2; double temp, temp1, temp2;
const int n = x.size(); const VectorXd::Index n = x.size();
assert(fvec.size()==n); assert(fvec.size()==n);
for (int k = 0; k < n; k++) for (VectorXd::Index k = 0; k < n; k++)
{ {
temp = (3. - 2.*x[k])*x[k]; temp = (3. - 2.*x[k])*x[k];
temp1 = 0.; temp1 = 0.;
@ -261,12 +261,12 @@ struct hybrj_functor : Functor<double>
} }
int df(const VectorXd &x, MatrixXd &fjac) int df(const VectorXd &x, MatrixXd &fjac)
{ {
const int n = x.size(); const VectorXd::Index n = x.size();
assert(fjac.rows()==n); assert(fjac.rows()==n);
assert(fjac.cols()==n); assert(fjac.cols()==n);
for (int k = 0; k < n; k++) for (VectorXd::Index k = 0; k < n; k++)
{ {
for (int j = 0; j < n; j++) for (VectorXd::Index j = 0; j < n; j++)
fjac(k,j) = 0.; fjac(k,j) = 0.;
fjac(k,k) = 3.- 4.*x[k]; fjac(k,k) = 3.- 4.*x[k];
if (k) fjac(k,k-1) = -1.; if (k) fjac(k,k-1) = -1.;
@ -351,10 +351,10 @@ struct hybrd_functor : Functor<double>
int operator()(const VectorXd &x, VectorXd &fvec) const int operator()(const VectorXd &x, VectorXd &fvec) const
{ {
double temp, temp1, temp2; double temp, temp1, temp2;
const int n = x.size(); const VectorXd::Index n = x.size();
assert(fvec.size()==n); assert(fvec.size()==n);
for (int k=0; k < n; k++) for (VectorXd::Index k=0; k < n; k++)
{ {
temp = (3. - 2.*x[k])*x[k]; temp = (3. - 2.*x[k])*x[k];
temp1 = 0.; temp1 = 0.;
@ -455,7 +455,7 @@ struct lmstr_functor : Functor<double>
assert(jac_row.size()==x.size()); assert(jac_row.size()==x.size());
double tmp1, tmp2, tmp3, tmp4; double tmp1, tmp2, tmp3, tmp4;
int i = rownb-2; VectorXd::Index i = rownb-2;
tmp1 = i+1; tmp1 = i+1;
tmp2 = 16 - i - 1; tmp2 = 16 - i - 1;
tmp3 = (i>=8)? tmp2 : tmp1; tmp3 = (i>=8)? tmp2 : tmp1;