Changeset 1650 for trunk/yat/regression/GSLInterpolation.cc

Timestamp:

Dec 14, 2008, 11:13:48 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #466. Added checks for GSL errors, improved docs, added some more tests.

File:

• trunk/yat/regression/GSLInterpolation.cc (modified) (6 diffs)

trunk/yat/regression/GSLInterpolation.cc

@@ -34 +34 @@
                                      const utility::VectorBase& x,
                                      const utility::VectorBase& y)
+    : evaluation_(0.0), gsl_status_(0)
   {
     assert(x.size()==y.size());
@@ -44 +45 @@
     }
     interpolator_ = gsl_interp_alloc(interpolator_type, size);
-    gsl_interp_init(interpolator_, x_, y_, size);
+    gsl_status_=gsl_interp_init(interpolator_, x_, y_, size);
     accelerator_ = gsl_interp_accel_alloc();
   }
@@ -65 +66 @@
 
 
+  int GSLInterpolation::error_status(void) const
+  {
+    return gsl_status_;
+  }
+
+
   double GSLInterpolation::evaluate(double x)
-  { 
-    return gsl_interp_eval(interpolator_, x_, y_, x, accelerator_);
+  {
+    gsl_status_=gsl_interp_eval_e(interpolator_, x_, y_, x, accelerator_,
+                                  &evaluation_);
+    return evaluation_;
   }
 
@@ -73 +82 @@
   double GSLInterpolation::evaluate_derivative(double x)
   {
-    return gsl_interp_eval_deriv(interpolator_, x_, y_, x, accelerator_);
+    gsl_status_=gsl_interp_eval_deriv_e(interpolator_, x_, y_, x, accelerator_,
+                                        &evaluation_);
+    return evaluation_;
   }
 
@@ -79 +90 @@
   double GSLInterpolation::evaluate_derivative2(double x)
   {
-    return gsl_interp_eval_deriv2(interpolator_, x_, y_, x, accelerator_);
+    gsl_status_=gsl_interp_eval_deriv2_e(interpolator_, x_, y_, x, accelerator_,
+                                         &evaluation_);
+    return evaluation_;
   }
 
@@ -85 +98 @@
   double GSLInterpolation::evaluate_integral(double a, double b)
   {
-    return gsl_interp_eval_integ(interpolator_, x_, y_, a, b, accelerator_);
+    gsl_status_=gsl_interp_eval_integ_e(interpolator_, x_, y_, a, b,
+                                        accelerator_, &evaluation_);
+    return evaluation_;
+  }
+
+
+  double GSLInterpolation::evaluation(void) const
+  {
+    return evaluation_;
   }