Changeset 22556

Timestamp:

03/17/18 22:41:10 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing HeapSort with ordering requested as output

File:

• issm/trunk-jpl/src/c/shared/Bamg/HeapSort.h (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Bamg/HeapSort.h

@@ -60 +60 @@
         c--; //the array must starts at 1 and not 0 
         order = new int[n];
-        for(i=0;i<n;i++) order[i]=i+1;
+        for(i=0;i<n;i++) order[i]=i;
+        order--;
 
         /*Sorting algorithm*/
@@ -81 +82 @@
                         if  (j>r) {c[i]=crit;order[i]=pos;break;}
                         if ((j<r) && (c[j] < c[j+1]))j++;
-                        if (crit < c[j]) {c[i]=c[j];order[i]=order[j];}
-                        else{c[i]=crit;order[i]=pos;break;}
+                        if (crit < c[j]){
+                                c[i]=c[j];
+                                order[i]=order[j];
+                        }
+                        else{
+                                c[i]=crit;order[i]=pos;
+                                break;
+                        }
                 }
         }