X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TP_13%2Fexo1%2Flib%2Fsort.c;h=0bd005ed639c0921fcc0ecedab050a2df352137d;hb=5668eb729c9f8bc27bb6a2120a37a41fd1043761;hp=01a742f7966d557ff7724409bbfa2f9e4fa48ce2;hpb=475ee86d70921638c700bc0934441c7fe2c905d1;p=TD_C.git

diff --git a/TP_13/exo1/lib/sort.c b/TP_13/exo1/lib/sort.c
index 01a742f..0bd005e 100644
--- a/TP_13/exo1/lib/sort.c
+++ b/TP_13/exo1/lib/sort.c
@@ -1,6 +1,15 @@
 #include "utils.h"
 #include "sort.h"
 
+bool is_even(int a) {
+    return (a % 2 == 0);
+}
+
+bool is_odd(int a) {
+    return (a % 2 != 0);
+
+}
+
 bool ascending(int a, int b) {
     return a > b;
 }
@@ -19,10 +28,10 @@ bool ascending_and_odd(int a, int b) {
                 || ((a % 2 != 0) && (b % 2 != 0) && ascending(a, b)));
 }
 
-static bool sort_first(int* array, unsigned length, criteria_cb criteria) {
+static bool sort_first(int* array, unsigned length, s_criteria_cb sort_criteria) {
     bool rt = false;
     for (unsigned i = 0; i < length-1; i++) {
-        if (criteria(array[i], array[i+1])) {
+        if (sort_criteria(array[i], array[i+1])) {
             swap_int(&array[i], &array[i+1]);
             rt = true;
         }
@@ -31,9 +40,9 @@ static bool sort_first(int* array, unsigned length, criteria_cb criteria) {
 }
 
 /* the feature of this function is awaited in the array.c file */
-void sort_bubble_array(int* array, unsigned length, criteria_cb criteria) {
+void sort_bubble_array(int* array, unsigned length, s_criteria_cb sort_criteria) {
     bool rt;
     do {
-        rt = sort_first(array, length, criteria);
+        rt = sort_first(array, length, sort_criteria);
    } while (rt);
 }