diff options
| author | Alberto Ruiz <aruiz@um.es> | 2013-04-10 23:28:51 -0700 |
|---|---|---|
| committer | Alberto Ruiz <aruiz@um.es> | 2013-04-10 23:28:51 -0700 |
| commit | 17c56e5f9563245eb3aaa042c843745fce096554 (patch) | |
| tree | d57714c6fb6d39e524076778b899af406795e4df /lib | |
| parent | 55db8511c95a4e5ef0904940dff2a9a36696c8f6 (diff) | |
| parent | be78a200b82d49abbe7248a0fdbc475c9570e0c3 (diff) | |
Merge pull request #37 from takano-akio/gsl-segfaults
GSL minimization functions segault
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Numeric/GSL/gsl-aux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Numeric/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c index fc14ff5..61b6a54 100644 --- a/lib/Numeric/GSL/gsl-aux.c +++ b/lib/Numeric/GSL/gsl-aux.c | |||
| @@ -937,7 +937,7 @@ int minimize(int method, double f(int, double*), double tolsize, int maxit, | |||
| 937 | iter++; | 937 | iter++; |
| 938 | if (status) break; | 938 | if (status) break; |
| 939 | status = gsl_multimin_test_size (size, tolsize); | 939 | status = gsl_multimin_test_size (size, tolsize); |
| 940 | } while (status == GSL_CONTINUE && iter <= maxit); | 940 | } while (status == GSL_CONTINUE && iter < maxit); |
| 941 | int i,j; | 941 | int i,j; |
| 942 | for (i=iter; i<solr; i++) { | 942 | for (i=iter; i<solr; i++) { |
| 943 | solp[i*solc+0] = iter; | 943 | solp[i*solc+0] = iter; |
| @@ -1033,7 +1033,7 @@ int minimizeD(int method, double f(int, double*), int df(int, double*, int, doub | |||
| 1033 | iter++; | 1033 | iter++; |
| 1034 | if (status) break; | 1034 | if (status) break; |
| 1035 | status = gsl_multimin_test_gradient (s->gradient, tolgrad); | 1035 | status = gsl_multimin_test_gradient (s->gradient, tolgrad); |
| 1036 | } while (status == GSL_CONTINUE && iter <= maxit); | 1036 | } while (status == GSL_CONTINUE && iter < maxit); |
| 1037 | int i,j; | 1037 | int i,j; |
| 1038 | for (i=iter; i<solr; i++) { | 1038 | for (i=iter; i<solr; i++) { |
| 1039 | solp[i*solc+0] = iter; | 1039 | solp[i*solc+0] = iter; |
| @@ -1112,7 +1112,7 @@ int root(int method, void f(int, double*, int, double*), | |||
| 1112 | status = | 1112 | status = |
| 1113 | gsl_multiroot_test_residual (s->f, epsabs); | 1113 | gsl_multiroot_test_residual (s->f, epsabs); |
| 1114 | } | 1114 | } |
| 1115 | while (status == GSL_CONTINUE && iter <= maxit); | 1115 | while (status == GSL_CONTINUE && iter < maxit); |
| 1116 | 1116 | ||
| 1117 | int i,j; | 1117 | int i,j; |
| 1118 | for (i=iter; i<solr; i++) { | 1118 | for (i=iter; i<solr; i++) { |
| @@ -1228,7 +1228,7 @@ int rootj(int method, int f(int, double*, int, double*), | |||
| 1228 | status = | 1228 | status = |
| 1229 | gsl_multiroot_test_residual (s->f, epsabs); | 1229 | gsl_multiroot_test_residual (s->f, epsabs); |
| 1230 | } | 1230 | } |
| 1231 | while (status == GSL_CONTINUE && iter <= maxit); | 1231 | while (status == GSL_CONTINUE && iter < maxit); |
| 1232 | 1232 | ||
| 1233 | int i,j; | 1233 | int i,j; |
| 1234 | for (i=iter; i<solr; i++) { | 1234 | for (i=iter; i<solr; i++) { |
| @@ -1293,7 +1293,7 @@ int nlfit(int method, int f(int, double*, int, double*), | |||
| 1293 | 1293 | ||
| 1294 | status = gsl_multifit_test_delta (s->dx, s->x, epsabs, epsrel); | 1294 | status = gsl_multifit_test_delta (s->dx, s->x, epsabs, epsrel); |
| 1295 | } | 1295 | } |
| 1296 | while (status == GSL_CONTINUE && iter <= maxit); | 1296 | while (status == GSL_CONTINUE && iter < maxit); |
| 1297 | 1297 | ||
| 1298 | int i,j; | 1298 | int i,j; |
| 1299 | for (i=iter; i<solr; i++) { | 1299 | for (i=iter; i<solr; i++) { |