Changeset 2730 for trunk/src/BisectionLocator.cpp

Timestamp:

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

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

Ready for Test: Yes

Interface Changes: 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...

Rewrite implementations for locator and interpolator.
Documentation (doxygen format) is added to header files.

File:

• trunk/src/BisectionLocator.cpp (modified) (2 diffs)

trunk/src/BisectionLocator.cpp

@@ -15 +15 @@
 
 namespace asap {
+BisectionLocator::BisectionLocator()
+  : Locator()
+{
+}
 
-BisectionLocator::BisectionLocator(double *v, unsigned int n)
-  : Locator(v, n)
+
+BisectionLocator::BisectionLocator(double *v, unsigned int n, bool copystorage)
+  : Locator(v, n, copystorage)
 {}
 
@@ -27 +32 @@
   if (n_ == 1)
     return 0;
-  bool ascending = (x_[n_-1] >= x_[0]);
-  if (ascending) {
-    if (x <= x_[0])
-      return 0;
-    else if (x > x_[n_-1])
-      return n_;
 
-    unsigned int jl = 0;
-    unsigned int ju = n_;
-    unsigned int jm;
-    while (ju - jl > 1) {
-      jm = (ju + jl) >> 1;
-      if (x > x_[jm])
-        jl = jm;
-      else
-        ju = jm;
-    }
-    return ju;
-  }
-  else {
-    if (x >= x_[0])
-      return 0;
-    else if (x < x_[n_-1])
-      return n_;
-
-    unsigned int jl = 0;
-    unsigned int ju = n_;
-    unsigned int jm;
-    while (ju - jl > 1) {
-      jm = (ju + jl) >> 1;
-      if (x < x_[jm])
-        jl = jm;
-      else
-        ju = jm;
-    }
-    return ju;
-  }
+  return bisection(x, 0, n_);
 }