From e686a541b002b5dd061d3ed81f5d0e50fd0ac004 Mon Sep 17 00:00:00 2001 From: Ukhanov Ilya <ukhanov@unistra.fr> Date: Fri, 31 Jan 2020 15:13:11 +0100 Subject: [PATCH] Tri Merge --- TP1/Makefile | 10 +++---- TP1/main | Bin 16488 -> 21728 bytes TP1/main.c | 9 ++++++ TP1/main.o | Bin 1208 -> 0 bytes TP1/tris.c | 82 +++++++++++++++++++++++++++++++++++++++++++-------- TP1/tris.h | 8 +++++ TP1/tris.o | Bin 920 -> 8944 bytes 7 files changed, 92 insertions(+), 17 deletions(-) delete mode 100644 TP1/main.o diff --git a/TP1/Makefile b/TP1/Makefile index a3647b0..83914bd 100644 --- a/TP1/Makefile +++ b/TP1/Makefile @@ -1,10 +1,10 @@ -main: main.o tris.o - gcc -o main main.o tris.o -main.o : main.c - gcc -o main.o -c main.c +all: main + +main : tris.o main.c + gcc -o main -Wall tris.o -g main.c tris.o : tris.c tris.h - gcc -o tris.o -c tris.c + gcc -c -Wall -g tris.c clean : rm *.o diff --git a/TP1/main b/TP1/main index 0959b206f91551144dbd06392129555ed1c6dc2c..29b5568cd857252272d0bce598697c9aa600305b 100755 GIT binary patch literal 21728 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 literal 16488 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 diff --git a/TP1/main.c b/TP1/main.c index 1394ce8..bdf6489 100644 --- a/TP1/main.c +++ b/TP1/main.c @@ -1,5 +1,14 @@ #include <stdio.h> +#include "tris.h" int main() { + long A[5] = {3, 4, 1, 6, -1}; + + triFusion(A, 5); + + for(int i = 0; i < 5; ++i) { + printf("%i\n", A[i]); + } + return 0; } diff --git a/TP1/main.o b/TP1/main.o deleted file mode 100644 index bec93ecdf5ed2e1f094258621f16b474617ce573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1208 zcmbu7y-EW?5Xa||7(ZepiiHq`SgBx^fGEL2PGS;Ku@F;=Y~o5nybI*Eh&FbjosW>m zu=gc=0UyB5PG|0R<L10;bl`Soemno2{kZ$;NiAVnpv{6k_{lT{_%xvHV;eFs1C7I{ z_ZP}9UZGy8>=xD!M6<))LYZx`QgLS^2w>6I09bctU=4Cses*%|8P{A!P9Ir@hW)wR zL!y#R*RX){7^Cf^;NvT5IvIHafFvZM%8@5y_(Tj($MDoIPG?v!_T!(CsvO>NS<82n z7HB}D9ggjidAE+_O<<nv2fnQ%DFzbQ6_*@X)AN9}dX6JpWNuFiRzGbNJ;_^LV104J znP^{L_qikdKK~u^xB$ID_$F+%@aUW>r&`liF(DSd`D3%lh{O6doTIz_t9}!;v}OrE z({%q86Jo6UYrkzUv$Sm{Myz!j9brIh?5#1^`m!!mp3Z7o6%+c~Y!hPqs2VLPPC9xc wt=BxNH%W#xpuGhSrqPo&tS276dy))P|12ejDLf+c7)9xas_=YN83bYdH~(!r;s5{u diff --git a/TP1/tris.c b/TP1/tris.c index 339c195..f4145b0 100644 --- a/TP1/tris.c +++ b/TP1/tris.c @@ -1,21 +1,79 @@ -triInsertion(A,n){ - for(int i = 1; i <= n-1; i++){ - clé = A[i]; +#include <math.h> +#include <stdlib.h> +#include <stdio.h> +#include "tris.h" + +/*triInsertion(A,n){ + for(size_t i = 1; i <= n-1; i++){ + clef = A[i]; j = i - 1; while(j >= 0 && A[j] > clé){ A[j+1] = A[j]; - j --; + j--; } - A[j+1] = clé; + A[j+1] = clef; } +}*/ + +void triFusion(long* A, size_t size) { + sousTriFusion(A, 0, size); + printf("Tri fusion\n"); } -#include <math.h> +void sousTriFusion(long* A, size_t first, size_t size) { + if(first<size-1){ + size_t middle = floor((first+size)/2); + sousTriFusion(A, first, middle); + sousTriFusion(A, middle, size); + fusion(A, first, middle, size); + } + printf("Sous Tri fusion\n"); +} + +void copySousTable(long* mainT, long* underT, size_t id, size_t size) { + size_t i = 0; + for(; id < size; ++id) { + mainT[id] = underT[i]; + } +} -sousTriFusion(A,p,r){ - if(p<r-1){ - q = floor((p+r)/2); - sousTriFusion(A,p,q); - sousTriFusion(A,p) +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); + printf("Malloc\n"); + + copySousTable(A, ag, first, n1); + copySousTable(A, ad, middle, n2); + printf("CopySousTable\n"); + + 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] = ag[indg]; + indd++; + } + ++i; } -} \ No newline at end of file + + free(ag); + free(ad); +} diff --git a/TP1/tris.h b/TP1/tris.h index e69de29..37cdfac 100644 --- a/TP1/tris.h +++ b/TP1/tris.h @@ -0,0 +1,8 @@ +#ifndef TRIS_H +#define TRIS_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 diff --git a/TP1/tris.o b/TP1/tris.o index 0de1e591ec8ef184dc587670653ca3fafdf63d20..7eb7222252947ff90d20500bc3d5de7b159b52b8 100644 GIT binary patch literal 8944 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 delta 271 zcmez1I)i<JhIj-c0~|PjSq==G3>=f&_?0GalNF!5K#pZ{jDQg%(_}{h(aAjmQj_-y zNK9TPAk0=$lv%8oJo&$jtVT&{MG1pmN@7VOgI-c`F@s)mer|4R9#AYVza&-9-7i$P zxFj(-d-6tE`^f<Utdk9Zrhbu?nd~7TGTB0&hf#5Ip`19Q1JDj>FkgN0Mr8iv4IuRj zB1{eplf4wx7)>V|%8O6_AkQ+{1?U){0bpnT5#gEapu{1X0QLq0!wM+P4y4&9$0})a WazH)HF?phrIi~=W=Q??!oIC(n7eP+| -- GitLab