X-Git-Url: https://git.piment-noir.org/?p=TD_C.git;a=blobdiff_plain;f=TP_13%2Fexo1%2Flib%2Fsort.c;h=f8917ea5ab6987bb96ccc9909f5bbdfa6f0d1cb8;hp=8b196ffe3c6662ad1ec687a117ec09ca0bd70943;hb=cfdd46d2e85b05f77a03ae31f721e2fd4030996f;hpb=0139cafd72a74369bf88580c3a533ef923c97586

diff --git a/TP_13/exo1/lib/sort.c b/TP_13/exo1/lib/sort.c
index 8b196ff..f8917ea 100644
--- a/TP_13/exo1/lib/sort.c
+++ b/TP_13/exo1/lib/sort.c
@@ -9,19 +9,29 @@ bool descending(int a, int b) {
     return a < b;
 }
 
-static bool sort_first(int* array, int length, criteria_cb criteria) {
+bool ascending_and_even(int a, int b) {
+    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 (((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) {
     bool rt = false;
-    for (int i = 0; i < length-1; i++) {
+    for (unsigned i = 0; i < length-1; i++) {
         if (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_array(int* array, int length, criteria_cb criteria) {
+void sort_bubble_array(int* array, unsigned length, criteria_cb criteria) {
     bool rt;
     do {
         rt = sort_first(array, length, criteria);