Changeset 1645 for trunk

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:

• test/interpolation_test.cc (modified) (2 diffs)
• yat/regression/CSplineInterpolation.cc (moved) (moved from trunk/yat/regression/CSpline.cc) (3 diffs)
• yat/regression/CSplineInterpolation.h (moved) (moved from trunk/yat/regression/CSpline.h) (4 diffs)
• yat/regression/Makefile.am (modified) (2 diffs)

trunk/test/interpolation_test.cc

@@ -22 +22 @@
 #include "Suite.h"
 
-#include "yat/regression/CSpline.h"
+#include "yat/regression/CSplineInterpolation.h"
 #include "yat/utility/Vector.h"
 #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;
 
-  regression::CSpline cspline(x,y);
+  regression::CSplineInterpolation cspline(x,y);
 
   utility::Vector w(11);

trunk/yat/regression/CSplineInterpolation.cc

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

trunk/yat/regression/CSplineInterpolation.h

@@ -1 @@
-#ifndef _theplu_yat_regression_cspline_
-#define _theplu_yat_regression_cspline_
+#ifndef _theplu_yat_regression_cspline_interpolation_
+#define _theplu_yat_regression_cspline_interpolation_
 
 // $Id$
@@ -43 +43 @@
      introduction to the GSL based interpolation methods.
   */
-  class CSpline : public GSLInterpolation
+  class CSplineInterpolation : public GSLInterpolation
   {
 
@@ -50 +50 @@
        \brief The default constructor
     */
-    CSpline(const utility::VectorBase& x, const utility::VectorBase& y);
+    CSplineInterpolation(const utility::VectorBase& x,
+                         const utility::VectorBase& y);
 
     /**
        \brief The destructor
     */
-    ~CSpline(void);
+    ~CSplineInterpolation(void);
 
   private:
@@ -61 +62 @@
        \brief Copy Constructor. (not implemented)
     */
-    CSpline(const CSpline&);
+    CSplineInterpolation(const CSplineInterpolation&);
 
   };

trunk/yat/regression/Makefile.am

@@ -23 +23 @@
 
 noinst_LTLIBRARIES = libregression.la
-libregression_la_SOURCES = CSpline.cc GSLInterpolation.cc KernelBox.cc \
-  KernelTriCube.cc Linear.cc  \
+libregression_la_SOURCES = CSplineInterpolation.cc GSLInterpolation.cc \
+  KernelBox.cc KernelTriCube.cc Linear.cc \
   LinearWeighted.cc Local.cc MultiDimensional.cc      \
   MultiDimensionalWeighted.cc Naive.cc NaiveWeighted.cc   \
@@ -32 +32 @@
 include_regressiondir = $(includedir)/yat/regression
 
-include_regression_HEADERS = CSpline.h GSLInterpolation.h Kernel.h \
-  KernelBox.h KernelTriCube.h \
+include_regression_HEADERS = CSplineInterpolation.h GSLInterpolation.h \
+  Kernel.h KernelBox.h KernelTriCube.h  \
   Linear.h LinearWeighted.h Local.h MultiDimensional.h    \
   MultiDimensionalWeighted.h Naive.h NaiveWeighted.h    \