Changeset 1648

Timestamp:

Dec 13, 2008, 10:28:39 AM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #466. Added more GSL functionality, added constructor tests.

Location:

trunk

Files:

• test/interpolation_test.cc (modified) (5 diffs)
• yat/regression/GSLInterpolation.cc (modified) (1 diff)
• yat/regression/GSLInterpolation.h (modified) (2 diffs)
• yat/regression/Makefile.am (modified) (2 diffs)

trunk/test/interpolation_test.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2007 Jari Häkkinen
+  Copyright (C) 2008 Jari Häkkinen
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -22 +22 @@
 #include "Suite.h"
 
+#include "yat/regression/AkimaInterpolation.h"
+#include "yat/regression/AkimaPeriodicInterpolation.h"
 #include "yat/regression/CSplineInterpolation.h"
+#include "yat/regression/CSplinePeriodicInterpolation.h"
+#include "yat/regression/LinearInterpolation.h"
+#include "yat/regression/PolynomialInterpolation.h"
 #include "yat/utility/Vector.h"
 #include "yat/utility/VectorConstView.h"
@@ -31 +36 @@
 {
   using namespace theplu::yat;
+  using namespace theplu::yat::regression;
 
   test::Suite suite(argc, argv);
@@ -53 +59 @@
   y(0)=100; y(1)= 97; y(2)=111; y(3)=120; y(4)=117; y(5)=103;
 
-  regression::CSplineInterpolation cspline(x,y);
+  CSplineInterpolation cspline(x,y);
 
   utility::Vector w(11);
@@ -75 +81 @@
     }
 
+  // lazy testing, at least try to create the objects
+  AkimaInterpolation(x,y);
+  AkimaPeriodicInterpolation(x,y);
+  CSplinePeriodicInterpolation(x,y);
+  LinearInterpolation(x,y);
+  PolynomialInterpolation(x,y);
+
   return suite.return_value();
 }

trunk/yat/regression/GSLInterpolation.cc

@@ -58 +58 @@
 
 
-  double GSLInterpolation::evaluate(const double x) const
+  size_t GSLInterpolation::bsearch(const double x_array[], double x,
+                                   size_t index_lo, size_t index_hi) const
+  {
+    return gsl_interp_bsearch(x_array, x, index_lo, index_hi);
+  }
+
+
+  double GSLInterpolation::evaluate(double x)
   { 
-    return gsl_interp_eval(interpolator_,x_,y_,x,accelerator_);
+    return gsl_interp_eval(interpolator_, x_, y_, x, accelerator_);
+  }
+
+
+  double GSLInterpolation::evaluate_derivative(double x)
+  {
+    return gsl_interp_eval_deriv(interpolator_, x_, y_, x, accelerator_);
+  }
+
+
+  double GSLInterpolation::evaluate_derivative2(double x)
+  {
+    return gsl_interp_eval_deriv2(interpolator_, x_, y_, x, accelerator_);
+  }
+
+
+  double GSLInterpolation::evaluate_integral(double a, double b)
+  {
+    return gsl_interp_eval_integ(interpolator_, x_, y_, a, b, accelerator_);
+  }
+
+
+  unsigned int GSLInterpolation::min_size(void) const
+  {
+    return gsl_interp_min_size(interpolator_);
   }
 

trunk/yat/regression/GSLInterpolation.h

@@ -53 +53 @@
 
   public:
+    /**
+       \brief Search index.
+
+       This function returns the index \f$ i \f$ of the array \a
+       x_array such that \f$ x_array[i] <= x < x_array[i+1] \f$. The
+       index is searched for in the range
+       \f$ [index_lo, index_hi] \f$.
+    */
+    size_t bsearch(const double x_array[], double x, size_t index_lo,
+                   size_t index_hi) const;
 
     /**
@@ -60 +70 @@
        \a x.
     */
-    double evaluate(const double x) const;
+    double evaluate(double x);
+
+    /**
+       \brief Calculate the derivative of the interpolated function at
+       \a x.
+
+       \return The derivative.
+    */
+    double evaluate_derivative(double x);
+
+    /**
+       \brief Calculate the 2nd derivative of the interpolated
+       function at \a x.
+
+       \return The 2nd derivative.
+    */
+    double evaluate_derivative2(double x);
+
+    /**
+       \brief Calculate the numerical integral of the interpolated
+       function over the range \f$ [a,b] \f$.
+
+       \return The integral.
+    */
+    double evaluate_integral(double a, double b);
+
+    /**
+       \brief This function returns the minimum number of points
+       required by the interpolation type.
+
+       For example, Akima spline interpolation requires a minimum of 5
+       points.
+
+       \return The minimum number of points required.
+    */
+    unsigned int min_size(void) const;
 
   protected:

trunk/yat/regression/Makefile.am

@@ -29 +29 @@
   Local.cc MultiDimensional.cc MultiDimensionalWeighted.cc Naive.cc   \
   NaiveWeighted.cc OneDimensional.cc OneDimensionalWeighted.cc        \
-  Polynomial.cc LinearInterpolation.cc PolynomialWeighted.cc
+  Polynomial.cc PolynomialInterpolation.cc PolynomialWeighted.cc
 
 include_regressiondir = $(includedir)/yat/regression
@@ -39 +39 @@
   LinearWeighted.h Local.h MultiDimensional.h                         \
   MultiDimensionalWeighted.h Naive.h NaiveWeighted.h OneDimensional.h \
-  OneDimensionalWeighted.h Polynomial.h LinearInterpolation.cc        \
+  OneDimensionalWeighted.h Polynomial.h PolynomialInterpolation.cc    \
   PolynomialWeighted.h