From 7c37a0699c66c8c074bcab450db1ed9d62443aed Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Wed, 25 Feb 2015 00:41:34 -0800 Subject: [PATCH] add some sate to test --- web/app/sketcher/parametric.js | 2 +- web/app/test/testCases.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/web/app/sketcher/parametric.js b/web/app/sketcher/parametric.js index 06208118..aa9f0996 100644 --- a/web/app/sketcher/parametric.js +++ b/web/app/sketcher/parametric.js @@ -487,7 +487,7 @@ TCAD.TWO.ParametricManager.prototype.prepareForSubSystem = function(locked, subS _p = pdict[p]; _p.set(_p._backingParam.get()); } - solver.solveSystem(rough, alg); + return solver.solveSystem(rough, alg); } var viewer = this.viewer; function sync() { diff --git a/web/app/test/testCases.js b/web/app/test/testCases.js index e92bf326..1db7c0bf 100644 --- a/web/app/test/testCases.js +++ b/web/app/test/testCases.js @@ -6,11 +6,17 @@ TCAD.test.cases.roundRect = function() { var ep = APP.viewer.findById(28); var pm = APP.viewer.parametricManager; - _assertEqD(0.00002047865, pm.prepare([]).solvers[0].system.error(), 0.00000000001); + _assertEqD(0.00002047865, pm.prepare([]).solvers[0].system.error(), 1e-12); ep.x += 30; var solver = pm.prepare([]).solvers[0]; _assertEqD(60, solver.system.error(), 0.01); - solver.solve(true); - _assertEqD(0.000005, solver.system.error(), 1e-6); + var status = solver.solve(true); + _assertEqD(0.000005, solver.system.error(), 1e-8); + _assertEq(12, status.evalCount); + _assertEq(1, status.returnCode); + var status = solver.solve(false); + _assertEqD(1.4575007867279055e-10, solver.system.error(), 1e-12); + _assertEq(20, status.evalCount); + _assertEq(1, status.returnCode); };