X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TP_9%2Fexo2%2Fexo2.c;h=810bd9eea64545915da2dfa27ec3ff4f52384c3c;hb=4a758ce5f71ecc19fb6457595fb04c18b6918b9f;hp=1b243af4d849557d760b35be5e0695f72fedaed1;hpb=83ec54cdf5ddd1092ed4ba11d58fec8a0db07b68;p=TD_C.git

diff --git a/TP_9/exo2/exo2.c b/TP_9/exo2/exo2.c
index 1b243af..810bd9e 100644
--- a/TP_9/exo2/exo2.c
+++ b/TP_9/exo2/exo2.c
@@ -3,29 +3,43 @@
 #include "clist.h"
 
 int main() {
+    link_t* head1 = NULL;
+    link_t* head2 = NULL;
     link_t* head = NULL;
-    printf("Longueur de la liste: %d\n", list_count(head));
-    head = list_append(head, 1);
-    head = list_append(head, 2);
-    head = list_append(head, 3);
-    head = list_append(head, 4);
-    printf("Longueur de la liste: %d\n", list_count(head));
-    list_display_values(head);
-    head = list_prepend(head, 5);
-    printf("Longueur de la liste: %d\n", list_count(head));
-    list_display_values(head);
-    list_set(head, 0, 78);
-    list_display_values(head);
-    head = list_insert(head, 2, 7);
-    list_display_values(head);
-    head = list_delete(head, 3);
+
+    printf("Longueur de la liste: %d\n", list_count(head1));
+    head1 = list_append(head1, 1);
+    head1 = list_append(head1, 2);
+    head1 = list_append(head1, 3);
+    head1 = list_append(head1, 4);
+    printf("Longueur de la liste: %d\n", list_count(head1));
+    list_display_values(head1);
+    head1 = list_prepend(head1, 5);
+    printf("Longueur de la liste: %d\n", list_count(head1));
+    list_display_values(head1);
+    list_set(head1, 0, 78);
+    list_display_values(head1);
+    head1 = list_insert(head1, 2, 7);
+    list_display_values(head1);
+    head1 = list_delete(head1, 3);
+    list_display_values(head1);
+    head1 = list_append(head1, 5);
+    head1 = list_append(head1, 12);
+    head1 = list_append(head1, 65);
+    head1 = list_append(head1, 21);
+    head1 = list_sort(head1);
+    list_display_values(head1);
+    head2 = list_insert(head2, 0, 8);
+    head2 = list_append(head2, 6);
+    head2 = list_prepend(head2, 5);
+    list_display_values(head2);
+    head = list_concat(head1, head2);
     list_display_values(head);
-    head = list_append(head, 5);
-    head = list_append(head, 12);
-    head = list_append(head, 65);
-    head = list_append(head, 21);
-    head = list_sort(head);
+    head = list_merge_sort(head);
+    //head = list_sort(head);
     list_display_values(head);
+    //list_clear(head1);
+    //list_clear(head2);
     list_clear(head);
 
     return 0;