TP1/Makefile

+all: main
+	
+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() {
+  printf("Tri Insertion: \n");
+  long triIns[8] ={3,2,8,4,1,6,7,5};
+  affichertab(triIns,8);
+  triInsertion(triIns,8);
+  affichertab(triIns,8);
+
+  printf("Tri Rapide: \n");
+  long triRap[8] ={3,2,8,4,1,6,7,5};
+  affichertab(triRap,8);
+  triRapide(triRap, 8);
+  affichertab(triRap,8);
+
+  printf("Tri Fusion: \n");
+  long triFus[8] ={3,2,8,4,1,6,7,5};
+  affichertab(triFus,8);
+  triFusion(triFus, 8);
+  affichertab(triFus,8);
+
+  return 0;
+}

TP1/tris.c

+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "tris.h"
+
+void triInsertion(long* A, size_t n) {
+    for(size_t i = 1; i <= n-1; i++){
+        long cle = A[i];
+        size_t j = i - 1;
+        while(j+1 >= j && A[j] > cle){
+            A[j+1] = A[j];
+            j = j-1;
+        }
+        A[j+1] = cle;
+    }
+}
+
+void triFusion(long* A, size_t size) {
+  sousTriFusion(A, 0, size);
+}
+
+void sousTriFusion(long* A, size_t first, size_t size) {
+    if(first+1 <size){ // p < r - 1
+        size_t middle = floor((first+size)/2);
+        sousTriFusion(A, first, middle);
+        sousTriFusion(A, middle, size);
+        fusion(A, first, middle, size);
+    }
+}
+
+void copySousTable(long* mainT, long* underT, size_t id, size_t size) {
+  for(size_t i = id; i < id+size; ++i) {
+    underT[i-id] = mainT[i];
+  }
+}
+
+void fusion(long* A, size_t first, size_t middle, size_t size) {
+    size_t n1 = middle - first; // Nb elem dans A[p , q]  q exclu
+    size_t n2 = size - middle;  // Nb elem dans A[q , r]  r exclu
+
+    size_t indg = 0;
+    size_t indd = 0;
+
+    long* ag = malloc(sizeof(long) * n1);
+    long* ad = malloc(sizeof(long) * n2);
+
+    copySousTable(A, ag, first, n1);
+    copySousTable(A, ad, middle, n2);
+
+    int i = first;
+
+    while(i < size) {
+      if(indg == n1) {
+        A[i] = ad[indd];
+        indd++;
+      }
+      else if(indd == n2) {
+        A[i] = ag[indg];
+        indg++;
+      }
+      else if(ag[indg] < ad[indd]) {
+        A[i] = ag[indg];
+        indg++;
+      }
+      else {
+        A[i] = ad[indd];
+        indd++;
+      }
+      ++i;
+    }
+
+    free(ag);
+    free(ad);
+}
+
+<<<<<<< HEAD
+void triRapide(long* A, size_t n){
+    soustriRapide(A,0,n-1);
+} 
+
+void soustriRapide( long* A, size_t p, size_t r){
+    if(p<r-1){
+        size_t q = partition(A,p,r);
+        soustriRapide(A,p,q-1);
+        soustriRapide(A,q+1,r);
+    } 
+}
+
+size_t partition(long* A, size_t p, size_t r){
+    long pivot = A[r-1];
+    size_t i = p;
+    for(int j = p; j <= r-2; j++){
+        if(A[j] <= pivot){
+            permuter(A,i,j);
+            i++;
+        } 
+    }
+    permuter(A,i,r-1);
+    return i;  
+}
+
+void permuter(long* A,size_t i,size_t j){
+    long inter = A[i];
+    A[i] = A[j];
+    A[j] = inter;   
+} 
+
+// voila le début de tri rapide si j'ai pas le temp de le finir 
+// ni de le testé 
+ 
+=======
+void triRapide(long* A, size_t n) {
+    sousTriRapide(A,0,n);
+}
+
+void sousTriRapide(long* A, size_t first, size_t size){
+    if(first+1 < size){
+        size_t middle = partition(A,first,size);
+        sousTriRapide(A,first,middle);
+        sousTriRapide(A,middle+1,size);
+    }
+}
+
+size_t partition(long* A, size_t first, size_t size) {
+    long pivot = A[size-1];
+    size_t i = first;
+    for(int j = first; j+2 <= size; j++){
+        if(A[j] <= pivot){
+            permuter(A,i,j);
+            i++;
+        }
+    }
+    permuter(A,i,size-1);
+    return i;
+}
+
+void permuter(long* A,size_t i,size_t j) {
+    long inter = A[i];
+    A[i] = A[j];
+    A[j] = inter;
+}
+>>>>>>> f61484c65f74d3b49ca5a7a457807526ac75448b

TP1/tris.h

+<<<<<<< HEAD
+#ifndef TRIS_H
+#define TRIS_H
+#include <stdint.h>
+#include <stdlib.h>
+
+void triInsertion(long* A, size_t 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);
+
+void soustriRapide( long* A, size_t p, size_t r);
+
+#endif //TRIS_H
+=======
+#ifndef TRIS_H
+#define TRIS_H
+#include <stdint.h>
+#include <stdlib.h>
+
+void triInsertion(long* A, size_t 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);
+
+void triRapide(long* A, size_t n);
+void sousTriRapide(long* A, size_t first, size_t size);
+size_t partition(long* A, size_t first, size_t size);
+void permuter(long* A,size_t i,size_t j);
+
+#endif //TRIS_H
+>>>>>>> f61484c65f74d3b49ca5a7a457807526ac75448b

TP1/utils.c

+#include <stdio.h>
+#include <stdlib.h>
+#include "utils.h"
+
+void affichertab(long* T, int s){
+    printf("[ ");
+    for(int i = 0; i < s-1; i++){
+        printf("%d , ",T[i]);
+    }
+    printf("%d ]\n",T[s-1]);
+}

TP1/utils.h

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