Changeset 2727 for trunk/src/BisectionLocator.cpp

Timestamp:

01/11/13 18:48:37 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770, CAS-4774

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...

Updated STApplyCal to be able to specify interpolation method.
The method can be specified in time and frequency axes independently.
Possible options are nearest, linear (default), (natural) cubic spline,
and polynomial with arbitrary order.

File:

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

trunk/src/BisectionLocator.cpp

@@ -12 +12 @@
 #include <assert.h>
 
-#include <casa/Arrays/Vector.h>
-#include <casa/Arrays/ArrayIO.h>
-#include <casa/Exceptions/Error.h>
-
 #include "BisectionLocator.h"
-
-using namespace casa;
 
 namespace asap {
@@ -39 +33 @@
     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])
+    if (x >= x_[0])
       return 0;
-    else if (x <= x_[n_-1])
+    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;
   }
-  unsigned int jl = 0;
-  unsigned int ju = n_;
-  unsigned int jm;
-
-  while (ju - jl > 1) {
-    jm = (ju + jl) >> 1;
-    if ((x >= x_[jm]) == ascending)
-      jl = jm;
-    else
-      ju = jm;
-  }
-  return ju;
 }