Skip to content
Snippets Groups Projects
Commit a153225b authored by chafiol's avatar chafiol
Browse files

FINISHED: tri bulle implémenté

parent 82fe2d0c
No related merge requests found
#include "../Tris/triInsertion.h" #include "../Tris/triInsertion.h"
#include "../Tris/triFusion.h" #include "../Tris/triFusion.h"
#include "../Tris/triRapide.h" #include "../Tris/triRapide.h"
#include "../Tris/triBulle.h"
#include "../Lib/utils.h" #include "../Lib/utils.h"
int main(int argc, char **argv){ int main(int argc, char **argv){
...@@ -63,6 +64,22 @@ int main(int argc, char **argv){ ...@@ -63,6 +64,22 @@ int main(int argc, char **argv){
printf("\n"); printf("\n");
free(tab); free(tab);
} }
else if((strcmp(argv[1], "--bulle")== 0) || strcmp(argv[1], "-b")== 0){
int n= 0;
long *tab = readToTab(argv[2], &n);
printf("Base : ");
for(int i = 0; i<n; i++){
printf("%ld,", tab[i]);
}
printf("\n");
triBulle(tab, n);
printf("Bulle : ");
for(int i = 0; i<n; i++){
printf("%ld,", tab[i]);
}
printf("\n");
free(tab);
}
else if (strcmp(argv[1], "-a") == 0) else if (strcmp(argv[1], "-a") == 0)
{ {
int n= 0; int n= 0;
......
#include "triBulle.h"
void triBulle(long* A, size_t n){
for(int I = n - 2;I >= 0; I--) {
for(int J = 0; J <= I; J++) {
if(A[J + 1] < A[J]) {
int t = A[J + 1];
A[J + 1] = A[J];
A[J] = t;
}
}
}
}
\ No newline at end of file
#ifndef triBulle_h
#define triBulle_h
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
#include "../Lib/utils.h"
void triBulle(long* A, size_t n);
#endif
\ No newline at end of file
all: tri all: tri
tri: Lib/main.c Tris/triInsertion.o Tris/triFusion.o Tris/triRapide.o Lib/utils.o tri: Lib/main.c Tris/triBulle.o Tris/triInsertion.o Tris/triFusion.o Tris/triRapide.o Lib/utils.o
gcc -Wall Lib/main.c Tris/triInsertion.o Tris/triFusion.o Tris/triRapide.o Lib/utils.o -Wall -o tri gcc -Wall Lib/main.c Tris/triInsertion.o Tris/triFusion.o Tris/triBulle.o Tris/triRapide.o Lib/utils.o -Wall -o tri
insertion: Tris/triInsertion.c Tris/triInsertion.h insertion: Tris/triInsertion.c Tris/triInsertion.h
gcc -c Tris/triInsertion.c Tris/triInsertion.h -Wall gcc -c Tris/triInsertion.c Tris/triInsertion.h -Wall
bulle: Tris/triBulle.c Tris/triBulle.h
gcc -c Tris/triBulle.c Tris/triBulle.h -Wall
fusion: Tris/triFusion.c Tris/triFusion.h fusion: Tris/triFusion.c Tris/triFusion.h
gcc -c Tris/triFusion.c Tris/triFusion.h -Wall gcc -c Tris/triFusion.c Tris/triFusion.h -Wall
...@@ -16,4 +19,4 @@ utils: Lib/utils.c Lib/utils.h ...@@ -16,4 +19,4 @@ utils: Lib/utils.c Lib/utils.h
gcc -c Lib/utils.c Lib/utils.h -Wall gcc -c Lib/utils.c Lib/utils.h -Wall
clear: clear:
rm *.o rm Tris/*.o
\ No newline at end of file \ 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