From 2a8a4775efcffcda8a353cfc5cb733f6d6153dde Mon Sep 17 00:00:00 2001
From: logari81 <logari81@e8eeb9e2-ec13-0410-a4a9-efa5cf37419d>
Date: Sat, 3 Dec 2011 19:22:06 +0000
Subject: [PATCH] + make Levenberg-Marquardt solver maxStep aware

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5213 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
---
 src/Mod/Sketcher/App/freegcs/GCS.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Sketcher/App/freegcs/GCS.cpp b/src/Mod/Sketcher/App/freegcs/GCS.cpp
index e20a03eca9..5b3795b57a 100644
--- a/src/Mod/Sketcher/App/freegcs/GCS.cpp
+++ b/src/Mod/Sketcher/App/freegcs/GCS.cpp
@@ -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;