From 81b217bf2e39f77157d943d99e1dc0e1dbdc0a9a Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Tue, 11 Aug 2015 23:57:34 -0700 Subject: [PATCH] Use levenberg-maquard algo for precise minimization --- web/app/sketcher/constr/solver.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/web/app/sketcher/constr/solver.js b/web/app/sketcher/constr/solver.js index e7e6fb03..ec42aeff 100644 --- a/web/app/sketcher/constr/solver.js +++ b/web/app/sketcher/constr/solver.js @@ -258,13 +258,11 @@ TCAD.parametric.prepare = function(constrs, locked, aux, alg) { if (conflict) return nullResult; if (constrs.length == 0) return nullResult; if (sys.params.length == 0) return nullResult; - switch (alg) { - case 2: - return TCAD.parametric.solve_lm(sys, model, jacobian, rough); - case 1: - default: - return optim.dog_leg(sys, rough); + var res = optim.dog_leg(sys, true); + if (!rough) { + res = TCAD.parametric.solve_lm(sys, model, jacobian, false) } + return res; } var systemSolver = { diagnose : function() {return TCAD.parametric.diagnose(sys)},