Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 906 additions and 0 deletions
TP1/tridec.c 0 → 100644
View file @ 196b8ec5
#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 0 → 100644
View file @ 196b8ec5
#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 0 → 100644
View file @ 196b8ec5
#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 0 → 100644
View file @ 196b8ec5
#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/tris.o 0 → 100644
View file @ 196b8ec5
File added
TP1/utils.c 0 → 100644
View file @ 196b8ec5
#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 0 → 100644
View file @ 196b8ec5
#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
TP1/utils.o 0 → 100644
View file @ 196b8ec5
File added
TP2/.gitignore 0 → 100644
View file @ 196b8ec5
*.o
main
TP2/Makefile 0 → 100644
View file @ 196b8ec5
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/Rplots.pdf 0 → 100644
View file @ 196b8ec5
File added
TP2/main.c 0 → 100644
View file @ 196b8ec5
#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 != 6) {
printf("Usage: %s [typeAlgo] [taille] [typeTableau] [isAfficher] [versionRap]\n", argv[0]);
exit(1);
}
char typeAlgo = argv[1][0];
long taille = (long) atoi(argv[2]);
long MAX = 50;
long *tab = malloc(sizeof(long) * taille);
char typeTable = argv[3][0];
size_t afficher = (size_t) atoi(argv[4]);
int versionRap = (size_t) atoi(argv[5]);
genTab(tab, taille, typeTable, MAX);
switch(typeAlgo) {
case 'i':
triInsertion(tab,taille);
if(afficher) {
printf("Tri Insertion: \n");
affichertab(tab,taille);
}
break;
case 'r':
triRapide(tab, taille, versionRap);
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;
}
free(tab);
return 0;
}
TP2/testGeneral.R 0 → 100755
View file @ 196b8ec5
library(ggplot2)
perf <- read.table("testGeneral.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("Test General des Algos")
ggsave("testGeneral.png")
TP2/testGeneral.dat 0 → 100644
View file @ 196b8ec5
iTest taille temps mem algo typeTableau
1 30000 0.07 1344 r a
1 40000 0.12 1288 r a
1 50000 0.18 1348 r a
1 60000 0.25 1608 r a
1 70000 0.34 1580 r a
1 80000 0.44 1568 r a
1 90000 0.55 1816 r a
1 30000 3.06 3196 r c
1 40000 5.38 3756 r c
1 50000 8.54 4508 r c
1 60000 12.08 5360 r c
1 70000 16.53 5956 r c
1 80000 21.54 6624 r c
1 90000 27.19 7452 r c
1 30000 3.01 3248 r r
1 40000 5.43 3804 r r
1 50000 8.42 4516 r r
1 60000 12.37 5196 r r
1 70000 16.43 5888 r r
1 80000 21.55 6744 r r
1 90000 27.14 7452 r r
1 30000 2.14 3164 r i
1 40000 3.77 3748 r i
1 50000 5.95 4512 r i
1 60000 8.48 5348 r i
1 70000 11.53 5876 r i
1 80000 15.09 6588 r i
1 90000 19.09 7536 r i
1 30000 0.62 1336 i a
1 40000 1.10 1396 i a
1 50000 1.69 1352 i a
1 60000 2.44 1664 i a
1 70000 3.33 1612 i a
1 80000 4.35 1728 i a
1 90000 5.48 1576 i a
1 30000 0.00 1312 i c
1 40000 0.00 1464 i c
1 50000 0.00 1316 i c
1 60000 0.00 1308 i c
1 70000 0.00 1612 i c
1 80000 0.00 1616 i c
1 90000 0.00 1652 i c
1 30000 0.00 1336 i r
1 40000 0.00 1336 i r
1 50000 0.00 1380 i r
1 60000 0.00 1336 i r
1 70000 0.00 1568 i r
1 80000 0.00 1580 i r
1 90000 0.00 1660 i r
1 30000 1.24 1340 i i
1 40000 2.19 1288 i i
1 50000 3.46 1236 i i
1 60000 5.00 1728 i i
1 70000 6.78 1652 i i
1 80000 8.87 1644 i i
1 90000 11.18 1628 i i
1 30000 0.00 1652 f a
1 40000 0.01 1828 f a
1 50000 0.01 1920 f a
1 60000 0.02 2008 f a
1 70000 0.02 2336 f a
1 80000 0.02 2476 f a
1 90000 0.01 2556 f a
1 30000 0.01 1656 f c
1 40000 0.01 1812 f c
1 50000 0.01 1964 f c
1 60000 0.01 2124 f c
1 70000 0.01 2300 f c
1 80000 0.02 2376 f c
1 90000 0.01 2540 f c
1 30000 0.01 1468 f r
1 40000 0.01 1852 f r
1 50000 0.01 1908 f r
1 60000 0.01 2048 f r
1 70000 0.01 2336 f r
1 80000 0.02 2540 f r
1 90000 0.01 2464 f r
1 30000 0.00 1652 f i
1 40000 0.01 1892 f i
1 50000 0.00 1892 f i
1 60000 0.01 2036 f i
1 70000 0.02 2344 f i
1 80000 0.02 2424 f i
1 90000 0.01 2540 f i
2 30000 0.07 1352 r a
2 40000 0.11 1348 r a
2 50000 0.18 1380 r a
2 60000 0.25 1728 r a
2 70000 0.34 1660 r a
2 80000 0.44 1552 r a
2 90000 0.55 1844 r a
2 30000 3.04 3136 r c
2 40000 5.37 3748 r c
2 50000 8.47 4568 r c
2 60000 12.10 5312 r c
2 70000 16.48 5884 r c
2 80000 21.50 6668 r c
2 90000 27.21 7460 r c
2 30000 3.01 3164 r r
2 40000 5.37 3760 r r
2 50000 8.43 4520 r r
2 60000 12.03 5248 r r
2 70000 16.43 5804 r r
2 80000 21.43 6668 r r
2 90000 27.28 7536 r r
2 30000 2.12 3164 r i
2 40000 3.76 3884 r i
2 50000 5.90 4564 r i
2 60000 8.48 5308 r i
2 70000 11.55 5840 r i
2 80000 15.08 6676 r i
2 90000 19.10 7384 r i
2 30000 0.62 1344 i a
2 40000 1.09 1388 i a
2 50000 1.69 1400 i a
2 60000 2.47 1388 i a
2 70000 3.32 1600 i a
2 80000 4.33 1608 i a
2 90000 5.49 1728 i a
2 30000 0.00 1304 i c
2 40000 0.00 1336 i c
2 50000 0.00 1388 i c
2 60000 0.00 1728 i c
2 70000 0.00 1600 i c
2 80000 0.00 1664 i c
2 90000 0.00 1604 i c
2 30000 0.00 1348 i r
2 40000 0.00 1340 i r
2 50000 0.00 1312 i r
2 60000 0.00 1396 i r
2 70000 0.00 1608 i r
2 80000 0.00 1600 i r
2 90000 0.00 1652 i r
2 30000 1.24 1308 i i
2 40000 2.25 1400 i i
2 50000 3.47 1400 i i
2 60000 4.97 1396 i i
2 70000 6.77 1660 i i
2 80000 8.87 1576 i i
2 90000 11.19 1616 i i
2 30000 0.00 1612 f a
2 40000 0.01 1828 f a
2 50000 0.01 1956 f a
2 60000 0.02 1972 f a
2 70000 0.01 2388 f a
2 80000 0.02 2404 f a
2 90000 0.02 2468 f a
2 30000 0.00 1580 f c
2 40000 0.01 1884 f c
2 50000 0.01 2044 f c
2 60000 0.01 1964 f c
2 70000 0.01 2380 f c
2 80000 0.02 2472 f c
2 90000 0.02 2540 f c
2 30000 0.01 1656 f r
2 40000 0.01 1892 f r
2 50000 0.01 1980 f r
2 60000 0.01 1956 f r
2 70000 0.01 2388 f r
2 80000 0.01 2468 f r
2 90000 0.01 2540 f r
2 30000 0.01 1440 f i
2 40000 0.01 1840 f i
2 50000 0.00 1892 f i
2 60000 0.00 1964 f i
2 70000 0.01 2344 f i
2 80000 0.01 2388 f i
2 90000 0.02 2540 f i
3 30000 0.06 1380 r a
3 40000 0.11 1400 r a
3 50000 0.18 1464 r a
3 60000 0.25 1728 r a
3 70000 0.34 1660 r a
3 80000 0.44 1576 r a
3 90000 0.56 1876 r a
3 30000 3.03 3192 r c
3 40000 5.36 3884 r c
3 50000 8.42 4564 r c
3 60000 12.09 5424 r c
3 70000 16.39 5824 r c
3 80000 21.44 6616 r c
3 90000 27.03 7472 r c
3 30000 3.04 3244 r r
3 40000 5.34 3728 r r
3 50000 8.39 4560 r r
3 60000 12.06 5356 r r
3 70000 16.36 5724 r r
3 80000 21.41 6616 r r
3 90000 27.17 7420 r r
3 30000 2.14 3136 r i
3 40000 3.77 3728 r i
3 50000 5.88 4556 r i
3 60000 8.46 5312 r i
3 70000 11.58 5840 r i
3 80000 15.07 6616 r i
3 90000 19.12 7536 r i
3 30000 0.63 1380 i a
3 40000 1.09 1400 i a
3 50000 1.70 1464 i a
3 60000 2.45 1336 i a
3 70000 3.35 1568 i a
3 80000 4.36 1664 i a
3 90000 5.50 1728 i a
3 30000 0.00 1336 i c
3 40000 0.00 1304 i c
3 50000 0.00 1304 i c
3 60000 0.00 1380 i c
3 70000 0.00 1616 i c
3 80000 0.00 1612 i c
3 90000 0.00 1612 i c
3 30000 0.00 1348 i r
3 40000 0.00 1344 i r
3 50000 0.00 1464 i r
3 60000 0.00 1352 i r
3 70000 0.00 1656 i r
3 80000 0.00 1664 i r
3 90000 0.00 1608 i r
3 30000 1.25 1336 i i
3 40000 2.22 1308 i i
3 50000 3.44 1392 i i
3 60000 4.96 1396 i i
3 70000 6.75 1612 i i
3 80000 8.82 1612 i i
3 90000 11.21 1608 i i
3 30000 0.01 1664 f a
3 40000 0.01 1896 f a
3 50000 0.01 1964 f a
3 60000 0.02 2036 f a
3 70000 0.02 2324 f a
3 80000 0.02 2476 f a
3 90000 0.02 2540 f a
3 30000 0.00 1644 f c
3 40000 0.00 1964 f c
3 50000 0.00 2048 f c
3 60000 0.01 1964 f c
3 70000 0.01 2460 f c
3 80000 0.02 2476 f c
3 90000 0.02 2552 f c
3 30000 0.00 1472 f r
3 40000 0.01 1900 f r
3 50000 0.01 1908 f r
3 60000 0.01 2052 f r
3 70000 0.01 2340 f r
3 80000 0.01 2404 f r
3 90000 0.01 2500 f r
3 30000 0.01 1660 f i
3 40000 0.01 1876 f i
3 50000 0.01 1856 f i
3 60000 0.01 2004 f i
3 70000 0.01 2292 f i
3 80000 0.01 2404 f i
3 90000 0.02 2432 f i
4 30000 0.07 1464 r a
4 40000 0.12 1344 r a
4 50000 0.18 1292 r a
4 60000 0.24 1608 r a
4 70000 0.34 1584 r a
4 80000 0.44 1632 r a
4 90000 0.56 1840 r a
4 30000 3.00 3156 r c
4 40000 5.47 3884 r c
4 50000 8.53 4520 r c
4 60000 12.04 5356 r c
4 70000 16.33 5888 r c
4 80000 21.40 6676 r c
4 90000 27.08 7468 r c
4 30000 3.00 3244 r r
4 40000 5.36 3728 r r
4 50000 8.42 4564 r r
4 60000 12.00 5308 r r
4 70000 16.34 5836 r r
4 80000 21.44 6668 r r
4 90000 27.00 7460 r r
4 30000 2.12 3184 r i
4 40000 3.77 3888 r i
4 50000 5.89 4472 r i
4 60000 8.43 5360 r i
4 70000 11.56 5840 r i
4 80000 15.08 6596 r i
4 90000 19.02 7408 r i
4 30000 0.61 1316 i a
4 40000 1.08 1388 i a
4 50000 1.69 1392 i a
4 60000 2.44 1340 i a
4 70000 3.30 1580 i a
4 80000 4.33 1580 i a
4 90000 5.46 1664 i a
4 30000 0.00 1400 i c
4 40000 0.00 1352 i c
4 50000 0.00 1396 i c
4 60000 0.00 1392 i c
4 70000 0.00 1664 i c
4 80000 0.00 1660 i c
4 90000 0.00 1608 i c
4 30000 0.00 1344 i r
4 40000 0.00 1320 i r
4 50000 0.00 1352 i r
4 60000 0.00 1396 i r
4 70000 0.00 1568 i r
4 80000 0.00 1608 i r
4 90000 0.00 1612 i r
4 30000 1.24 1396 i i
4 40000 2.22 1396 i i
4 50000 3.45 1316 i i
4 60000 4.95 1728 i i
4 70000 6.73 1576 i i
4 80000 8.80 1644 i i
4 90000 11.14 1600 i i
4 30000 0.01 1460 f a
4 40000 0.01 1964 f a
4 50000 0.01 1972 f a
4 60000 0.02 2048 f a
4 70000 0.02 2300 f a
4 80000 0.02 2460 f a
4 90000 0.02 2432 f a
4 30000 0.01 1652 f c
4 40000 0.01 1964 f c
4 50000 0.01 1976 f c
4 60000 0.00 2040 f c
4 70000 0.02 2292 f c
4 80000 0.01 2468 f c
4 90000 0.02 2548 f c
4 30000 0.00 1664 f r
4 40000 0.01 1968 f r
4 50000 0.01 1964 f r
4 60000 0.01 2036 f r
4 70000 0.01 2312 f r
4 80000 0.02 2372 f r
4 90000 0.01 2548 f r
4 30000 0.00 1644 f i
4 40000 0.01 1844 f i
4 50000 0.01 1856 f i
4 60000 0.01 2000 f i
4 70000 0.01 2324 f i
4 80000 0.02 2460 f i
4 90000 0.02 2432 f i
5 30000 0.07 1344 r a
5 40000 0.11 1344 r a
5 50000 0.18 1344 r a
5 60000 0.26 1652 r a
5 70000 0.33 1552 r a
5 80000 0.44 1552 r a
5 90000 0.55 1880 r a
5 30000 3.00 3184 r c
5 40000 5.35 3748 r c
5 50000 8.34 4456 r c
5 60000 11.99 5348 r c
5 70000 16.39 5884 r c
5 80000 21.32 6680 r c
5 90000 27.00 7376 r c
5 30000 3.01 3248 r r
5 40000 5.38 3760 r r
5 50000 8.39 4516 r r
5 60000 12.01 5348 r r
5 70000 16.40 5956 r r
5 80000 21.43 6664 r r
5 90000 27.12 7408 r r
5 30000 2.11 3200 r i
5 40000 3.76 3764 r i
5 50000 5.89 4564 r i
5 60000 8.47 5248 r i
5 70000 11.59 5884 r i
5 80000 15.16 6624 r i
5 90000 19.03 7468 r i
5 30000 0.61 1396 i a
5 40000 1.08 1336 i a
5 50000 1.69 1396 i a
5 60000 2.46 1396 i a
5 70000 3.32 1600 i a
5 80000 4.32 1576 i a
5 90000 5.46 1600 i a
5 30000 0.00 1336 i c
5 40000 0.00 1388 i c
5 50000 0.00 1316 i c
5 60000 0.00 1352 i c
5 70000 0.00 1664 i c
5 80000 0.00 1552 i c
5 90000 0.00 1664 i c
5 30000 0.00 1288 i r
5 40000 0.00 1336 i r
5 50000 0.00 1320 i r
5 60000 0.00 1388 i r
5 70000 0.00 1612 i r
5 80000 0.00 1660 i r
5 90000 0.00 1572 i r
5 30000 1.24 1336 i i
5 40000 2.21 1388 i i
5 50000 3.49 1344 i i
5 60000 4.94 1320 i i
5 70000 6.73 1576 i i
5 80000 8.76 1576 i i
5 90000 11.14 1568 i i
5 30000 0.01 1612 f a
5 40000 0.01 1876 f a
5 50000 0.01 1924 f a
5 60000 0.02 2000 f a
5 70000 0.02 2296 f a
5 80000 0.02 2540 f a
5 90000 0.02 2540 f a
5 30000 0.00 1660 f c
5 40000 0.01 1964 f c
5 50000 0.01 1856 f c
5 60000 0.01 2012 f c
5 70000 0.01 2292 f c
5 80000 0.01 2416 f c
5 90000 0.01 2540 f c
5 30000 0.00 1612 f r
5 40000 0.00 1876 f r
5 50000 0.01 1928 f r
5 60000 0.01 2052 f r
5 70000 0.01 2396 f r
5 80000 0.01 2464 f r
5 90000 0.01 2500 f r
5 30000 0.00 1664 f i
5 40000 0.01 1892 f i
5 50000 0.01 1892 f i
5 60000 0.01 2036 f i
5 70000 0.01 2292 f i
5 80000 0.01 2392 f i
5 90000 0.02 2452 f i
TP2/testGeneral.png 0 → 100644
View file @ 196b8ec5
TP2/testGeneral.png

105 KiB

TP2/testGeneral.sh 0 → 100755
View file @ 196b8ec5
#!/bin/bash
affichage=0
versionRap=0
#taille=100
echo -e "iTest\ttaille\ttemps\tmem\talgo\ttypeTableau"
for iTest in `seq 1 5`
do
#taille=$(( `od -An -N4 -tu < /dev/urandom` % 1000000))
#taille=1000000
for algo in 'r' 'i' 'f'
do
for typeTableau in 'a' 'c' 'r' 'i'
do
for taille in 30000 40000 50000 60000 70000 80000 90000
do
res=`( /usr/bin/time -f "%U\t%M" ./main $algo $taille $typeTableau $affichage $versionRap > /dev/null ) 2>&1`
echo -e "$iTest\t$taille\t$res\t$algo\t$typeTableau"
done
done
done
done
TP2/tri_cocktail.c 0 → 100644
View file @ 196b8ec5
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include "tri_cocktail.h"
void triCocktail(long* A, size_t n){
size_t permutation;
size_t en_cours=0, sens=1;
size_t debut=1, fin=n-1;
do{
permutation =0;
while(((sens==1)&& (en_cour<fin)) || ((sens==-1)&&(en_cours>debut))){
en_cour += sens;
if(A[en_cours]<A[encours-1]){
long temp = A[en_cours];
A[en_cours]=A[encours-1];
A[en_cours-1]= temp;
permutation = 1;
}
}
if(sens==1) fin--; else debut ++;
sens = -sens;
}while(permutation = 1);
}
\ No newline at end of file
TP2/tri_cocktail.h 0 → 100644
View file @ 196b8ec5
#ifndef TRIS_I
#define TRIS_I
#include <stdint.h>
#include <stdlib.h>
void triCocktail(long* A, size_t n);
#endif //TRIS_C
\ No newline at end of file
TP2/tri_fusion.c 0 → 100644
View file @ 196b8ec5
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include "tri_fusion.h"
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);
}
\ No newline at end of file
TP2/tri_fusion.h 0 → 100644
View file @ 196b8ec5
#ifndef TRIS_F
#define TRIS_F
#include <stdint.h>
#include <stdlib.h>
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);
#endif //TRIS_H
\ No newline at end of file