From abc4e270890589ad8bab9a52c5e8b1f2dc9b4558 Mon Sep 17 00:00:00 2001 From: malric litiere <litiere@unistra.fr> Date: Fri, 31 Jan 2020 15:14:01 +0100 Subject: [PATCH] avant pull --- TP1/main | Bin 16792 -> 16792 bytes TP1/main.c | 4 ++-- TP1/main.o | Bin 1688 -> 1704 bytes TP1/tris.c | 12 ++++++------ TP1/tris.h | 3 ++- TP1/tris.o | Bin 1400 -> 1416 bytes TP1/utils.c | 2 +- TP1/utils.h | 2 +- TP1/utils.o | Bin 1592 -> 1592 bytes 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/TP1/main b/TP1/main index f2cec69342b07a11fc059b2a84a1454851c91dc6..17d53ea487d73396a3d9f621ad993dd66c3005bf 100755 GIT binary patch delta 772 zcmZ8ePiWIn7|%=QnvT|OUDXXHwkNSLhqz9MR2>@qhV$Sg$AO*%LGUmcNJo{FNhrb2 zcd6(>++jNi7BXbwm}Ns}#txYv<S6JMqC%=3s?0sV{82IkFTd~o{(SFyNkt(Qg;Yfn z)dbFaG`*dCAjx0Cec4>7aa%)cFETyq-tjXhhILW68W&s82wHra-fVkYxDG3l=_U~^ z-pBVle6)#=PLq%2z*h-;k3^rJ4fJZ@pKtd0TExdUUO!DT7rjDVv76BOvIW(GeQAp^ z2y2~gC`?#L%;VyWWf{~BP$w)<Z<si6!#(iRG`^rDH9$+ga&1^!Kujocph~u<C^o^` z`JBa_6ZRE6qwIjPL_mwZ^Yb$1SG_zB$~A|8GU2eX?*GHVAp??~pY=4QhE2jlEFo=! zid}G4tW9ty8IT&Sljj&?<x%=1(RsYLByB<^l(hej{~EL$i3iuW5C3LNkv0k1k4Yc% zM%h?y-FK3*#ID`d49Cf!^|*L(_`n7zUqoBiGab)j_fki@zSbH0fp=T{##j<RTJk$% zeTZZ9Lh8ZjoO|oRoo$o+sdzL0G#0`C+Kp5mSKVQ3eVe}aPk)H~W9&S#O+WAHr;%I0 zWznJZS>otZ>ANvf)YAuN1O(#{<H;>*^o^4u9n9{Dt|r_b95+HQXZJ^cw)?wvI+eXc eQnai83YpVy_aBLnG<}}yjTSq6Ls75iW`sY+=m5e1 delta 764 zcmbQy%s8W&aRUb<XD%}X802miWPHph!n(F8Eb3=}(1XpFZ{Mhiswj~R=i1D{oW;xW ziiv^2qnEdNa+ScPdWYk#4?r4^yFLL51F09RVCoGcnEJp1rVc=q9Dyh~!2uRL1ChG` zQF(<8EO>(*Ox*#Q;?e8+U>}&#dHlr}pum1EAn_vi-~azGsd@$vpqvD{;uAoD9YD-* z@^Gj}=Tnc)+83RrPma6(0onC(HjwCc{o^siqgSLAq{^e)^@RuHg>HsU*DpYc<`;~e zu0LLzcDw$-R1^BcBl(g?^C3o$UY@B8^<dqhK;5T+x|y1De=s)J{$Qw(#;TXW()CNt zDu`6`0iX%U)*tG2{Q@)r=*Di>C)Tci`1>RO|NlQB7UF~EHwp+}fZY6A7vu#qEPgoV z(QB)~3k`r5L4W`MhZy?D+Vx4z=?Nzf^UF_`7Zw$}pvAxt>d~tUqJw=jpL#UE;dpU* zvzPETp2-_n6(%WINIv-Z|34_;7k>KxUj!I-Ux2g;kPev~s4zQrImjK3d;)Du&b(|) zi+I?9@hSrpssZ9BAO8P8h$6oSE<Xn--U>8107c##Ebjso+XKWqCVMKnGhWy{QL&$g zF=ex&-g0Ijb<*%Z6Jx^UlP2YiDU%&d#W~jsfy`iF2$-B`s?PaF5W+h+d7^1MBg14# fvvkJgn;Xr{*%=up@3htDOc91CNZI_+b~!TuQPKrK diff --git a/TP1/main.c b/TP1/main.c index 33eb5c7..41153db 100644 --- a/TP1/main.c +++ b/TP1/main.c @@ -5,9 +5,9 @@ int main() { - int T1[5] ={3,2,5,1,4} ; + long T1[5] ={3,2,5,1,4} ; - int T2[8] ={3,2,8,4,1,6,7,5} ; + long T2[8] ={3,2,8,4,1,6,7,5} ; affichertab(T1,5); printf("\n"); diff --git a/TP1/main.o b/TP1/main.o index 8464bcd59095a6d7cbc6b806c1654117a496018c..f3e50fc623761e718ca7058f5f8306e8431117f0 100644 GIT binary patch delta 318 zcmbQiyMlLu2IGo}nsW689>-lTFf%YP0O=b{5c&Ztgnq#Yp+B%d=m}7DGob1ga6rUY zK;<_;)$d?~h#z2w&?ms=^}1fz2WE60e*qL{*v|zdq`*uMbUBc~#LK3WSsB%Zwty5n z@(HvtIrFkHt><Cqm^_hLYH|eQ4#q8$1)0_})=oaiBre$wQU(Mdw{QdTpZ^drWAaBP zamJM(HIo&XZvgfDWHx8KFximBp7G1%LNK`zOnwBCf|Ctd?HMH|7XnFx$s2)Wz~qlW QvSYF#n?0k)<U%%e01?eyX#fBK delta 305 zcmZ3%JA-$E2IGv0nsW6H$6X&VGcYh5cYVSHre3gusW*&Z>H`ayIsj2}1ft{w2Uze7 zMD7Aa<rOxt;0<;#bq8dMN3ZLHePBlC@fSco!+tIx0cOFZco{sPav+h34@@UZFscYG z2Pt;s6KG>{=4E4A#KX=pc_FjZ<P63gjLRo0GOcGUn0%2*T(SzJ3<yB(;0EG9{~@4z zG9$A%;~bEh$p*|ffO<Gt%oz_%c4V<<d_K7mOdbT2jI8#IER!99B*)}NAgM6<AdqyJ T%*bZXSTWfVNLoy8WK#zK<>^-; diff --git a/TP1/tris.c b/TP1/tris.c index 32cf264..d0c4aa5 100644 --- a/TP1/tris.c +++ b/TP1/tris.c @@ -2,13 +2,13 @@ #include <math.h> #include <stdlib.h> -void triInsertion(int* A, int n){ - for(int i = 1; i <= n-1; i++){ - int cle = A[i]; - int j = i - 1; - while(j >= 0 && A[j] > cle){ +void triInsertion(long* A, size_t n){ + for(size_t i = 1; i <= n-1; i++){ + long cle = A[i]; + size_t j = i - 1; + while(j+1 >= j && A[j] > cle){ A[j+1] = A[j]; - j--; + j = j-1; } A[j+1] = cle; } diff --git a/TP1/tris.h b/TP1/tris.h index cc5056a..9a671bb 100644 --- a/TP1/tris.h +++ b/TP1/tris.h @@ -1,4 +1,5 @@ #include <stdint.h> +#include <stdlib.h> -void triInsertion(int* A, int n); \ No newline at end of file +void triInsertion(long* A, size_t n); \ No newline at end of file diff --git a/TP1/tris.o b/TP1/tris.o index a3890e82c9e166c03965a7b9efda9c1944185287..bdaa4d561577bb95fa5d5fba75e96fe2bb9050b1 100644 GIT binary patch delta 309 zcmeyt)xkYMgYm>fO}Y9T9-XBZJdV5mU}Rumc)1uzcyzn|@aPpe3S@%VH#`_Gcyu#( zbh^F(%QU}W1hPN8HU;uNV5kfI;L&`D(W95=DnxrIQ2Qycb|#PJ+z*T%&9xu?m&m~N zx}sWQ>H4B(1z58A0MHa<M;rnQzwqb;8Uu7IkbS`e<PuBQAN+0J6MuUOT?AR^$S2Uo z<jl*)bcTnWWAZ^JsmTS5I~Xrc)?|7QBoi5hC+je)FbYl%WVQ#A6T##~AgMQ5kj0+S eU~(XkjF>zTNM=mF2qYaQ3$ofX7EBIgRR;jYqiYZV delta 294 zcmeC+{=qdtgK@`1O}Y9PouyBXyZ&KhU|@JT8%T7!{_&XM(JRslWHWelyT0&XywJ_i z>G}mI(foq3)Ah$|({9%vm})|QcqCu)Xg<W~(aSRxqB#_(`4mtyQ*-VQ#^%}|3>DJo zT1_G5Te^O!Sp|`6J^(ZU+4@7>u3vyg0NvQ_`o!Ax4}X8;WNt=Jp@Sex9Qg#=n4Edp znD+3nb4<R-BsIB#aR=kU$(Bs-fn*`0@MIfi6-LI%iOlvuav_*}2qfhuE3()#DojoU ak{**60?CNU4}qk?WJOkc#)Qd<tm**Kq-C=J diff --git a/TP1/utils.c b/TP1/utils.c index f68b0b3..df56076 100644 --- a/TP1/utils.c +++ b/TP1/utils.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include "utils.h" -void affichertab(int* T, int s){ +void affichertab(long* T, int s){ for(int i = 0; i < s; i++){ printf("%d \n",T[i]); } diff --git a/TP1/utils.h b/TP1/utils.h index 4313661..9bc1d22 100644 --- a/TP1/utils.h +++ b/TP1/utils.h @@ -1,4 +1,4 @@ #include <stdio.h> #include <stdlib.h> -void affichertab(int* T, int s); \ No newline at end of file +void affichertab(long* T, int s); \ No newline at end of file diff --git a/TP1/utils.o b/TP1/utils.o index 93cbf075995584b2edc7a921e5d6e4568a023c27..6d511603b9af0af8e04312df9d3b5e3783f080c9 100644 GIT binary patch delta 143 zcmdnNvx8?sxTJo!>mQF99=#$*8Gyi}+x3M9;{}gy29Jq(a*QV@_G(Vtp&}Fnl5^w} zXk&8bWn=Q?Vdt3qkx6PY2jd0CpvgBG^Ce9|3V?tKh*^R7&wmK8pPb0_9jGRfxtwv* c<crMqKvIweL<R!M>60e{$t{~NvZONt0EYW5X8-^I delta 141 zcmdnNvx8?sxVUb&>mQF99=#&13_#$~?fSxl@j^Gl!~!|S(-ZqOCvH;{3INGC@(Hvt zIrFkHdGoMyO#a9uHJO9)0%O4Bn~eFA#vlbizy!psK>X)F1lUeaWcm(N6Uki8IAQWd ZW_uth$O0k*f#lT56M^KW%@<kH837NLEQ0_5 -- GitLab