- Timestamp:
- Dec 13, 2008, 9:25:07 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/interpolation_test.cc
r1643 r1645 22 22 #include "Suite.h" 23 23 24 #include "yat/regression/CSpline .h"24 #include "yat/regression/CSplineInterpolation.h" 25 25 #include "yat/utility/Vector.h" 26 26 #include "yat/utility/VectorConstView.h" … … 53 53 y(0)=100; y(1)= 97; y(2)=111; y(3)=120; y(4)=117; y(5)=103; 54 54 55 regression::CSpline cspline(x,y);55 regression::CSplineInterpolation cspline(x,y); 56 56 57 57 utility::Vector w(11); -
trunk/yat/regression/CSplineInterpolation.cc
r1644 r1645 20 20 */ 21 21 22 #include "CSpline .h"22 #include "CSplineInterpolation.h" 23 23 24 24 #include <gsl/gsl_interp.h> … … 29 29 30 30 31 CSpline::CSpline(const utility::VectorBase& x, const utility::VectorBase& y) 31 CSplineInterpolation::CSplineInterpolation(const utility::VectorBase& x, 32 const utility::VectorBase& y) 32 33 : GSLInterpolation(gsl_interp_cspline,x,y) 33 34 { … … 35 36 36 37 37 CSpline ::~CSpline(void)38 CSplineInterpolation::~CSplineInterpolation(void) 38 39 { 39 40 } -
trunk/yat/regression/CSplineInterpolation.h
r1644 r1645 1 #ifndef _theplu_yat_regression_cspline_ 2 #define _theplu_yat_regression_cspline_ 1 #ifndef _theplu_yat_regression_cspline_interpolation_ 2 #define _theplu_yat_regression_cspline_interpolation_ 3 3 4 4 // $Id$ … … 43 43 introduction to the GSL based interpolation methods. 44 44 */ 45 class CSpline : public GSLInterpolation45 class CSplineInterpolation : public GSLInterpolation 46 46 { 47 47 … … 50 50 \brief The default constructor 51 51 */ 52 CSpline(const utility::VectorBase& x, const utility::VectorBase& y); 52 CSplineInterpolation(const utility::VectorBase& x, 53 const utility::VectorBase& y); 53 54 54 55 /** 55 56 \brief The destructor 56 57 */ 57 ~CSpline (void);58 ~CSplineInterpolation(void); 58 59 59 60 private: … … 61 62 \brief Copy Constructor. (not implemented) 62 63 */ 63 CSpline (const CSpline&);64 CSplineInterpolation(const CSplineInterpolation&); 64 65 65 66 }; -
trunk/yat/regression/Makefile.am
r1643 r1645 23 23 24 24 noinst_LTLIBRARIES = libregression.la 25 libregression_la_SOURCES = CSpline .cc GSLInterpolation.cc KernelBox.cc \26 Kernel TriCube.cc Linear.cc \25 libregression_la_SOURCES = CSplineInterpolation.cc GSLInterpolation.cc \ 26 KernelBox.cc KernelTriCube.cc Linear.cc \ 27 27 LinearWeighted.cc Local.cc MultiDimensional.cc \ 28 28 MultiDimensionalWeighted.cc Naive.cc NaiveWeighted.cc \ … … 32 32 include_regressiondir = $(includedir)/yat/regression 33 33 34 include_regression_HEADERS = CSpline .h GSLInterpolation.h Kernel.h \35 Kernel Box.h KernelTriCube.h \34 include_regression_HEADERS = CSplineInterpolation.h GSLInterpolation.h \ 35 Kernel.h KernelBox.h KernelTriCube.h \ 36 36 Linear.h LinearWeighted.h Local.h MultiDimensional.h \ 37 37 MultiDimensionalWeighted.h Naive.h NaiveWeighted.h \
Note: See TracChangeset
for help on using the changeset viewer.