X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TP_9%2Fexo2%2Fclist.c;fp=TP_9%2Fexo2%2Fclist.c;h=ae7db6fcb6d5740ac59921ca684e960d88971b75;hb=4a758ce5f71ecc19fb6457595fb04c18b6918b9f;hp=afdb00f6c12e84617d2d360dc331c8849dee94a5;hpb=298b013c505f937cb7d0946012bf359ba39056c8;p=TD_C.git

diff --git a/TP_9/exo2/clist.c b/TP_9/exo2/clist.c
index afdb00f..ae7db6f 100644
--- a/TP_9/exo2/clist.c
+++ b/TP_9/exo2/clist.c
@@ -1,5 +1,6 @@
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
 #include <stdbool.h>
 
 #include "clist.h"
@@ -118,6 +119,47 @@ link_t* list_sort(link_t* head) {
     return head_first;
 }
 
+static link_t* _list_merge_sort(link_t* head1, link_t* head2) {
+    link_t* head_result = NULL;
+
+    if (head1 == NULL) {
+        return head2;
+    }
+    if (head2 == NULL) {
+        return head1;
+    }
+    if (head1->value < head2->value) {
+        head_result = head1;
+	head_result->next = _list_merge_sort(head1->next, head2);
+    } else {
+        head_result = head2;
+	head_result->next = _list_merge_sort(head1, head2->next);
+    }
+    return head_result;
+}
+
+link_t* list_merge_sort(link_t* head) {
+    link_t* head1;
+    link_t* head2;
+
+    if (head == NULL || head->next == NULL) {
+        return head;
+    }
+
+    head1 = head;
+    head2 = head->next;
+    while (head2 != NULL && head2->next != NULL) {
+        head = head->next;
+	head2 = head->next->next;
+    }
+    head2 = head->next;
+    head->next = NULL;
+
+    head1 = list_merge_sort(head1);
+    head2 = list_merge_sort(head2);
+    return _list_merge_sort(head1, head2);
+}
+
 unsigned list_count(link_t* head) {
     unsigned count = 0;