Changeset 2733 for trunk/src/CubicSplineInterpolator1D.h

Timestamp:

01/16/13 20:00:01 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Redefined Interpolator1D and derived classes as template class.

File:

• trunk/src/CubicSplineInterpolator1D.h (modified) (5 diffs)

trunk/src/CubicSplineInterpolator1D.h

@@ -21 +21 @@
  * @author TakeshiNakazato
  */
-class CubicSplineInterpolator1D : public Interpolator1D {
+template <class T, class U>
+class CubicSplineInterpolator1D : public Interpolator1D<T, U> {
 public:
   // Default constructor.
@@ -31 +32 @@
   // Override Interpolator1D::setData.
   // @see Interpolator1D::setData
-  void setData(double *x, float *y, unsigned int n);
+  void setData(T *x, U *y, unsigned int n);
 
   // Override Interpolator1D::setY.
   // @see Interpolator1D::setY()
-  void setY(float *y, unsigned int n);
+  void setY(U *y, unsigned int n);
 
   // Perform interpolation.
@@ -41 +42 @@
   //              by interpolation.
   // @return interpolated value at x.
-  float interpolate(double x);
+  U interpolate(T x);
 private:
   // Determine second derivatives of each point based on 
@@ -53 +54 @@
   // @param[in] i location index for x.
   // @return interpolated value at x.
-  float dospline(double x, unsigned int i);
+  U dospline(T x, unsigned int i);
   
   // Array to store second derivatives on the data points.
-  float *y2_;
+  U *y2_;
 
   // number of data points for second derivatives
@@ -66 +67 @@
 
 }
+
+#include "CubicSplineInterpolator1D.tcc"
+
 #endif