1. BUG fix: the stable_integer_sort_new() function now works correctl…

…y after removing dynamic bit_mask.
fenilgmehta · Jan 20, 2019 · 7f923db · 7f923db
1 parent eb4d625
commit 7f923db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/integer_sort.cpp b/src/integer_sort.cpp
@@ -47,7 +47,7 @@ namespace ir_sort {
         //                      (updation: refer "ir_sort::parameter::set_BitShift_Iterations")
         //REMOVE // int_fast32_t bit_mask;
         //REMOVE // int_fast32_t sign_bit_mask;
-        int_fast32_t min_bits_shift, initial_bits_shift;
+        int_fast32_t min_bits_shift=8, initial_bits_shift;
 
         /*
          * This will fill "box" with 0
@@ -64,7 +64,7 @@ namespace ir_sort {
          *
          * */
         inline void update_initial_bits_shift() {
-            initial_bits_shift += min_bits_shift;
+            initial_bits_shift += 8;
         }
 
         /*

diff --git a/test/temp_raw_data.cpp b/test/temp_raw_data.cpp
@@ -232,7 +232,8 @@ int32_t main() {
         int64_t timeArrIndex = 0;
 
         m_START_TIME
-        ir_sort::integer_sort(m_ALL(arr), true, 0);
+        // ir_sort::integer_sort(m_ALL(arr), true);
+        ir_sort::stable_integer_sort_new(m_ALL(arr), true, 3); // better
         m_END_TIME
         timeArr[timeArrIndex++] = duration.count();
         if (!isSorted(begin(arr)+myTempLow, begin(arr)+myTempHigh)) cerr << endl << "ERROR: array \""<<timeArrIndex<<"\" not sorted :(";
@@ -244,7 +245,10 @@ int32_t main() {
         // if (!isSorted(&arr[0], myTempLow, myTempHigh)) cerr << endl << "ERROR: array \""<<timeArrIndex<<"\" not sorted :(";
 
         m_START_TIME
-        ska_sort(m_ALL(arr));
+        // ska_sort(m_ALL(arr));
+        auto *buffer = new ArrayDataType[arrayLength];
+        detail::SizedRadixSorter<8>::sort(m_ALL(arr), buffer, [](ArrayDataType &a){return a;});
+        delete[] buffer;
         m_END_TIME
         timeArr[timeArrIndex++] = duration.count();
         // if (!isSorted(&arr[0], myTempLow, myTempHigh)) cerr << endl << "ERROR: array \""<<timeArrIndex<<"\" not sorted :(";