From 9cfdbbcf4363e595605a134a145bf3e4a919ee8c Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 3 Mar 2003 23:47:32 +0000
Subject: [PATCH] Use old GSL interface, and give the download URL if the
version is too old.
---
Numeric/Numeric.cpp | 6 +++---
Numeric/gsl_brent.cpp | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Numeric/Numeric.cpp b/Numeric/Numeric.cpp
index 60fb089421..e7e4455325 100644
--- a/Numeric/Numeric.cpp
+++ b/Numeric/Numeric.cpp
@@ -1,4 +1,4 @@
-// $Id: Numeric.cpp,v 1.8 2003-03-02 05:26:29 geuzaine Exp $
+// $Id: Numeric.cpp,v 1.9 2003-03-03 23:47:32 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
@@ -49,8 +49,8 @@ int check_gsl()
if(major < 1 || (major == 1 && minor < 2)) {
Msg(FATAL1, "Your GSL version (%d.%d.X) has a bug in the singular value",
major, minor);
- Msg(FATAL3,
- "decomposition code. Please upgrade to version 1.2 or above.");
+ Msg(FATAL2, "decomposition code. Please upgrade to version 1.2 or above.");
+ Msg(FATAL3, "You can download the GSL from http://sources.redhat.com/gsl/");
return 0;
}
// set new error handler
diff --git a/Numeric/gsl_brent.cpp b/Numeric/gsl_brent.cpp
index c4373a03ed..127f1d4e7d 100644
--- a/Numeric/gsl_brent.cpp
+++ b/Numeric/gsl_brent.cpp
@@ -1,4 +1,4 @@
-// $Id: gsl_brent.cpp,v 1.6 2003-03-02 05:23:11 geuzaine Exp $
+// $Id: gsl_brent.cpp,v 1.7 2003-03-03 23:47:32 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
@@ -82,7 +82,8 @@ double brent(double ax, double bx, double cx,
status = gsl_min_fminimizer_iterate(s);
if(status)
break; // solver problem
- b = gsl_min_fminimizer_x_minimum(s);
+ b = gsl_min_fminimizer_minimum(s);
+ // this is deprecated: we should use gsl_min_fminimizer_x_minimum(s) instead
a = gsl_min_fminimizer_x_lower(s);
c = gsl_min_fminimizer_x_upper(s);
status = gsl_min_test_interval(a, c, tol, 0.0);
--
GitLab