Changeset 2731 for trunk/src/Locator.h

Timestamp:

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

File:

• trunk/src/Locator.h (modified) (6 diffs)

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