From d0ce822b095a3ab38a85e56115c7bb54d6043927 Mon Sep 17 00:00:00 2001
From: "vincent.steinman" <vincent.steinmann@etu.hesge.ch>
Date: Tue, 25 Oct 2022 17:12:56 +0200
Subject: [PATCH] End section 1
---
tp/src/main/java/org/example/Main.java | 26 +++++++++++++--------
tp/target/classes/org/example/Main.class | Bin 5978 -> 6301 bytes
tp/target/classes/org/example/Person.class | Bin 1240 -> 1393 bytes
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/tp/src/main/java/org/example/Main.java b/tp/src/main/java/org/example/Main.java
index 4eeab4c..d82ac5a 100644
--- a/tp/src/main/java/org/example/Main.java
+++ b/tp/src/main/java/org/example/Main.java
@@ -182,17 +182,23 @@ public class Main {
}
public static void OrderArray(){
int size_array = contactArray.length;
- Contact[] newContactArray = new Contact[size_array];
- for(int i = 0; i < size_array -1; i++){
- int test = contactArray[i].getPers().getFirst_name().compareTo(contactArray[i + 1].getPers().getFirst_name());
- if(test < 0){
- newContactArray[i] = contactArray[i+1];
- newContactArray[i+1] = contactArray[i];
- }
- else{
- newContactArray[i] = contactArray[i];
+ if(size_array > 1){
+ Contact[] newContactArray = new Contact[size_array];
+ for(int i = 0; i < size_array - 1; i++){ //-1 as we check +1 later
+ String nameP1 = contactArray[i].getPers().getFirst_name();
+ String nameP2 = contactArray[i+1].getPers().getFirst_name();
+ int test = nameP1.compareTo(nameP2); //Return distance between 2 letter (f and a = -5 / a and b = 1)
+ if(test > 0){
+ newContactArray[i] = contactArray[i+1];
+ newContactArray[i+1] = contactArray[i];
+ }
+ else{
+ newContactArray[i] = contactArray[i];
+ }
+ if(i == size_array - 2){ //-2 to take last iteration only (as we do "i < size -1")
+ contactArray = newContactArray;
+ }
}
}
- contactArray = newContactArray;
}
}
\ No newline at end of file
diff --git a/tp/target/classes/org/example/Main.class b/tp/target/classes/org/example/Main.class
index 3aff0a415e64adc1a9b945267ae353fc19a8e01e..611c4014bad05fc0a784690238cdc1e343376535 100644
GIT binary patch
delta 1334
zcmcbmH`kEs)W2Q(7#JAr7=<=+S#d-MFdX4wILdI0k%2uuwIm?5sF;yKOheNrzbIWl
zwIVUMASYEHB$}UR&BYMLaDs>7B!ea+18;h2iCbn-aY=k$Vs0uIgEqry9)>dvGZ+~-
zlk;;65{ptp@+UWO>|?yK*^x7oQHU{*k%6heh>?LQ&xnzMr6jd@@^UUKenwU<Mm9!v
zc18{!h8>KYlRt1BVdS2?mD`+=Z}MAiEfxVr2D!-}xaB5W@~APMot(fUrhblrfq{*I
zk%57MmEk-C0|O6~eSzU30|Nsm!zG4Q42%qCC(q@1!+36T7q7n=NR<KuGlMb1QijV6
zR~Q%>EEpCrTxGb%z{J47aGT*e!wm)ohMNow3|b644F4J88CcmFZcXOrli|GuHqrrX
z;n~R+e0LbnO%~-Zt_K-8gMpucmEjn}ZH7BwXY6OV%izzz$RN+K25b!zg9^iPhI<Ux
z7?>H17-lluXSl||!eGbH%kY5VAp<Le4?{h}BZg}XYz$Ehg$$1wt}(DPWH2N%JYl%T
zz`;<)5X$hB;Ti)cLkojD!!w3!3|tJo40a698E!CeYcNb>FlBhbaD#z|VLpQn!%K!6
z47?0m7{nP~F}!BrW8h?PhB$e%zCZ#K<GINbgsy|#+{eJj=*J+y@CIZrV-AA=!&{KO
zj9m-@4DUepGOl2dWOxs<mvJM50K*4{8w^~G=NTj!J~CWm;AXtRAi(emWG&-221$m`
z4A&TV8UHf~FnnRS!NA8P%OJq;mEjr#KSKfIQE&h=GpIAEgF}N+j6sJ<iQyYK)LEIl
zpuu)?@*iP4#<P>HMdmP`n|wpW+Yc19CJd|$whRUg-x=;OurNq7<U@m2k0AzZ7!!jr
zLpam|R)#j1SquyeiVW<37(^KVGiWfdGO{!Lm|Q3-&3JZluc(z5DB*}Pure?(EMpL2
zSk55Bu!2E}VHtx4!zy?}5@HZw_{s2^ff<|}co~@fF>tao{9t7K!63)L$xzKu15R6l
zVkV5|CcBBrtAkt%N?QyJ(hR>Cu7Ojf7}!0G4D1Xd48IxfFfcLPoZKU(RDYI%fia1J
zm4SnSfuV8}gU>!|DV8M+g;IMN0(_WlWu#bA7BM7mV(^hM+Qx9$Pj?%`aVr)Omn8ut
zV8trQ3KC+IWRYas#&F7vU6g$ugOs)mR7tS53`+utZ4|tmfg2)h6f7gfnzDd_U3)Ww
zPkjp$<MRJ=HZm|UFf)Jx!;L|Zfq`KM11rN$1}=tO4Ezkc86+6?FeozYWl(3>$6(B`
zpTUaZ0E08bK?V<oLkvL-hZ*7-jxnS&oM6afILT1Nu$!TR;Vd}tf*3d$6d3}+Nt>BL
zoxz*o4>-9SGuSiy1t)i_dIk%If1q^7;LM=U@Souh13QBtLpnH;nHcyPGNF;o%1{Ch
zKuDG}W?=otAP9;|#{Uey3>;t<J3|;dgEoX@WME+b&%njN43=SF_z4POMo1ZPmVtpm
z0bD*XFmOzk66ZAr`5RJturV+*f=Ur4MkYpP1_lNW21Z5}21Z6MMji$R1}+9hMqWmK
IMnMKi050$@nE(I)
delta 1016
zcmbPhcuSA#)W2Q(7#JAr7`ZlbS#j7MVK~apaEyoHIKv4>27#=^vPAvTlFS@^$D*Rd
z%3?+amg4-P5=I6wjc6aRWKLpUy1su>R%&vIwPx7l`5gNguWXLv%w(K=hs&Iw;V&1%
zKZgJ8j0`*sI~W-!D{&uTWS;z-+nkYYvOJF#3kM^E++;s)xyji)YIY|X7#Q>!7#SED
z7#LW!wlgqpWME)mVmQUXz`zC(WH`;hz`z4#pJ6!5z`(%CaE@UW10%!9$>(|AFrJ#c
zhu7Z>q)LH-nZcN0DZ_b&3k-}577Pm*E;3wVU}9ikxXo~x;R*u-!&L?b1}z32hW`xl
z46N)7*Cspi$?#qS8|eVH@Z{tyzB`PkCcE<&*Mp3l!NAYJ%5aR~I>QaHGxjswWbkKT
zWRPcA1Ga{VL4{#C!!3qO49pBh3^N&SGhAX|VX$N9Ww^s|mw}bRhoPR~9>XODHijsM
zLWcVcml)U?G8mE>9xz;D;9w|Y2xWN4aEXDFp@qSn;Ss|n1}=tP20Mnw3|APqH5jHb
zm@+(JxWd50FrPt(;VHuv2403O4B`yW7@jlmF>o?CL!7)hQ6Pbd@zmr)Lf64=?qlF%
z^kWcUcmcAPF^55b;U&mk#x4c{hF2ha8CNh!GQ0-a%eaw2fZ+|p6$UQG^9+&<Zy7Ez
za5LUu5MX!*vX=21gCxUyhD!{*jQ<$~7(OsuVc=tuWe{Na$Z&~)pP_*9C^&$b8Pu87
z!J)w@#-PKb#PA6m>a0v&&|tedSx>}{@#N%OkvWW~CUc2;XMuv&gn^a8mcfAGGs6uA
z76xgCd}z?>F~ookV`4C72!~q0%FqTgi-Cbbk%9dWg9zh)1`P&QMs|iT><qH(4BCtg
z4Dy`67+BeUFo-g6GI&A)XYzhgE5=ike~C)#fh+|jBq0U?hOZ3I8JNMzftP{l9|I>l
z!xu)z9}IE~oD9_rHQ==6EM~%ZYI22`ygEoDC~Yw?NHct6xCBb73}RsSFfy<+h%kI-
zxWT~0aCP!NF{K1hf(~S01gAQ|O$<K!tflrc1o&)X@Y%s|7?HSz7+4q>7<MqQGVEmF
zV%WtXz_1&f(8U;-7+4v2z=kt0a51n$1BHX(2h=}-5|YM<?7_ys%<vPOWqvXIW?*38
bU|?kU!@$VM#0WB<i-D1mm64s1lR**y%lzjE
diff --git a/tp/target/classes/org/example/Person.class b/tp/target/classes/org/example/Person.class
index 9b0cf630b4ca5daa47bd697933fc04b89efe9afc..3d13150b37dbed3bd7c91f402110ca11a8bf6268 100644
GIT binary patch
delta 375
zcmcb?`H_q3)W2Q(7#JAr7)&;DB`^x|q^FknBo>#%=OyN*GBSv0OuR43$D5v7;+9zi
z6`h>Hm^k?XqduQH7lQ_aCOd-`4}%bc_GDS6Ba*s|49tuQjEoFCo_TqxMb0^i#l@+`
z><k8ze=%vX7%?))P5#RyH`$F@g^_J?Hgie6J_92IBLf2itJW3<_6-aS3``7S3=9lx
zU_o96aRvqk9x$7gL4rY&fq{XML54w^fssL!fq?;8GcUSkL9Ci(8RVdv?HHICm?l4A
zmSh!WU}X@S?8hR`Ef2PgkwJk$Zn6rCDyswoD}y9hMiDBb#2`JnfJN6@7RhuzsMDAk
nl))ZQVNhjYVBlb2WKd&ZWYA&IV_;z5Vqj#@XE0<iW{?B`w@)*5
delta 265
zcmey!b%T@Z)W2Q(7#JAr7>qV@B`{82z!=XYqA~Hl=;Z&5`h2Qf3~CJO><k(_3_=W=
zlWmxeFltX`WEN-9V`NaBypTzJay=6t8#{vmBZC~2%RV`kS%r~hau;*S<O&u!bzTNm
z20jLH1_lN(1||ju1~vu>21y1GU}KPB;9+27U}TVGke*z~B4WY5k%57Mi9w8kfq@IG
zSb%|*K@f*#IjClN28GF-th&~sV09n^85sDWmM}9Yf=yInP-b9Y;9y{6P+?$X&|=U5
P+rY@6%b?F-$RG&-r=cJX
--
GitLab