fix(DataTomeAnalysis): 🐛 fix qsort callback function

AlexandreHiroyuki · Aug 5, 2024 · eb71f55 · eb71f55
1 parent a285fbf
commit eb71f55
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/src/DataTome.h b/src/DataTome.h
@@ -9,5 +9,6 @@
 
 #include <DataTomeAnalysis.h>
 #include <DataTomeMvAvg.h>
+#include <DataTomeUtils.h>
 
 #endif  // DATA_TOME_H
diff --git a/src/DataTomeAnalysis.h b/src/DataTomeAnalysis.h
@@ -8,6 +8,7 @@
 #define DATA_TOME_ANALYSIS_H
 
 #include <DataTomeMvAvg.h>
+#include <DataTomeUtils.h>
 #include <math.h>
 #include <stdlib.h>
 
@@ -43,10 +44,7 @@ class DataTomeAnalysis : public DataTomeMvAvg<TypeOfArray, TypeOfSum> {
 
     memcpy(temp, this->_array, current_size * sizeof(TypeOfArray));
 
-    qsort(temp, current_size, sizeof(TypeOfArray),
-          [](const void *a, const void *b) -> int {
-            return (*(TypeOfArray *)a - *(TypeOfArray *)b);
-          });
+    qsort(temp, current_size, sizeof(TypeOfArray), sort_ascend<TypeOfArray>);
 
     if (current_size % 2 == 0) {
       median = (temp[current_size / 2 - 1] + temp[current_size / 2]) / 2;
@@ -67,10 +65,7 @@ class DataTomeAnalysis : public DataTomeMvAvg<TypeOfArray, TypeOfSum> {
 
     memcpy(temp, this->_array, current_size * sizeof(TypeOfArray));
 
-    qsort(temp, current_size, sizeof(TypeOfArray),
-          [](const void *a, const void *b) -> int {
-            return (*(TypeOfArray *)a - *(TypeOfArray *)b);
-          });
+    qsort(temp, current_size, sizeof(TypeOfArray), sort_ascend<TypeOfArray>);
 
     size_t max_count = 0;
     TypeOfArray mode = temp[0];
@@ -105,10 +100,7 @@ class DataTomeAnalysis : public DataTomeMvAvg<TypeOfArray, TypeOfSum> {
 
     memcpy(temp, this->_array, current_size * sizeof(TypeOfArray));
 
-    qsort(temp, current_size, sizeof(TypeOfArray),
-          [](const void *a, const void *b) -> int {
-            return (*(TypeOfArray *)a - *(TypeOfArray *)b);
-          });
+    qsort(temp, current_size, sizeof(TypeOfArray), sort_ascend<TypeOfArray>);
 
     size_t max_count = 0;
     TypeOfArray mode = temp[0];
@@ -180,10 +172,7 @@ class DataTomeAnalysis : public DataTomeMvAvg<TypeOfArray, TypeOfSum> {
       temp[i] = (*this)[i];
     }
 
-    qsort(temp, current_size, sizeof(TypeOfArray),
-          [](const void *a, const void *b) -> int {
-            return (*(TypeOfArray *)a - *(TypeOfArray *)b);
-          });
+    qsort(temp, current_size, sizeof(TypeOfArray), sort_ascend<TypeOfArray>);
 
     if (current_size % 2 == 0) {
       median = (temp[current_size / 2 - 1] + temp[current_size / 2]) / 2;
@@ -206,10 +195,7 @@ class DataTomeAnalysis : public DataTomeMvAvg<TypeOfArray, TypeOfSum> {
       temp[i] = (*this)[i];
     }
 
-    qsort(temp, current_size, sizeof(TypeOfArray),
-          [](const void *a, const void *b) -> int {
-            return (*(TypeOfArray *)a - *(TypeOfArray *)b);
-          });
+    qsort(temp, current_size, sizeof(TypeOfArray), sort_ascend<TypeOfArray>);
 
     size_t max_count = 0;
     TypeOfArray mode = temp[0];
@@ -246,10 +232,7 @@ class DataTomeAnalysis : public DataTomeMvAvg<TypeOfArray, TypeOfSum> {
       temp[i] = (*this)[i];
     }
 
-    qsort(temp, current_size, sizeof(TypeOfArray),
-          [](const void *a, const void *b) -> int {
-            return (*(TypeOfArray *)a - *(TypeOfArray *)b);
-          });
+    qsort(temp, current_size, sizeof(TypeOfArray), sort_ascend<TypeOfArray>);
 
     size_t max_count = 0;
     TypeOfArray mode = temp[0];

diff --git a/src/DataTomeUtils.h b/src/DataTomeUtils.h
@@ -0,0 +1,17 @@
+/***************************************************************
+  DataTomeUtils.h
+  Created by Alexandre Hiroyuki Yamauchi, August 05, 2024.
+***************************************************************/
+
+#ifndef DATA_TOME_UTILS_H
+#define DATA_TOME_UTILS_H
+
+template <typename TypeOfArray>
+int sort_ascend(const void *cmp1, const void *cmp2) {
+  TypeOfArray b = *((TypeOfArray *)cmp2);
+  TypeOfArray a = *((TypeOfArray *)cmp1);
+
+  return (int)a - b;
+}
+
+#endif  // DATA_TOME_UTILS_H