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

WIP: Tri fusion est en enfant

parent e7ac1f77
No related merge requests found
......@@ -15,15 +15,6 @@ int main(int argc, char **argv){
if((strcmp(argv[1], "--insertion") == 0) || strcmp(argv[1], "-i")== 0){
int n= 0;
long *tab = readToTab(argv[2], &n);
// for(int i = 0; i<n; i++){
// if(i%20 == 0)
// printf("%ld\n",tab[i]);
// else
// printf("%ld ", tab[i]);
// }
// printf("\n");
printf("n:%d\n", n);
printf("Base : ");
for(int i = 0; i<n; i++){
......
#include "triFusion.h"
void sousTriFusion(long * A, size_t p, size_t r){
if(p<(r-1)){
size_t q = (size_t)((p+r)/2);
if (p + 1 < r) {
size_t q = (size_t)((p + r) / 2);
sousTriFusion(A, p, q);
sousTriFusion(A, q, r);
fusion(A, p, q, r);
......@@ -13,19 +13,18 @@ void fusion(long * A, size_t p, size_t q, size_t r){
size_t n1 = q-p;
size_t n2 = r-q;
long Ag[n1];
long Ad[n2];
memset(Ad, 0, n2);
// memset(Ag, 0, n1);
// memset(Ad, 0, n2);
int j =0;
for(size_t i = q; i<r; i++){
Ad[j] = A[i];
for(size_t i = p; i<q; i++){
Ag[j] = A[i];
j++;
}
long Ag[n1];
memset(Ag, 0, n1);
j =0;
for(size_t i = p; i<q; i++){
Ag[j] = A[i];
for(size_t i = q; i<r; i++){
Ad[j] = A[i];
j++;
}
......
No preview for this file type
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