Skip to content
Snippets Groups Projects
Commit 844a1820 authored by Mickael Da Silva's avatar Mickael Da Silva
Browse files

perf.sh + premier vrai plot

parent a153225b
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Algos_1/Images/graphe.png deleted 100644 → 0
+ 0
− 0
View file @ a153225b
Algos_1/Images/graphe.png

63.6 KiB

Algos_1/Images/graphe_temps.png 0 → 100644
+ 0
− 0
View file @ 844a1820
Algos_1/Images/graphe_temps.png

102 KiB

Algos_1/Lib/main.c
+ 41
− 41
View file @ 844a1820
...@@ -16,18 +16,18 @@ int main(int argc, char **argv){ ...@@ -16,18 +16,18 @@ int main(int argc, char **argv){
if((strcmp(argv[1], "--insertion") == 0) || strcmp(argv[1], "-i")== 0){ if((strcmp(argv[1], "--insertion") == 0) || strcmp(argv[1], "-i")== 0){
int n= 0; int n= 0;
long *tab = readToTab(argv[2], &n); long *tab = readToTab(argv[2], &n);
printf("n:%d\n", n); // printf("n:%d\n", n);
printf("Base : "); // printf("Base : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld-", tab[i]); // printf("%ld-", tab[i]);
} // }
printf("\n"); // printf("\n");
triInsertion(tab, n); triInsertion(tab, n);
printf("Insertion : "); // printf("Insertion : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld-", tab[i]); // printf("%ld-", tab[i]);
} // }
printf("\n"); // printf("\n");
free(tab); free(tab);
} }
else if(strcmp(argv[1], "--fusion")== 0 || strcmp(argv[1], "-f")== 0){ else if(strcmp(argv[1], "--fusion")== 0 || strcmp(argv[1], "-f")== 0){
...@@ -35,49 +35,49 @@ int main(int argc, char **argv){ ...@@ -35,49 +35,49 @@ int main(int argc, char **argv){
long *tab = readToTab(argv[2], &n); long *tab = readToTab(argv[2], &n);
printf("Base : "); // printf("Base : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld,", tab[i]); // printf("%ld,", tab[i]);
} // }
printf("\n"); // printf("\n");
triFusion(tab, n); triFusion(tab, n);
printf("Fusion : "); // printf("Fusion : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld,", tab[i]); // printf("%ld,", tab[i]);
} // }
printf("\n"); // printf("\n");
free(tab); free(tab);
} }
else if((strcmp(argv[1], "--rapide")== 0) || strcmp(argv[1], "-r")== 0){ else if((strcmp(argv[1], "--rapide")== 0) || strcmp(argv[1], "-r")== 0){
int n= 0; int n= 0;
long *tab = readToTab(argv[2], &n); long *tab = readToTab(argv[2], &n);
printf("Base : "); // printf("Base : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld,", tab[i]); // printf("%ld,", tab[i]);
} // }
printf("\n"); // printf("\n");
triRapide(tab, n); triRapide(tab, n);
printf("Rapide : "); // printf("Rapide : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld,", tab[i]); // printf("%ld,", tab[i]);
} // }
printf("\n"); // printf("\n");
free(tab); free(tab);
} }
else if((strcmp(argv[1], "--bulle")== 0) || strcmp(argv[1], "-b")== 0){ else if((strcmp(argv[1], "--bulle")== 0) || strcmp(argv[1], "-b")== 0){
int n= 0; int n= 0;
long *tab = readToTab(argv[2], &n); long *tab = readToTab(argv[2], &n);
printf("Base : "); // printf("Base : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld,", tab[i]); // printf("%ld,", tab[i]);
} // }
printf("\n"); // printf("\n");
triBulle(tab, n); triBulle(tab, n);
printf("Bulle : "); // printf("Bulle : ");
for(int i = 0; i<n; i++){ // for(int i = 0; i<n; i++){
printf("%ld,", tab[i]); // printf("%ld,", tab[i]);
} // }
printf("\n"); // printf("\n");
free(tab); free(tab);
} }
else if (strcmp(argv[1], "-a") == 0) else if (strcmp(argv[1], "-a") == 0)
......
Algos_1/Scripts/perf.sh
+ 7
− 8
View file @ 844a1820
...@@ -2,17 +2,16 @@ ...@@ -2,17 +2,16 @@
echo -e "iTest\ttaille\ttri\ttemps\tmem" echo -e "iTest\ttaille\ttri\ttemps\tmem"
for iTest in `seq 1 2` for iTest in `seq 1 3`
do do
size=$(( `od -An -N4 -tu < /dev/urandom` % 100000)) size=$(( `od -An -N4 -tu < /dev/urandom` % 100000))
max=$(( `od -An -N4 -tu < /dev/urandom` % 1000)) max=$(( `od -An -N4 -tu < /dev/urandom` % 100000))
pwd
../tri -g $max $size 1>../tabs/perf_tab.txt ../tri -g $max $size 1 >../tabs/perf_tab.txt
#cat tabs/perf_tab.txt for tri in "insertion" "fusion" "rapide" "bulle"
for tri in "insertion" "rapide"
do do
res=$( time ../tri --$tri ../tabs/perf_tab.txt 1>/dev/null) res=`( time -f "%U\t%M" ../tri --$tri ../tabs/perf_tab.txt > /dev/null ) 2>&1`
echo -e "$iTest\t$taille\t$tri\t$res" echo -e "$iTest\t$size\t$tri\t$res"
done done
rm ../tabs/perf_tab.txt rm ../tabs/perf_tab.txt
done done
\ No newline at end of file
Algos_1/Scripts/perf_bis.sh
+ 9
− 10
View file @ 844a1820
#!/bin/bash #!/bin/bash
echo -e "iTest\ttaille\ttri\ttemps\tmem" echo "iTest\ttaille\ttri\ttemps\tmem"
for iTest in `seq 1 2` for iTest in `seq 1 3`
do do
size=$(( `od -An -N4 -tu < /dev/urandom` % 100000000)) size=$(( `od -An -N4 -tu < /dev/urandom` % 100000))
max=$(( `od -An -N4 -tu < /dev/urandom` % 1000)) max=$(( `od -An -N4 -tu < /dev/urandom` % 100000))
./tri -g $max $size 1>tabs/perf_tab.txt ../tri -g $max $size 1 >../tabs/perf_tab.txt
#cat tabs/perf_tab.txt for tri in "insertion" "fusion" "rapide" "bulle"
for tri in "fusion" "insertion" "rapide"
do do
res=$($(time ./tri --$tri tabs/perf_tab.txt 1>/dev/null ) 2>&1) res=`( /usr/bin/time -f "%U\t%M" ../tri --$tri ../tabs/perf_tab.txt > /dev/null ) 2>&1`
echo -e "$iTest\t$taille\t$tri\t$res" echo "$iTest\t$size\t$tri\t$res"
done done
rm tabs/perf_tab.txt rm ../tabs/perf_tab.txt
done done
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment