From cb29bcebdccafc0e72992766d2f1b040ac36d122 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Mon, 18 Jul 2016 18:30:44 -0700 Subject: [PATCH] clean up --- web/app/math/optim.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/web/app/math/optim.js b/web/app/math/optim.js index ea54f152..fe987cdb 100644 --- a/web/app/math/optim.js +++ b/web/app/math/optim.js @@ -259,6 +259,12 @@ optim.inv = function inv(x) { return I; }; +optim._result = function(evalCount, error, returnCode) { + this.evalCount = evalCount; + this.error = error; + this.returnCode = returnCode; +}; + optim.dog_leg = function (subsys, rough) { //rough = true //var tolg = rough ? 1e-3 : 1e-4; @@ -276,8 +282,9 @@ optim.dog_leg = function (subsys, rough) { var xsize = subsys.params.length; var csize = subsys.constraints.length; - if (xsize == 0) - return 'Success'; + if (xsize == 0) { + return new optim._result(0, 0, 1); + } var vec = TCAD.math._arr; var mx = TCAD.math._matrix; @@ -466,11 +473,7 @@ optim.dog_leg = function (subsys, rough) { } //log.push(stop); //window.___log(log); - return { - evalCount: iter, - error: err, - returnCode: stop - }; + return new optim._result(iter, err, stop); }; optim.cg = function(A, x, b, tol, maxIt) {