Changeset 13572

Timestamp:

10/09/12 20:33:14 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: changed offset==-1 to offset=-1 + some cosmetics

File:

• issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp

@@ -18 +18 @@
 
         /*intermediary: */
-        int* beg=NULL;
-        int* end=NULL;
-        int* mid=NULL;
+        int *beg = NULL;
+        int *end = NULL;
+        int *mid = NULL;
 
         // point to beginning and end of the array
@@ -69 +69 @@
         int offset=0;  
         int found=0; /*found=0: not found.   
-                                   found=1: found, and target is == to value at offset 
-                                   found=2: found, and target is > to value at offset  and < to value at offset+1
-                                   */
+                                                found=1: found, and target is == to value at offset 
+                                                found=2: found, and target is > to value at offset  and < to value at offset+1
+                                                */
 
         /*intermediary: */
-        double* beg=NULL;
-        double* end=NULL;
-        double* mid=NULL;
+        double *beg = NULL;
+        double *end = NULL;
+        double *mid = NULL;
 
         // point to beginning and end of the array
-        beg=sorted_doubles;
-        end=sorted_doubles+num_doubles;
-        mid=beg+(int)(num_doubles/2.0);
+        beg = sorted_doubles;
+        end = sorted_doubles+num_doubles;
+        mid = beg+(int)(num_doubles/2.0);
 
         if (target<*beg){
-                offset==-1;
-                found=0;
+                offset = -1;
+                found  = 0;
         }
         if (*beg==target){
-                found=1;
-                offset=0;
+                found  = 1;
+                offset = 0;
         }
         else if(*(end-1)==target){
-                found=1;
-                offset=num_doubles-1;
+                found  = 1;
+                offset = num_doubles-1;
         }
         else{
-                while((beg <= end) && !( target>=*mid &&  target<*(mid+1)) ){
+                while((beg <= end) && !( target>=*mid && target<*(mid+1)) ){
                         // is the target in lower or upper half?
                         if (target < *mid) {