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

diff --git a/TP_9/exo2/clist.c b/TP_9/exo2/clist.c
index a089750..ae7db6f 100644
--- a/TP_9/exo2/clist.c
+++ b/TP_9/exo2/clist.c
@@ -1,4 +1,7 @@
+#include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
+#include <stdbool.h>
 
 #include "clist.h"
 
@@ -55,12 +58,15 @@ link_t* list_insert(link_t* head, unsigned index, int value) {
 link_t* list_delete(link_t* head, unsigned index) {
     link_t* head_prev = NULL;
     link_t* head_next = NULL;
+    link_t* head_ret = NULL;
    
-    if (index == 0) {
+    if (head == NULL) {
+        return NULL;
+    } else if (index == 0) {
         head_next = head->next;
         free(head);
         head = head_next;
-        return head;
+        head_ret = head;
     } else {
         link_t* head_first = head;
         for (unsigned i = 0; i < index-1; i++) {
@@ -72,12 +78,90 @@ link_t* list_delete(link_t* head, unsigned index) {
         free(head);
         head = head_prev;
         head->next = head_next;
-        return head_first;
+        head_ret = head_first;
+    }
+    if (head_ret != NULL) {
+        return head_ret;
+    } else {
+        return NULL;
+    }
+}
+
+link_t* list_concat(link_t* first, link_t* second) {
+    link_t* head_first = first;
+
+    while (first->next != NULL) {
+        first = first->next;
+    }
+    first->next = second;
+    return head_first;
+}
+
+link_t* list_sort(link_t* head) {
+    int tmp;
+    bool isswaped;
+    link_t* head_first = head;
+
+    do {
+        isswaped = false;
+        while (head->next != NULL) {
+            if (head->value > head->next->value) {
+                tmp = head->value;
+                head->value = head->next->value;
+                head->next->value = tmp;
+	        isswaped = true;
+            }
+	    head = head->next;
+        }
+	/* Reloop at the beginning of the list until there's values swaped */
+	head = head_first;
+    } while (isswaped);
+    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) {
-    int count = 0;
+    unsigned count = 0;
     
     while (head != NULL) {
         ++count;
@@ -110,12 +194,24 @@ int list_get(link_t* head, unsigned index) {
     }
 }
 
-void list_clear(link_t* link) {
+void list_clear(link_t* head) {
     link_t* next_link = NULL;
 
-    while (link != NULL) {
-        next_link = link->next;
-        free(link);
-        link = next_link;
+    while (head != NULL) {
+        next_link = head->next;
+        free(head);
+        head = next_link;
+    }
+}
+
+void list_display_values(link_t* head) {
+    unsigned i = 0;
+
+    printf("------Begin------\n");
+    while (head != NULL) {
+        printf("value at [%d]=%d\n", i, head->value);
+	head = head->next;
+	i++;
     }
+    printf("------End------\n");
 }