diff options
author | Karl Berry <karl@freefriends.org> | 2014-04-21 23:02:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-04-21 23:02:35 +0000 |
commit | fab654a7fafba60c3d1e32040ad16d19b5dfd550 (patch) | |
tree | 699549d43c84af6b176173d794f17c7cc7164bc6 /Master/texmf-dist/asymptote/lmfit.asy | |
parent | ea58320b10f549a61236be100fc97925aea6b489 (diff) |
asymptote 2.25 for TL14
git-svn-id: svn://tug.org/texlive/trunk@33606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/asymptote/lmfit.asy')
-rw-r--r-- | Master/texmf-dist/asymptote/lmfit.asy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Master/texmf-dist/asymptote/lmfit.asy b/Master/texmf-dist/asymptote/lmfit.asy index e70421074e5..c3dfddce061 100644 --- a/Master/texmf-dist/asymptote/lmfit.asy +++ b/Master/texmf-dist/asymptote/lmfit.asy @@ -566,7 +566,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt info.val = 0; evaluate(x, m, fvec, data, info); - printout(n, x, m, fvec, data, 0, 0, ++nfev.val); + if(printout != null) printout(n, x, m, fvec, data, 0, 0, ++nfev.val); if (info.val < 0) return; fnorm = lm_enorm(m, fvec); @@ -580,7 +580,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt x[j] = temp + step; info.val = 0; evaluate(x, m, wa4, data, info); - printout(n, x, m, wa4, data, 1, iter, ++nfev.val); + if(printout != null) printout(n, x, m, wa4, data, 1, iter, ++nfev.val); if (info.val < 0) return; for (i = 0; i < m; ++i) @@ -659,7 +659,7 @@ void lm_lmdif(int m, int n, real[] x, real[] fvec, real ftol, real xtol, real gt info.val = 0; evaluate(wa2, m, wa4, data, info); - printout(n, x, m, wa4, data, 2, iter, ++nfev.val); + if(printout != null) printout(n, x, m, wa4, data, 2, iter, ++nfev.val); if (info.val < 0) return; @@ -751,7 +751,7 @@ void lm_minimize(int m_dat, int n_par, real[] par, lm_evaluate_ftype evaluate, l lm_lmdif(m, n, par, fvec, control.ftol, control.xtol, control.gtol, control.maxcall * (n + 1), control.epsilon, diag, 1, control.stepbound, control.info, control.nfev, fjac, ipvt, qtf, wa1, wa2, wa3, wa4, evaluate, printout, data); - printout(n, par, m, fvec, data, -1, 0, control.nfev.val); + if(printout != null) printout(n, par, m, fvec, data, -1, 0, control.nfev.val); control.fnorm = lm_enorm(m, fvec); if (control.info.val < 0) control.info.val = 10; |