.vscode/settings.json

+{
+    "files.associations": {
+        "stdio.h": "c"
+    }
+}
\ No newline at end of file

README.md

@@ -4,6 +4,8 @@
 [Grille d'évaluation P4z](https://docs.google.com/spreadsheets/d/1VXeO91rhy04xa0p8KUhWliFl228utHaDir8MstO5Z-M/edit?usp=sharing
 )
 
+![plot](/TP2/testInsertion.png)
+
 ## Problème
 
 Description du Problème.

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 = listeAlea(100,300);
+  affichertab(triIns,100);
+  triInsertion(triIns,100);
+  affichertab(triIns,100);
+
+  printf("Tri Rapide: \n");
+  long* triRap = listeAlea(100,300);
+  affichertab(triRap,100);
+  triRapide(triRap, 100);
+  affichertab(triRap,100);
+
+  printf("Tri Fusion: \n");
+  long* triFus = listeAlea(100,300);
+  affichertab(triFus,100);
+  triFusion(triFus, 100);
+  affichertab(triFus,100);
+
+  return 0;
+}

TP1/tridec.c

+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "tris.h"
+
+void triInsertionDec(long* A, size_t n) {
+    for(size_t i = 1; i <= n-1; i++){
+        long cle = A[i];
+        size_t j = i - 1;
+        size_t ecriture=0;
+        while(j+1 >= j && A[j] > cle){
+            ecriture++;
+            A[j+1] = A[j];
+            j = j-1;
+        }
+        ecriture++;
+        A[j+1] = cle;
+    }
+}
+
+void triFusionDec(long* A, size_t size) {
+  sousTriFusionDec(A, 0, size);
+}
+
+void sousTriFusionDec(long* A, size_t first, size_t size) {
+    if(first+1 <size){ // p < r - 1
+        size_t middle = floor((first+size)/2);
+        sousTriFusionDec(A, first, middle);
+        sousTriFusionDec(A, middle, size);
+        fusionDec(A, first, middle, size);
+    }
+}
+
+void copySousTableDec(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 fusionDec(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);
+
+    copySousTableDec(A, ag, first, n1);
+    copySousTableDec(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 triRapideDec(long* A, size_t n) {
+    sousTriRapideDec(A,0,n);
+}
+
+void sousTriRapideDec(long* A, size_t first, size_t size){
+    if(first+1 < size){
+        size_t middle = partitionDec(A,first,size);
+        sousTriRapideDec(A,first,middle);
+        sousTriRapideDec(A,middle+1,size);
+    }
+}
+
+size_t partitionDec(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){
+            permuterDec(A,i,j);
+            i++;
+        }
+    }
+    permuterDec(A,i,size-1);
+    return i;
+}
+
+void permuterDec(long* A,size_t i,size_t j) {
+    long inter = A[i];
+    A[i] = A[j];
+    A[j] = inter;
+}

TP1/tridec.h

+#ifndef TRIS_H
+#define TRIS_H
+#include <stdint.h>
+#include <stdlib.h>
+
+void triInsertionDec(long* A, size_t n);
+
+void triFusionDec(long* A, size_t size);
+void sousTriFusionDec(long* A, size_t first, size_t size);
+void fusionDec(long* A, size_t first, size_t middle, size_t size);
+
+void triRapideDec(long* A, size_t n);
+void sousTriRapideDec(long* A, size_t first, size_t size);
+size_t partitionDec(long* A, size_t first, size_t size);
+void permuterDec(long* A,size_t i,size_t j);
+
+#endif //TRIS_H
\ No newline at end of file

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

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

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]);
+}
+
+long* listeAlea(size_t longeur, size_t N){
+    long liste[longeur];
+    for(size_t i = 0; i < longeur; i++){
+        liste[i] = rand() % N; 
+    }
+    return liste;  
+} 
\ No newline at end of file

TP1/utils.h

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

TP2/.gitignore

+*.o
+main

TP2/Makefile

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

TP2/main.c

+#include <stdio.h>
+#include <stdlib.h>
+#include "tri_insertion.h"
+#include "tri_rapide.h"
+#include "tri_fusion.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':
+      triInsertion(tab,taille);
+
+      if(afficher) {
+        printf("Tri Insertion: \n");
+        affichertab(tab,taille);
+      }
+
+      break;
+
+    case 'r':
+      triRapide(tab, taille);
+
+      if(afficher) {
+        printf("Tri Rapide: \n");
+        affichertab(tab,taille);
+      }
+
+      break;
+
+    case 'f':
+      triFusion(tab, taille);
+
+      if(afficher) {
+        printf("Tri Fusion: \n");
+        affichertab(tab,taille);
+      }
+      break;
+  }
+
+  return 0;
+}

TP2/test.R

+library(ggplot2)
+perf <- read.table("test.dat", header = TRUE)
+ggplot(perf, aes(x=taille, y=temps, group=algo, colour=as.character(algo))) +
+geom_point() + geom_smooth() +
+ ggtitle("Graphe Tri insertion")
+
+ggsave("testInsertion.png")

TP2/test.dat

+iTest	taille	temps	mem	algo
+1	29547	0.50	1536	i
+1	29547	0.05	1500	r
+1	29547	0.00	1616	f
+2	95952	5.42	2024	i
+2	95952	0.52	2044	r
+2	95952	0.02	2496	f
+3	76455	3.37	1820	i
+3	76455	0.33	1928	r
+3	76455	0.02	2448	f
+4	18234	0.20	1308	i
+4	18234	0.02	1440	r
+4	18234	0.00	1588	f
+5	63457	2.34	1748	i
+5	63457	0.23	1820	r
+5	63457	0.00	2148	f
+6	64394	2.41	1808	i
+6	64394	0.24	1820	r
+6	64394	0.00	2072	f
+7	62040	2.24	1736	i
+7	62040	0.22	1816	r
+7	62040	0.01	1984	f
+8	29203	0.50	1512	i
+8	29203	0.05	1552	r
+8	29203	0.00	1604	f
+9	17117	0.17	1324	i
+9	17117	0.02	1292	r
+9	17117	0.00	1512	f
+10	47762	1.34	1616	i
+10	47762	0.13	1684	r
+10	47762	0.00	2024	f

TP2/test.sh

+#!/bin/bash
+
+affichage=0
+#taille=100
+
+echo -e "iTest\ttaille\ttemps\tmem\talgo"
+
+for iTest in `seq 1 10`
+do
+  taille=$(( `od -An -N4 -tu < /dev/urandom` % 100000))
+
+  for algo in 'i' 'r' 'f'
+  do
+
+    res=`( /usr/bin/time -f "%U\t%M" ./main $algo $taille $affichage > /dev/null ) 2>&1`
+    echo -e "$iTest\t$taille\t$res\t$algo"
+  done
+done