Changeset 1646

Timestamp:

Dec 13, 2008, 9:29:40 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Addresses #466 added linear interpolation classes.

Location:

trunk/yat/regression

Files:

• LinearInterpolation.cc (copied) (copied from trunk/yat/regression/CSplineInterpolation.cc) (2 diffs)
• LinearInterpolation.h (copied) (copied from trunk/yat/regression/CSplineInterpolation.h) (4 diffs)
• Makefile.am (modified) (2 diffs)

trunk/yat/regression/LinearInterpolation.cc

@@ -20 +20 @@
 */
 
-#include "CSplineInterpolation.h"
+#include "LinearInterpolation.h"
 
 #include <gsl/gsl_interp.h>
@@ -29 +29 @@
 
 
-  CSplineInterpolation::CSplineInterpolation(const utility::VectorBase& x,
-                                             const utility::VectorBase& y)
-    : GSLInterpolation(gsl_interp_cspline,x,y)
+  LinearInterpolation::LinearInterpolation(const utility::VectorBase& x,
+                                           const utility::VectorBase& y)
+    : GSLInterpolation(gsl_interp_linear,x,y)
   {
   }
 
 
-  CSplineInterpolation::~CSplineInterpolation(void)
+  LinearInterpolation::~LinearInterpolation(void)
   {
   }

trunk/yat/regression/LinearInterpolation.h

@@ -1 @@
-#ifndef _theplu_yat_regression_cspline_interpolation_
-#define _theplu_yat_regression_cspline_interpolation_
+#ifndef _theplu_yat_regression_linear_interpolation_
+#define _theplu_yat_regression_linear_interpolation_
 
 // $Id$
@@ -33 +33 @@
 
   /**
-     \brief Cubic spline with natural boundary conditions.
-
-     The resulting curve is piecewise cubic on each interval, with
-     matching first and second derivatives at the supplied
-     data-points. The second derivative is chosen to be zero at the
-     first point and last point.
+     \brief Linear interpolation.
 
      \see Please refer to the base class documentation for genereal
      introduction to the GSL based interpolation methods.
   */
-  class CSplineInterpolation : public GSLInterpolation
+  class LinearInterpolation : public GSLInterpolation
   {
 
@@ -50 +45 @@
        \brief The default constructor
     */
-    CSplineInterpolation(const utility::VectorBase& x,
-                         const utility::VectorBase& y);
+    LinearInterpolation(const utility::VectorBase& x,
+                        const utility::VectorBase& y);
 
     /**
        \brief The destructor
     */
-    ~CSplineInterpolation(void);
+    ~LinearInterpolation(void);
 
   private:
@@ -62 +57 @@
        \brief Copy Constructor. (not implemented)
     */
-    CSplineInterpolation(const CSplineInterpolation&);
+    LinearInterpolation(const LinearInterpolation&);
 
   };

trunk/yat/regression/Makefile.am

@@ -24 +24 @@
 noinst_LTLIBRARIES = libregression.la
 libregression_la_SOURCES = CSplineInterpolation.cc GSLInterpolation.cc \
-  KernelBox.cc KernelTriCube.cc Linear.cc \
+  KernelBox.cc KernelTriCube.cc Linear.cc LinearInterpolation.cc \
   LinearWeighted.cc Local.cc MultiDimensional.cc      \
   MultiDimensionalWeighted.cc Naive.cc NaiveWeighted.cc   \
@@ -34 +34 @@
 include_regression_HEADERS = CSplineInterpolation.h GSLInterpolation.h \
   Kernel.h KernelBox.h KernelTriCube.h  \
-  Linear.h LinearWeighted.h Local.h MultiDimensional.h    \
+  Linear.h LinearInterpolation.h LinearWeighted.h Local.h MultiDimensional.h    \
   MultiDimensionalWeighted.h Naive.h NaiveWeighted.h    \
   OneDimensional.h OneDimensionalWeighted.h Polynomial.h    \