Changeset 2733 for trunk/src/Interpolator1D.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/Interpolator1D.h (modified) (5 diffs)

trunk/src/Interpolator1D.h

@@ -21 +21 @@
  * @author TakeshiNakazato
  */
-class Interpolator1D {
+template <class T, class U> class Interpolator1D {
 public:
   // Default constructor.
@@ -33 +33 @@
   // @param[in] y pointer to vertical data.
   // @param[in] n number of data.
-  void setData(double *x, float *y, unsigned int n);
+  void setData(T *x, U *y, unsigned int n);
 
   // Set horizontal data (x).
   // @param[in] x pointer to horizontal data.
   // @param[in] n number of data.
-  void setX(double *x, unsigned int n);
+  void setX(T *x, unsigned int n);
 
   // Set vertical data (y).
   // @param[in] y pointer to vertical data.
   // @param[in] n number of data.
-  void setY(float *y, unsigned int n);
+  void setY(U *y, unsigned int n);
 
   // Reset object.
@@ -58 +58 @@
   //              by interpolation.
   // @return interpolated value at x.
-  virtual float interpolate(double x) = 0;
+  virtual U interpolate(T x) = 0;
 
 protected:
@@ -65 +65 @@
   // @return location as an index.
   // @see Locator::locate()
-  unsigned int locate(double x);
+  unsigned int locate(T x);
 
   // Query function whether the object is ready to interpolate.
@@ -81 +81 @@
 
   // Horizontal data.
-  double *x_;
+  T *x_;
 
   // Vertical data.
-  float *y_;
+  U *y_;
 
   // Pointer to the Locator object.
-  Locator<double> *locator_;
+  Locator<T> *locator_;
 };
 
 }
+
+#include "Interpolator1D.tcc"
+
 #endif