Merged

TP1/Makefile

 all: main
 	
-main : tris.o main.c
-	gcc -o main -Wall tris.o -g main.c
+main : tris.o utils.o main.c
+	gcc -o main -Wall utils.o tris.o -g main.c
 
 tris.o : tris.c tris.h
 	gcc -c -Wall -g tris.c
 
+utils.o : utils.c utils.h
+	gcc -o utils.o -c -g utils.c
 clean :
 	rm *.o

TP1/main.c

 #include <stdio.h>
+#include <stdlib.h>
 #include "tris.h"
+#include "utils.h"
+
 
 int main() {
-  long A[5] = {3, 4, 1, 6, -1};
+  int T1[5] ={3,2,5,1,4} ;
+
+  int T2[8] ={3,2,8,4,1,6,7,5} ;
+
+  affichertab(T1,5);
+  printf("\n");
 
-  triFusion(A, 5);
+  triInsertion(T1,5);
 
-  for(int i = 0; i < 5; ++i) {
-    printf("%i\n", A[i]);
-  }
+  affichertab(T1,5);
 
   return 0;
 }

TP1/tris.c

@@ -3,17 +3,17 @@
 #include <stdio.h>
 #include "tris.h"
 
-/*triInsertion(A,n){
-    for(size_t i = 1; i <= n-1; i++){
-        clef = A[i];
-        j = i - 1;
-        while(j >= 0 && A[j] > clé){
+void triInsertion(int* A, int n) {
+    for(int i = 1; i <= n-1; i++){
+        int cle = A[i];
+        int j = i - 1;
+        while(j >= 0 && A[j] > cle){
             A[j+1] = A[j];
             j--;
         }
-        A[j+1] = clef;
+        A[j+1] = cle;
     }
-}*/
+}
 
 void triFusion(long* A, size_t size) {
   sousTriFusion(A, 0, size);

TP1/tris.h

 #ifndef TRIS_H
 #define TRIS_H
 
+void triInsertion(int* A, int n);
+
 void triFusion(long* A, size_t size);
 void sousTriFusion(long* A, size_t first, size_t size);
 void fusion(long* A, size_t first, size_t middle, size_t size);

TP1/utils.c

+#include <stdio.h>
+#include <stdlib.h>
+#include "utils.h" 
+
+void affichertab(int* T, int s){
+    for(int i = 0; i < s; i++){
+        printf("%d \n",T[i]);
+    } 
+} 
\ No newline at end of file

TP1/utils.h

+#include <stdio.h>
+#include <stdlib.h>
+
+void affichertab(int* T, int s);
\ No newline at end of file