From eda986e870f5a3278192ad88838f75270e26d2ee Mon Sep 17 00:00:00 2001
From: chafiol <antonin.chafiol@gmail.com>
Date: Fri, 31 Jan 2020 13:55:03 +0100
Subject: [PATCH] triFusion finish

---
 Algos_1/a.out   | Bin 0 -> 16440 bytes
 Algos_1/algos.c |  33 ++++++++++++++++++---------------
 Algos_1/algos.h |   6 ++++++
 Algos_1/algos.o | Bin 0 -> 2208 bytes
 Algos_1/main.c  |   2 +-
 5 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100755 Algos_1/a.out
 create mode 100644 Algos_1/algos.o

diff --git a/Algos_1/a.out b/Algos_1/a.out
new file mode 100755
index 0000000000000000000000000000000000000000..ff6643c3c1a68569c95521e4a8374e0627eaf525
GIT binary patch
literal 16440
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

literal 0
HcmV?d00001

diff --git a/Algos_1/algos.c b/Algos_1/algos.c
index 0235e35..f5cbd3d 100644
--- a/Algos_1/algos.c
+++ b/Algos_1/algos.c
@@ -1,11 +1,11 @@
 #include "algos.h"
 #include <string.h>
 
-void triInsertion(int* A, int n){
-    int cle = 0;
-    for(int i = 1; i<n; i++){
+void triInsertion(long* A, size_t n){
+    long cle = 0;
+    for(size_t i = 1; i<n; i++){
         cle=A[i];
-        int j = i - 1;
+        size_t j = i - 1;
         while (j >= 0 && A[j] > cle){
             A[j+1] = A[j];
             j = j-1;
@@ -15,24 +15,23 @@ void triInsertion(int* A, int n){
 }
 
 
-void sousTriFusion(int * A, int p, int r){
+void sousTriFusion(long * A, size_t p, size_t r){
     if(p<r-1){
-        int q = (int)(p+r/2);
+        size_t q = (size_t)(p+r/2);
         sousTriFusion(A, p, q);
         sousTriFusion(A, q, r);
         fusion(A, p, q, r);
     }
 }
 
-void fusion(int * A, int p, int q, int r){
-    int* Ad, Ag;
-    memset(Ad, 0, p);
-    memset(Ag, 0, q);
-    int n1 = q-p;
-    int n2 = r-q;
-    int indg = 0;
-    int indd = 0;
-    int i = p;
+void fusion(long * A, size_t p, size_t q, size_t r){
+    long* Ad;
+    long* Ag;
+    size_t n1 = q-p;
+    size_t n2 = r-q;
+    size_t indg = 0;
+    size_t indd = 0;
+    size_t i = p;
     while (i < r){
         if(indg == n1){
             A[i] = Ad[indd];
@@ -52,4 +51,8 @@ void fusion(int * A, int p, int q, int r){
         }
         i++;
     }
+}
+
+void triFusion(long * A, size_t n){
+    sousTriFusion(A, 0, n);
 }
\ No newline at end of file
diff --git a/Algos_1/algos.h b/Algos_1/algos.h
index e69de29..5bbc177 100644
--- a/Algos_1/algos.h
+++ b/Algos_1/algos.h
@@ -0,0 +1,6 @@
+#include <stddef.h>
+
+void triInsertion(long* A, size_t n);
+void sousTriFusion(long * A, size_t p, size_t r);
+void fusion(long * A, size_t p, size_t q, size_t r);
+void triFusion(long * A, size_t n);
\ No newline at end of file
diff --git a/Algos_1/algos.o b/Algos_1/algos.o
new file mode 100644
index 0000000000000000000000000000000000000000..3cc998179e57f471a1117bd503656878702af708
GIT binary patch
literal 2208
zcmbtUO=uHA6rN3MTWhto6jAD-2N6YGT16pMBvQ5=#aa*}6o1p2+G5i{b_4OJSQ-$P
zP{_rbhaP(od+bRhB8fd{JP0}FBBWF?-f|G*_hx6(ZGJ@b!R~wWz3<KYnVo%VTpspl
z8dIXN^K5ISP{x*bY}r0x`dA0s#r)j<!tMDSx1(8}HcI4zF3=tuFKCf43Vf;Oop2<K
z9M`fu!MJUdgeP9mU>7$}V^yr-`HMWB()d!xXD8f`@O2UH;qg#Ws~g0)*C;)CC4BKW
zh;}DW0WNVH;iwUIfuA+9or~AY<#IB4>#b-f{<R-170^<i+ek@OQ=MKTZ{85APjJ#s
zdFn>A;zv89d9k7Wf!paqrQpP<)2SOC#ikU21XO~gC*M2y?fEt2UPbN|ZjUa5vciuU
zSR-G;ScVN8VQC{HvZRfyoGx*48%-EKh#9n&kDh^*b<LnC4gg(k4Ry^mR3ocxyvA;I
zqq=|=xHlDT$M`bZ#&d_5acy4`+Y=E<JJhKoX@-u?o0>lbS8YJ!dNSJPK;2^g6oT?{
zbh<f=V7YVg`!DBo*~rk)VBe9EEB>Q>Uj3xr&sYyl4x&A}%CuOQ*4xqAmc;xH0;7lI
zBfT!{>3ZfF+TG$=2gC85BOJ0ouZsV1#eb7<$Zfg|%HK4u34-v{zKGh)ew1rHj5XE0
znS?jhqXTVjfVVWjTN~i6%P$!_p}Sr6h#3LfCvml2z?$R`9^#KtgAg$jG6J*r!=^sT
ztjNs8IWrisX2NsK3`fmtk(uGBNvkPG5t|*5@zfdB@Dmr8q`v{qU3j~T-v^t-BOkHA
z%O?$mt3K{l;i?a&n-4=)U;^5TIC@%Hk>G4Vw}LT?>GuLwfaw#a$@Ix^C={FnHW#*n
zI=;mdrWKfcz;r<mPT!e|1VTZX?!Q$ZcAybdpSTYg$xCX~C30L9q!$*=+E+mwV^w}y
zT;g;V6pO1NWWUshp$V`4Lcdkzm2|;XHtFMdXwQF*A3!YS$5r1ZDu4Gj)Zr4O<}m28
z-PH15);}iWYv{6}n0r&$YJLj71f$;kOLgW?w^zlh`BNV?xq-!G{x;bt-3^MZj;C|2
go;@J8AoCxig-g`j6tovcy?CGerHm`0)Yb970c$CGEdT%j

literal 0
HcmV?d00001

diff --git a/Algos_1/main.c b/Algos_1/main.c
index 66182a1..0e48bd1 100644
--- a/Algos_1/main.c
+++ b/Algos_1/main.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
+
 int main(int argc, char **argv){
-    if()
     return 0;
 }
\ No newline at end of file
-- 
GitLab