summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2009-06-10 08:57:57 +0000
committerAlberto Ruiz <aruiz@um.es>2009-06-10 08:57:57 +0000
commit5b737a80a094eb7094343aa4ec890b49acd4252f (patch)
tree75f285e7751bd7334fd3d0022087b979ff515acc /lib
parenteb5f9d66db0aa4e7afdb6c0ddd245bb8f166191e (diff)
check gsl version
Diffstat (limited to 'lib')
-rw-r--r--lib/Numeric/GSL/gsl-aux.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Numeric/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c
index 0e2116c..b811ee4 100644
--- a/lib/Numeric/GSL/gsl-aux.c
+++ b/lib/Numeric/GSL/gsl-aux.c
@@ -390,7 +390,11 @@ int minimize(int method, double f(int, double*), double tolsize, int maxit,
390 // Minimizer nmsimplex, without derivatives 390 // Minimizer nmsimplex, without derivatives
391 switch(method) { 391 switch(method) {
392 case 0 : {T = gsl_multimin_fminimizer_nmsimplex; break; } 392 case 0 : {T = gsl_multimin_fminimizer_nmsimplex; break; }
393#ifdef GSL110
394 case 1 : {T = gsl_multimin_fminimizer_nmsimplex; break; }
395#else
393 case 1 : {T = gsl_multimin_fminimizer_nmsimplex2; break; } 396 case 1 : {T = gsl_multimin_fminimizer_nmsimplex2; break; }
397#endif
394 default: ERROR(BAD_CODE); 398 default: ERROR(BAD_CODE);
395 } 399 }
396 s = gsl_multimin_fminimizer_alloc (T, my_func.n); 400 s = gsl_multimin_fminimizer_alloc (T, my_func.n);