GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-10 23:21:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix typo in constant name

Browse Source
This commit is contained in:
Thomas Capricelli 2011-06-12 23:53:46 +02:00
parent 9155002901
commit f59b08f3bd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
View File

@ -37,7 +37,7 @@ namespace HybridNonLinearSolverSpace {
TolTooSmall = 3, TolTooSmall = 3,
NotMakingProgressJacobian = 4, NotMakingProgressJacobian = 4,
NotMakingProgressIterations = 5, NotMakingProgressIterations = 5,
UserAksed = 6 UserAsked = 6
}; };
} }
@ -181,7 +181,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveInit(FVectorType &x)
/* and calculate its norm. */ /* and calculate its norm. */
nfev = 1; nfev = 1;
if ( functor(x, fvec) < 0) if ( functor(x, fvec) < 0)
return HybridNonLinearSolverSpace::UserAksed; return HybridNonLinearSolverSpace::UserAsked;
fnorm = fvec.stableNorm(); fnorm = fvec.stableNorm();
/* initialize iteration counter and monitors. */ /* initialize iteration counter and monitors. */
@ -207,7 +207,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveOneStep(FVectorType &x)
/* calculate the jacobian matrix. */ /* calculate the jacobian matrix. */
if ( functor.df(x, fjac) < 0) if ( functor.df(x, fjac) < 0)
return HybridNonLinearSolverSpace::UserAksed; return HybridNonLinearSolverSpace::UserAsked;
++njev; ++njev;
wa2 = fjac.colwise().blueNorm(); wa2 = fjac.colwise().blueNorm();
@ -259,7 +259,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveOneStep(FVectorType &x)
/* evaluate the function at x + p and calculate its norm. */ /* evaluate the function at x + p and calculate its norm. */
if ( functor(wa2, wa4) < 0) if ( functor(wa2, wa4) < 0)
return HybridNonLinearSolverSpace::UserAksed; return HybridNonLinearSolverSpace::UserAsked;
++nfev; ++nfev;
fnorm1 = wa4.stableNorm(); fnorm1 = wa4.stableNorm();
@ -420,7 +420,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiffInit(FVectorType &
/* and calculate its norm. */ /* and calculate its norm. */
nfev = 1; nfev = 1;
if ( functor(x, fvec) < 0) if ( functor(x, fvec) < 0)
return HybridNonLinearSolverSpace::UserAksed; return HybridNonLinearSolverSpace::UserAsked;
fnorm = fvec.stableNorm(); fnorm = fvec.stableNorm();
/* initialize iteration counter and monitors. */ /* initialize iteration counter and monitors. */
@ -448,7 +448,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiffOneStep(FVectorType
/* calculate the jacobian matrix. */ /* calculate the jacobian matrix. */
if (internal::fdjac1(functor, x, fvec, fjac, parameters.nb_of_subdiagonals, parameters.nb_of_superdiagonals, parameters.epsfcn) <0) if (internal::fdjac1(functor, x, fvec, fjac, parameters.nb_of_subdiagonals, parameters.nb_of_superdiagonals, parameters.epsfcn) <0)
return HybridNonLinearSolverSpace::UserAksed; return HybridNonLinearSolverSpace::UserAsked;
nfev += std::min(parameters.nb_of_subdiagonals+parameters.nb_of_superdiagonals+ 1, n); nfev += std::min(parameters.nb_of_subdiagonals+parameters.nb_of_superdiagonals+ 1, n);
wa2 = fjac.colwise().blueNorm(); wa2 = fjac.colwise().blueNorm();
@ -500,7 +500,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiffOneStep(FVectorType
/* evaluate the function at x + p and calculate its norm. */ /* evaluate the function at x + p and calculate its norm. */
if ( functor(wa2, wa4) < 0) if ( functor(wa2, wa4) < 0)
return HybridNonLinearSolverSpace::UserAksed; return HybridNonLinearSolverSpace::UserAsked;
++nfev; ++nfev;
fnorm1 = wa4.stableNorm(); fnorm1 = wa4.stableNorm();