diff --git a/TP2/Rplots.pdf b/TP2/Rplots.pdf index 3422ff292269a3b2e6011f97b33fe8069bb9fc03..c997f9a923ef15280b2b1a8c9387cbb53bcf1b3a 100644 Binary files a/TP2/Rplots.pdf and b/TP2/Rplots.pdf differ diff --git a/TP2/fusion.R b/TP2/fusion.R new file mode 100755 index 0000000000000000000000000000000000000000..b64e5b999066f2b30b92b715ac3a4b8cb362e1d4 --- /dev/null +++ b/TP2/fusion.R @@ -0,0 +1,7 @@ +library(ggplot2) +perf <- read.table("fusion.dat", header = TRUE) +ggplot(perf, aes(x=taille, y=temps, group=typeTableau, colour=as.character(algo))) + facet_grid(algo ~ typeTableau) + +geom_point() + geom_smooth() + + ggtitle("Graphes Comparaison Algos") + +ggsave("graphe.png") diff --git a/TP2/fusion.dat b/TP2/fusion.dat new file mode 100755 index 0000000000000000000000000000000000000000..74a6b54647f1c86eeab5732e2bb8e854514ae4f5 --- /dev/null +++ b/TP2/fusion.dat @@ -0,0 +1,81 @@ +iTest taille temps mem algo typeTableau +1 1000000 0.27 16912 f a +1 1030000 0.28 17412 f a +1 1000000 0.18 16708 f r +1 1030000 0.22 17408 f r +1 1000000 0.22 16896 f i +1 1030000 0.21 17316 f i +1 1000000 0.20 16920 f c +1 1030000 0.20 17332 f c +2 1000000 0.29 16720 f a +2 1030000 0.29 17332 f a +2 1000000 0.21 16896 f r +2 1030000 0.20 17324 f r +2 1000000 0.20 16896 f i +2 1030000 0.22 17412 f i +2 1000000 0.19 16896 f c +2 1030000 0.20 17484 f c +3 1000000 0.29 16624 f a +3 1030000 0.30 17324 f a +3 1000000 0.20 16912 f r +3 1030000 0.21 17368 f r +3 1000000 0.21 16832 f i +3 1030000 0.21 17356 f i +3 1000000 0.19 16912 f c +3 1030000 0.21 17344 f c +4 1000000 0.27 16868 f a +4 1030000 0.28 17400 f a +4 1000000 0.19 16816 f r +4 1030000 0.20 17400 f r +4 1000000 0.20 16916 f i +4 1030000 0.22 17364 f i +4 1000000 0.21 16904 f c +4 1030000 0.21 17364 f c +5 1000000 0.29 16724 f a +5 1030000 0.27 17484 f a +5 1000000 0.19 16656 f r +5 1030000 0.21 17404 f r +5 1000000 0.20 16848 f i +5 1030000 0.20 17364 f i +5 1000000 0.21 16904 f c +5 1030000 0.21 17484 f c +6 1000000 0.28 16848 f a +6 1030000 0.28 17400 f a +6 1000000 0.23 16868 f r +6 1030000 0.22 17348 f r +6 1000000 0.20 16920 f i +6 1030000 0.24 17392 f i +6 1000000 0.21 16896 f c +6 1030000 0.23 17312 f c +7 1000000 0.30 16796 f a +7 1030000 0.30 17324 f a +7 1000000 0.20 16668 f r +7 1030000 0.20 17224 f r +7 1000000 0.20 16904 f i +7 1030000 0.22 17396 f i +7 1000000 0.20 16904 f c +7 1030000 0.22 17360 f c +8 1000000 0.27 16920 f a +8 1030000 0.30 17364 f a +8 1000000 0.19 16920 f r +8 1030000 0.23 17404 f r +8 1000000 0.23 16628 f i +8 1030000 0.23 17368 f i +8 1000000 0.22 16664 f c +8 1030000 0.21 17404 f c +9 1000000 0.30 16984 f a +9 1030000 0.29 17404 f a +9 1000000 0.22 16864 f r +9 1030000 0.21 17412 f r +9 1000000 0.20 16904 f i +9 1030000 0.22 17356 f i +9 1000000 0.20 16824 f c +9 1030000 0.21 17404 f c +10 1000000 0.27 16796 f a +10 1030000 0.28 17400 f a +10 1000000 0.22 16824 f r +10 1030000 0.21 17416 f r +10 1000000 0.21 16824 f i +10 1030000 0.21 17404 f i +10 1000000 0.21 16604 f c +10 1030000 0.22 17480 f c diff --git a/TP2/fusion.sh b/TP2/fusion.sh new file mode 100755 index 0000000000000000000000000000000000000000..3e08a330c1da7a431767ce4c1e8f4abdbc06e445 --- /dev/null +++ b/TP2/fusion.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +affichage=0 +#taille=100 + +echo -e "iTest\ttaille\ttemps\tmem\talgo\ttypeTableau" + +for iTest in `seq 1 10` +do + #taille=$(( `od -An -N4 -tu < /dev/urandom` % 1000000)) + #taille=1000000 + + for algo in 'f' + do + + for typeTableau in 'a' 'r' 'i' 'c' + do + for taille in 1000000 1030000 + do + res=`( /usr/bin/time -f "%U\t%M" ./main $algo $taille $typeTableau $affichage > /dev/null ) 2>&1` + echo -e "$iTest\t$taille\t$res\t$algo\t$typeTableau" + done + done + done +done diff --git a/TP2/graphe.png b/TP2/graphe.png index 96da04403435fea03749d82e9f2e3ba51a7509a0..d2e56eca525783e15b9cb3506cd61d27ed86f412 100644 Binary files a/TP2/graphe.png and b/TP2/graphe.png differ