X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TP_13%2Fexo1%2Flib%2Fsort.c;h=78625b652f804270487b101ecc07b024dbddc55e;hb=210f7f057cbb8acbc783ffd1ac7333d6cf613ce4;hp=0fdb0be30c6ef0c087d8088dc2f3afdc0c0ca18d;hpb=e40016767464ae5f361e1be20a9bbc6858878e5e;p=TD_C.git

diff --git a/TP_13/exo1/lib/sort.c b/TP_13/exo1/lib/sort.c
index 0fdb0be..78625b6 100644
--- a/TP_13/exo1/lib/sort.c
+++ b/TP_13/exo1/lib/sort.c
@@ -10,28 +10,30 @@ bool descending(int a, int b) {
 }
 
 bool ascending_and_even(int a, int b) {
-    return (ascending(a, b) && (a % 2 == 0));
+    return (((a % 2 != 0) && (b % 2 == 0)) || ((a % 2 == 0) && (b % 2 == 0) && ascending(a, b)) \
+                || ((a % 2 != 0) && (b % 2 != 0) && ascending(a, b)));
 }
 
 bool ascending_and_odd(int a, int b) {
-    return (ascending(a, b) && (a % 2 != 0));
+    return (((a % 2 == 0) && (b % 2 != 0)) || ((a % 2 == 0) && (b % 2 == 0) && ascending(a, 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]);
-            if (!rt) { rt = true; };
+            rt = true;
         }
     }
     return rt;
 }
 
-/* this function is awaited in the array.c file */
-void sort_bubble_array(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, s_criteria_cb sort_criteria) {
     bool rt;
     do {
-        rt = sort_first(array, length, criteria);
+        rt = sort_first(array, length, sort_criteria);
    } while (rt);
 }