Changeset 2730 for trunk/src/BufferedBisectionLocator.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/BufferedBisectionLocator.cpp (modified) (4 diffs)

trunk/src/BufferedBisectionLocator.cpp

@@ -15 +15 @@
 
 namespace asap {
+BufferedBisectionLocator::BufferedBisectionLocator()
+  : Locator(),
+    prev_(0)
+{}
 
-BufferedBisectionLocator::BufferedBisectionLocator(double *v, unsigned int n)
-  : Locator(v, n),
+BufferedBisectionLocator::BufferedBisectionLocator(double *v, unsigned int n, 
+                                                   bool copystorage)
+  : Locator(v, n, copystorage),
     prev_(0)
 {}
@@ -28 +33 @@
   if (n_ == 1)
     return 0;
-  bool ascending = (x_[n_-1] >= x_[0]);
-  if (ascending) {
+
+  unsigned int jl = 0;
+  unsigned int ju = n_;
+  if (ascending_) {
+    // ascending order
     if (x <= x_[0])
       return 0;
@@ -35 +43 @@
       return n_;
 
-    unsigned int jl = 0;
-    unsigned int ju = n_;
-    unsigned int jm;
+    if (x < x_[prev_]) {
+      ju = bisection(x, jl, prev_);
+    }
+    else {
+      ju = bisection(x, prev_, ju);
+    }
 
-    if (x < x_[prev_]) {
-      ju = prev_;
-      prev_ = 0;
-    }
-    else 
-      jl = prev_;
-
-    while (ju - jl > 1) {
-      jm = (ju + jl) >> 1;
-      if (x > x_[jm])
-        jl = jm;
-      else
-        ju = jm;
-    }
-    prev_ = jl;
-    return ju;
   }
   else {
+    // descending order
     if (x >= x_[0])
       return 0;
@@ -62 +58 @@
       return n_;
 
-    unsigned int jl = 0;
-    unsigned int ju = n_;
-    unsigned int jm;
+    if (x > x_[prev_]) {
+      ju = bisection(x, jl, prev_);
+    }
+    else {
+      ju = bisection(x, prev_, ju);
+    }
+  }
 
-    if (x > x_[prev_]) {
-      ju = prev_;
-      prev_ = 0;
-    }
-    else 
-      jl = prev_;
-
-    while (ju - jl > 1) {
-      jm = (ju + jl) >> 1;
-      if (x < x_[jm])
-        jl = jm;
-      else
-        ju = jm;
-    }
-    prev_ = jl;
-    return ju;
-  }
+  prev_ = (ju > 0) ? ju - 1 : 0;
+  return ju;    
 }