suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ make Levenberg-Marquardt solver maxStep aware

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5213 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
logari81 2011-12-03 19:22:06 +00:00
parent 7c0848180d
commit 2a8a4775ef
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Sketcher/App/freegcs/GCS.cpp
View File

@ -670,7 +670,7 @@ int System::solve_LM(SubSystem* subsys)
// compute initial damping factor
if (iter == 0)
mu = tau * A.diagonal().lpNorm<Eigen::Infinity>();
mu = tau * diag_A.lpNorm<Eigen::Infinity>();
// determine increment using adaptive damping
int k=0;
@ -686,6 +686,11 @@ int System::solve_LM(SubSystem* subsys)
// check if solving works
if (rel_error < 1e-5) {
// restrict h according to maxStep
double scale = subsys->maxStep(h);
if (scale < 1.)
h *= scale;
// compute par's new estimate and ||d_par||^2
x_new = x + h;
double h_norm = h.squaredNorm();
@ -833,6 +838,12 @@ int System::solve_DL(SubSystem* subsys)
if (stop)
break;
// it didn't work in some tests
// // restrict h_dl according to maxStep
// double scale = subsys->maxStep(h_dl);
// if (scale < 1.)
// h_dl *= scale;
// get the new values
double err_new;
x_new = x + h_dl;