Changeset 2731 for trunk

Timestamp:

01/16/13 16:45:43 (12 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 Locator and its derived classes as template class.

Location:

trunk/src

Files:

• BisectionLocator.cpp (deleted)
• BisectionLocator.h (modified) (3 diffs)
• BufferedBisectionLocator.cpp (deleted)
• BufferedBisectionLocator.h (modified) (4 diffs)
• CMakeLists.txt (modified) (1 diff)
• HuntLocator.cpp (deleted)
• HuntLocator.h (modified) (4 diffs)
• Interpolator1D.cpp (modified) (2 diffs)
• Interpolator1D.h (modified) (1 diff)
• Locator.cpp (deleted)
• Locator.h (modified) (6 diffs)

trunk/src/BisectionLocator.h

@@ -21 +21 @@
  * @author TakeshiNakazato
  */
-class BisectionLocator : public Locator {
+template <class T> class BisectionLocator : public Locator<T> {
 public:
   // Default constructor.
@@ -31 +31 @@
   // @param[in] copystorage whether allocate internal memory or not.
   // @see Locator::set()
-  BisectionLocator(double *v, unsigned int n, bool copystorage=true);
+  BisectionLocator(T *v, unsigned int n, bool copystorage=true);
 
   // Destructor.
@@ -40 +40 @@
   // @return location as an index j.
   // @see Locator::locate()
-  unsigned int locate(double x);
+  unsigned int locate(T x);
 };
 
 }
+
+#include "BisectionLocator.tcc"
+
 #endif

trunk/src/BufferedBisectionLocator.h

@@ -22 +22 @@
  * @author TakeshiNakazato
  */
-class BufferedBisectionLocator : public Locator {
+template <class T> class BufferedBisectionLocator : public Locator<T> {
 public:
   // Default constructor.
@@ -32 +32 @@
   // @param[in] copystorage whether allocate internal memory or not.
   // @see Locator::set()
-  BufferedBisectionLocator(double *v, unsigned int n, bool copystorage=true);
+  BufferedBisectionLocator(T *v, unsigned int n, bool copystorage=true);
 
   // Destructor.
@@ -41 +41 @@
   // @return location as an index j.
   // @see Locator::locate()
-  unsigned int locate(double x);
+  unsigned int locate(T x);
 private:
 
@@ -49 +49 @@
 
 }
+
+#include "BufferedBisectionLocator.tcc"
+
 #endif

trunk/src/CMakeLists.txt

@@ -80 +80 @@
      ${SRCDIR}/Calibrator.cpp
      ${SRCDIR}/PSAlmaCalibrator.cpp
-     ${SRCDIR}/Locator.cpp
-     ${SRCDIR}/BisectionLocator.cpp
-     ${SRCDIR}/HuntLocator.cpp
-     ${SRCDIR}/BufferedBisectionLocator.cpp
      ${SRCDIR}/Interpolator1D.cpp
      ${SRCDIR}/NearestInterpolator1D.cpp

trunk/src/HuntLocator.h

@@ -21 +21 @@
  * @author TakeshiNakazato
  */
-class HuntLocator : public Locator {
+template <class T> class HuntLocator : public Locator<T> {
 public:
   // Default constructor.
@@ -31 +31 @@
   // @param[in] copystorage whether allocate internal memory or not.
   // @see Locator::set()
-  HuntLocator(double *v, unsigned int n, bool copystorage=true);
+  HuntLocator(T *v, unsigned int n, bool copystorage=true);
 
   // Destructor.
@@ -41 +41 @@
   // @return location as an index j.
   // @see Locator::locate()
-  unsigned int locate(double x);
+  unsigned int locate(T x);
 private:
+  // Hunt algorithm
+  // @param[in] x input value to be located.
+  // @param[in,out] left input: the starting point for hunt.
+  //                     output: the left index of hunted region.
+  // @param[out] right the right index of hunted region.
+  void hunt(T x, unsigned int &left, unsigned int &right);
+
   // Storage for previous result.
   unsigned int prev_;
@@ -48 +55 @@
 
 }
+
+#include "HuntLocator.tcc"
+
 #endif

trunk/src/Interpolator1D.cpp

@@ -16 +16 @@
 
 #include "Interpolator1D.h"
+#include "Locator.h"
 #include "BisectionLocator.h"
 #include "HuntLocator.h"
@@ -88 +89 @@
   if (!locator_) {
     if (n_ > 1000)
-      locator_ = new HuntLocator();
+      locator_ = new HuntLocator<double>();
     else
-      locator_ = new BisectionLocator();
+      locator_ = new BisectionLocator<double>();
   }
 }

trunk/src/Interpolator1D.h

@@ -87 +87 @@
 
   // Pointer to the Locator object.
-  Locator *locator_;
+  Locator<double> *locator_;
 };
 

trunk/src/Locator.h

@@ -19 +19 @@
  * @author TakeshiNakazato
  */
-class Locator {
+template <class T> class Locator {
 public:
   // Default constructor.
@@ -29 +29 @@
   // @param[in] copystorage whether allocate internal memory or not.
   // @see set()
-  Locator(double *v, unsigned int n, bool copystorage=true);
-
+  Locator(T *v, unsigned int n, bool copystorage=true);
+  
   // Set data. The data must be sorted in either ascending or descending 
   // order, and must not have any duplicate elements. 
@@ -42 +42 @@
   // it will take a risk to allow to edit the data to be searched from 
   // outside the class.
-  void set(double *v, unsigned int n, bool copystorage=true);
-
+  void set(T *v, unsigned int n, bool copystorage=true);
+  
   // Destructor.
   virtual ~Locator();
-
+  
   // Return right hand side index of location.
   // @param[in] x input value to be located.
@@ -54 +54 @@
   // case while x_[j-1] > x >= x_[j] for descending case.
   // Returned value 0 or x.nelements() indicates out of range. 
-  virtual unsigned int locate(double x) = 0;
-
+  virtual unsigned int locate(T x) = 0;
+  
 protected:
   // Bisection search.
@@ -61 +61 @@
   // @param[in] left the leftmost index to search.
   // @param[in] right the rightmost index to search.
-  unsigned int bisection(double x, unsigned int left, unsigned int right);
+  unsigned int bisection(T x, unsigned int left, unsigned int right);
   
-  // Hunt algorithm
-  // @param[in] x input value to be located.
-  // @param[in,out] left input: the starting point for hunt.
-  //                     output: the left index of hunted region.
-  // @param[out] right the right index of hunted region.
-  void hunt(double x, unsigned int &left, unsigned int &right);
-
   // Pointer to the data.
-  double *x_;
+  T *x_;
 
   // Length of the data.
@@ -84 +77 @@
 
 }
+
+#include "Locator.tcc"
+
 #endif