From 0a41cc23c11b399af21c5ea5a246771b03df7d79 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Thu, 13 Aug 2015 00:43:54 -0700 Subject: [PATCH] rollback LM as a precise solver as dog leg doing great now --- web/app/sketcher/constr/solver.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/app/sketcher/constr/solver.js b/web/app/sketcher/constr/solver.js index ec42aeff..e7e6fb03 100644 --- a/web/app/sketcher/constr/solver.js +++ b/web/app/sketcher/constr/solver.js @@ -258,11 +258,13 @@ 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; - var res = optim.dog_leg(sys, true); - if (!rough) { - res = TCAD.parametric.solve_lm(sys, model, jacobian, false) + switch (alg) { + case 2: + return TCAD.parametric.solve_lm(sys, model, jacobian, rough); + case 1: + default: + return optim.dog_leg(sys, rough); } - return res; } var systemSolver = { diagnose : function() {return TCAD.parametric.diagnose(sys)},