Transformed main

TP2/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

TP2/main.c

+#include <stdio.h>
+#include <stdlib.h>
+#include "tris.h"
+#include "utils.h"
+
+int main(int argc, char *argv[]) {
+  if(argc != 4) {
+    printf("Usage: %s [typeAlgo] [taille] [isAfficher]\n", argv[0]);
+    exit(1);
+  }
+
+  char typeAlgo = argv[1][0];
+  long taille = (long) atoi(argv[2]);
+  long MAX = 50;
+  long tab[taille];
+  size_t afficher = (size_t) atoi(argv[3]);
+
+  genTab(tab, taille, MAX);
+
+  switch(typeAlgo) {
+    case 'i':
+      printf("Tri Insertion: \n");
+      triInsertion(tab,taille);
+
+      if(afficher)
+        affichertab(tab,taille);
+      break;
+
+    case 'r':
+      printf("Tri Rapide: \n");
+      triRapide(tab, taille);
+
+      if(afficher)
+        affichertab(tab,taille);
+      break;
+
+    case 'f':
+      printf("Tri Fusion: \n");
+      triFusion(tab, taille);
+
+      if(afficher)
+        affichertab(tab,taille);
+      break;
+  }
+
+  return 0;
+}

TP2/test.sh

+#!/bin/bash
+
+algo = "insertion"
+taille = 10000
+
+for iTest in 'seq 1 100'
+do
+    res = (/usr/bin/time -f "%U\t%M" ./main $algo $taille)
+    echo -e "$iTest\t$taille\t$res"
+done

TP2/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);
+}
+
+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;
+}

TP2/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

TP2/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]);
+}
+
+void genTab(long* T, long taille, long MAX) {
+  // Generer le tableau
+  for(long i = 0; i < taille; ++i) {
+    T[i] = rand() % MAX;
+  }
+}

TP2/utils.h

+#include <stdio.h>
+#include <stdlib.h>
+
+void affichertab(long* T, int s);
+void genTab(long* T, long taille, long MAX);