Skip to content
Snippets Groups Projects
Commit c8881280 authored by Axel's avatar Axel
Browse files

Préparation au pull dist

parent f9832311
1 merge request!1makefile et autres
This commit is part of merge request !1. Comments created here will be created in the context of that merge request.
......@@ -4,6 +4,7 @@
void sousTriFusion(int tab[], int p, int r){
if(p < r - 1){
int q = (p + r)/2;
printf("Q sousTriFusion: %d\n", q);
sousTriFusion(tab, p, q);
sousTriFusion(tab, q, r);
fusion(tab, p, q, r);
......@@ -18,7 +19,7 @@ void fusion(int tab[], int p, int q, int r){
int tabD[n2];
memset(&tabG, 0, sizeof(int));
memset(&tabD, 0, sizeof(int));
for(size_t i = 1; i < q; i++) {
tabG[i] = tab[i];
}
......
......@@ -10,7 +10,7 @@ void tri_insertion(int tabInit[], size_t tailleTab) {
int cle = tabInit[i];
size_t j=i-1;
while(j >= 0 && tabInit[j]>cle) {
while(j != j-1 && tabInit[j]>cle) {
tabInit[j+1]=tabInit[j];
j=j-1;
}
......@@ -20,5 +20,5 @@ void tri_insertion(int tabInit[], size_t tailleTab) {
printf("DEBUG: Tableau modifié: \n");
afficheTab(tabInit, tailleTab);
}
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