Changeset 1646
 Timestamp:
 Dec 13, 2008, 9:29:40 AM (13 years ago)
 Location:
 trunk/yat/regression
 Files:

 1 edited
 2 copied
Legend:
 Unmodified
 Added
 Removed

trunk/yat/regression/LinearInterpolation.cc
r1645 r1646 20 20 */ 21 21 22 #include " CSplineInterpolation.h"22 #include "LinearInterpolation.h" 23 23 24 24 #include <gsl/gsl_interp.h> … … 29 29 30 30 31 CSplineInterpolation::CSplineInterpolation(const utility::VectorBase& x,32 33 : GSLInterpolation(gsl_interp_ cspline,x,y)31 LinearInterpolation::LinearInterpolation(const utility::VectorBase& x, 32 const utility::VectorBase& y) 33 : GSLInterpolation(gsl_interp_linear,x,y) 34 34 { 35 35 } 36 36 37 37 38 CSplineInterpolation::~CSplineInterpolation(void)38 LinearInterpolation::~LinearInterpolation(void) 39 39 { 40 40 } 
trunk/yat/regression/LinearInterpolation.h
r1645 r1646 1 #ifndef _theplu_yat_regression_ cspline_interpolation_2 #define _theplu_yat_regression_ cspline_interpolation_1 #ifndef _theplu_yat_regression_linear_interpolation_ 2 #define _theplu_yat_regression_linear_interpolation_ 3 3 4 4 // $Id$ … … 33 33 34 34 /** 35 \brief Cubic spline with natural boundary conditions. 36 37 The resulting curve is piecewise cubic on each interval, with 38 matching first and second derivatives at the supplied 39 datapoints. The second derivative is chosen to be zero at the 40 first point and last point. 35 \brief Linear interpolation. 41 36 42 37 \see Please refer to the base class documentation for genereal 43 38 introduction to the GSL based interpolation methods. 44 39 */ 45 class CSplineInterpolation : public GSLInterpolation40 class LinearInterpolation : public GSLInterpolation 46 41 { 47 42 … … 50 45 \brief The default constructor 51 46 */ 52 CSplineInterpolation(const utility::VectorBase& x,53 47 LinearInterpolation(const utility::VectorBase& x, 48 const utility::VectorBase& y); 54 49 55 50 /** 56 51 \brief The destructor 57 52 */ 58 ~ CSplineInterpolation(void);53 ~LinearInterpolation(void); 59 54 60 55 private: … … 62 57 \brief Copy Constructor. (not implemented) 63 58 */ 64 CSplineInterpolation(const CSplineInterpolation&);59 LinearInterpolation(const LinearInterpolation&); 65 60 66 61 }; 
trunk/yat/regression/Makefile.am
r1645 r1646 24 24 noinst_LTLIBRARIES = libregression.la 25 25 libregression_la_SOURCES = CSplineInterpolation.cc GSLInterpolation.cc \ 26 KernelBox.cc KernelTriCube.cc Linear.cc \26 KernelBox.cc KernelTriCube.cc Linear.cc LinearInterpolation.cc \ 27 27 LinearWeighted.cc Local.cc MultiDimensional.cc \ 28 28 MultiDimensionalWeighted.cc Naive.cc NaiveWeighted.cc \ … … 34 34 include_regression_HEADERS = CSplineInterpolation.h GSLInterpolation.h \ 35 35 Kernel.h KernelBox.h KernelTriCube.h \ 36 Linear.h Linear Weighted.h Local.h MultiDimensional.h \36 Linear.h LinearInterpolation.h LinearWeighted.h Local.h MultiDimensional.h \ 37 37 MultiDimensionalWeighted.h Naive.h NaiveWeighted.h \ 38 38 OneDimensional.h OneDimensionalWeighted.h Polynomial.h \
Note: See TracChangeset
for help on using the changeset viewer.