Changeset 1645 for trunk


Ignore:
Timestamp:
Dec 13, 2008, 9:25:07 AM (12 years ago)
Author:
Jari Häkkinen
Message:

Addresses #466. Changed name of CSpline to CSplineInterpolation.

Location:
trunk
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/test/interpolation_test.cc

    r1643 r1645  
    2222#include "Suite.h"
    2323
    24 #include "yat/regression/CSpline.h"
     24#include "yat/regression/CSplineInterpolation.h"
    2525#include "yat/utility/Vector.h"
    2626#include "yat/utility/VectorConstView.h"
     
    5353  y(0)=100; y(1)= 97; y(2)=111; y(3)=120; y(4)=117; y(5)=103;
    5454
    55   regression::CSpline cspline(x,y);
     55  regression::CSplineInterpolation cspline(x,y);
    5656
    5757  utility::Vector w(11);
  • trunk/yat/regression/CSplineInterpolation.cc

    r1644 r1645  
    2020*/
    2121
    22 #include "CSpline.h"
     22#include "CSplineInterpolation.h"
    2323
    2424#include <gsl/gsl_interp.h>
     
    2929
    3030
    31   CSpline::CSpline(const utility::VectorBase& x, const utility::VectorBase& y)
     31  CSplineInterpolation::CSplineInterpolation(const utility::VectorBase& x,
     32                                             const utility::VectorBase& y)
    3233    : GSLInterpolation(gsl_interp_cspline,x,y)
    3334  {
     
    3536
    3637
    37   CSpline::~CSpline(void)
     38  CSplineInterpolation::~CSplineInterpolation(void)
    3839  {
    3940  }
  • 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_
    33
    44// $Id$
     
    4343     introduction to the GSL based interpolation methods.
    4444  */
    45   class CSpline : public GSLInterpolation
     45  class CSplineInterpolation : public GSLInterpolation
    4646  {
    4747
     
    5050       \brief The default constructor
    5151    */
    52     CSpline(const utility::VectorBase& x, const utility::VectorBase& y);
     52    CSplineInterpolation(const utility::VectorBase& x,
     53                         const utility::VectorBase& y);
    5354
    5455    /**
    5556       \brief The destructor
    5657    */
    57     ~CSpline(void);
     58    ~CSplineInterpolation(void);
    5859
    5960  private:
     
    6162       \brief Copy Constructor. (not implemented)
    6263    */
    63     CSpline(const CSpline&);
     64    CSplineInterpolation(const CSplineInterpolation&);
    6465
    6566  };
  • trunk/yat/regression/Makefile.am

    r1643 r1645  
    2323
    2424noinst_LTLIBRARIES = libregression.la
    25 libregression_la_SOURCES = CSpline.cc GSLInterpolation.cc KernelBox.cc \
    26   KernelTriCube.cc Linear.cc  \
     25libregression_la_SOURCES = CSplineInterpolation.cc GSLInterpolation.cc \
     26  KernelBox.cc KernelTriCube.cc Linear.cc \
    2727  LinearWeighted.cc Local.cc MultiDimensional.cc      \
    2828  MultiDimensionalWeighted.cc Naive.cc NaiveWeighted.cc   \
     
    3232include_regressiondir = $(includedir)/yat/regression
    3333
    34 include_regression_HEADERS = CSpline.h GSLInterpolation.h Kernel.h \
    35   KernelBox.h KernelTriCube.h \
     34include_regression_HEADERS = CSplineInterpolation.h GSLInterpolation.h \
     35  Kernel.h KernelBox.h KernelTriCube.h  \
    3636  Linear.h LinearWeighted.h Local.h MultiDimensional.h    \
    3737  MultiDimensionalWeighted.h Naive.h NaiveWeighted.h    \
Note: See TracChangeset for help on using the changeset viewer.