diff --git a/TP2/Rplots.pdf b/TP2/Rplots.pdf index efaf63a1895b8b5623783c397cda2bc0d509118b..3422ff292269a3b2e6011f97b33fe8069bb9fc03 100644 Binary files a/TP2/Rplots.pdf and b/TP2/Rplots.pdf differ diff --git a/TP2/test.R b/TP2/test.R index 0fd0cc4c56944d4043d735fd0991ac84f86da60c..b8d6829d8392db50650e689ca4d17e1f2c2021af 100644 --- a/TP2/test.R +++ b/TP2/test.R @@ -1,6 +1,6 @@ library(ggplot2) perf <- read.table("test.dat", header = TRUE) -ggplot(perf, aes(x=taille, y=temps)) + +ggplot(perf, aes(x=taille, y=temps, group=algo, colour=as.character(algo))) + geom_point() + geom_smooth() + ggtitle("Graphe Tri insertion") diff --git a/TP2/test.dat b/TP2/test.dat index 4c62768fe7020a880f18e67e0f584ea146ea7327..63440b3c6a5f599859798ddd5b5050db1dda4591 100644 --- a/TP2/test.dat +++ b/TP2/test.dat @@ -1,11 +1,31 @@ -iTest taille temps mem -1 55732 1.88 1712 -2 27314 0.45 1404 -3 87676 4.60 1992 -4 75537 3.49 1784 -5 34190 0.72 1576 -6 4798 0.01 1284 -7 38426 0.90 1584 -8 62769 2.38 1680 -9 75789 3.42 1844 -10 45402 1.23 1608 +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 diff --git a/TP2/test.sh b/TP2/test.sh index 0422f48fce4eb9ade9c9facad3afaa16445b5613..6cd82a0cfe6e64c4f5c972a1e58c410c701228e4 100644 --- a/TP2/test.sh +++ b/TP2/test.sh @@ -1,14 +1,18 @@ #!/bin/bash -algo="insertion" affichage=0 #taille=100 -echo -e "iTest\ttaille\ttemps\tmem" +echo -e "iTest\ttaille\ttemps\tmem\talgo" for iTest in `seq 1 10` do - taille=$(( `od -An -N4 -tu < /dev/urandom` % 100000)) + 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" + echo -e "$iTest\t$taille\t$res\t$algo" + done done diff --git a/TP2/testInsertion.png b/TP2/testInsertion.png index 647bb543964adf530a72fd75ca4b6537c48e772d..0cc1c6f308f8e36e7b6e8cf5a17e23e77cbeaeca 100644 Binary files a/TP2/testInsertion.png and b/TP2/testInsertion.png differ