From d796afd97afe0ea66ec59017363780df39b245b1 Mon Sep 17 00:00:00 2001 From: Pedro Pablo Cardona Arroyave <pedropca@stud.ntnu.no> Date: Fri, 18 Nov 2022 11:32:40 +0100 Subject: [PATCH] Fail Alt --- .../Comparators$AltComparator.class | Bin 1129 -> 1054 bytes src/Comparators.java | 9 +++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/out/production/Real Task 9/Comparators$AltComparator.class b/out/production/Real Task 9/Comparators$AltComparator.class index db51ddb8215477d1e1f2b8161b3338dc8d10e03f..7771cd421817a493e4e2270f4e43bbc01c26119b 100644 GIT binary patch delta 484 zcmaFKF^_}m)W2Q(7#J9A8EhtUl?V#tB<7{~CKhG8WEPhs<|U_2?2Y1<WsqZMkmq4g zU{IXQ$EYQ(3}UJ<GVp8oxTd71T0=-pPj&{i$-#_m{CqG&{7Q3^Qi~>EXI#l>Ik}O^ ztX`FYiGhKEn}LS`1o#;Q7#J9s85kK@8PpjV88jFe7~&Y18JHOu7(}$TGcamtZ)ITD z(%QnnE~B@Vfp;SV0|OI-CIbV55CaPX0|O5O3j;3$Cj%dYFatk>76Su=0z@x^HiHhx z0tOKVT?QToMv!?7dJF>f3``7+3<?Y?P|J!KSil-gw6`z_YHwi>O90uWy@f$i55(e4 z(b>Wvr~?z%L5S~QkXZwF3>(-2AtVQwz#U-1pwD0cmN#KAWGFIVU=na-P+%~EI=~$2 zTV5^g0}Mhs2N;C5F({#%%n3Fb;tgJ?$t(=UVEauNOu@7ngE^SCV6b9fVBlh4WZ+=1 JV6bN3005x)LCOFC delta 560 zcmbQo@sfk<)W2Q(7#J9A8SE!=mGJZBB<7{~CKhG;mF6a;7ESDrQs-ch<zbLxkY{Az zNKY+sNzExqWMp8`@YM9=Vo+pIVrNk1VNhXEo%lsdS{=mFU}WIe@NrE^Pql`Snx5<o zT9Yjq+a_ONT+V1Sxq`{8UXy`|fq{XWfrkME_!$Hk7#LU>7#Ua@v>6x~bQl;IA{m$% zm>C!t__ek(FluRUWnkBm*~-AXk%57Mi9wfvfkB9Yg@J*Ahk=EGmw}UkkAaVYpFxj- zfk6SHjX|Hm0Aw};KZ79y4+A5}C<c&4Obm<+^(qV+P<zrCSil-Iw6`z_YHwi>OVHBZ z!XUYgK_)?G3xl8zSVRXZvV%ck4cq~2U_*tFEY*Nps=;8yU<{VmU@&1YW?*7q0)-*e zPS<({W^e!qYHeX)m(~N3T3Z-+^-|DH7X_Ox22l(*U64VVL4bi#z>z_P!4ztyIRi7; zAG})H2N;BO4loF9V^BjkjuUJg4}&QvIC!Dvu`rl{{bbHy0j4b(tiZH2gDnFC0~Z4$ M0|$dOgB=4006w`xmjD0& diff --git a/src/Comparators.java b/src/Comparators.java index 8b74ca8..968c6a5 100644 --- a/src/Comparators.java +++ b/src/Comparators.java @@ -8,17 +8,14 @@ public class Comparators { } static class AltComparator implements Comparator<Edge> { int[] landMark; - int landMarkNumber; + int landMarkDistance; public AltComparator(int[] landMarkValues, int landMarkNumber){ landMark = landMarkValues; - this.landMarkNumber = landMarkNumber; + this.landMarkDistance = landMark[landMarkNumber]; } @Override public int compare(Edge o1, Edge o2) { - return Integer.compare(o1.drivingTime + o1.currentWeight+getDelta(o1.destination), o2.drivingTime + o2.currentWeight +getDelta(o2.destination)); - } - private int getDelta(int destination){ - return landMark[destination] - landMark[landMarkNumber]; + return Integer.compare(o1.drivingTime + o1.currentWeight+ landMark[o1.destination] - landMarkDistance, o2.drivingTime + o2.currentWeight +landMark[o2.destination] - landMarkDistance); } } } -- GitLab