From 0d94a185a08435db9b79bca219119e38ae0f31c0 Mon Sep 17 00:00:00 2001
From: Pedro Pablo Cardona Arroyave <pedropca@stud.ntnu.no>
Date: Wed, 9 Nov 2022 17:09:32 +0100
Subject: [PATCH] Get list of closes places was added
---
out/production/Real Task 9/Dijkstra.class | Bin 1662 -> 2520 bytes
out/production/Real Task 9/Edge.class | Bin 1851 -> 1851 bytes
out/production/Real Task 9/Graph.class | Bin 4619 -> 4896 bytes
out/production/Real Task 9/ListOfPlaces.class | Bin 1640 -> 2508 bytes
out/production/Real Task 9/Node.class | Bin 1955 -> 1955 bytes
out/production/Real Task 9/Task9.class | Bin 663 -> 2493 bytes
out/production/Real Task 9/Utils.class | Bin 2976 -> 2976 bytes
src/Task9.java | 58 ++++++++++--------
8 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/out/production/Real Task 9/Dijkstra.class b/out/production/Real Task 9/Dijkstra.class
index 44c74406a4ee1a172803a42bd76a3646ac913702..7902d10da9f31814d6b9ae8ab5f545ebfab1c812 100644
GIT binary patch
delta 1239
zcmeyzb3>Tx)W2Q(7#J9A89Fv{RWQ}__+%EB_@@QrBqpa8b1^tGxbZNsGPpA`uxNN{
zhH)`)GkEeacrkc0GO(womiXnTq%tyaYIth;fSA@?489D0><s=q3;_&*j0`LwL8!{a
z+*C#e5e-eBti-ZJ{hY+Sbp7CxqRhN>u%=)hh7g8OMg}*I%;J#Bf>i%Bkd48bQ6Lk;
zc^D!X_!${EK{l4=CZ!gE92UjH5X}(7$iR`9k^*)vBLl03r>ABZJ44*&2BtNPEJf@L
zC6f(UOzQd5Q%jKj#mFF~;p1MESdd}u=^3o)gDhvw$iR{Z_7)q&PmBzFd0<Onp~A?(
zQc_uv%E-VN%*eo#gA`tj41DNjaRuj>PR?Kv4~S)8VgLbV1_lOJ1~vvphIj@B27Lxb
z21byG)^-NQjSLJ7ObiJO3}9&nhFc7Y3=9lB5CsfL49N@(44e!p45<uE4DplCv+Sq`
zsr6zIVqjpn!@$9CmqCEx9)mc;eFg=F2MnqV4;c&@9x+%mJZ5lWc*5Y#@RT8l;Tb~`
z!*hllh8GOQ3@;hl8D23=VR+3jpW!XTB8GQh`(hY48N3-n7}6Nh8Q2(t7<?Hr7%~~y
z8Il-m8L}8M88{di7?v|+GvqKZ)PtG144GgjE@#MN$Yfw*;9!`~kk3%Sz|0`PFrA^0
zp@@NnL4l#2p_rkBft8_@fq_8`uBwcI87f!Kz{*g;z`!8H!2FNFnw^22ouQJQq3Sn7
zG802JIACfRI2mdg>L4M<#KpkIP|w4_z;JUn1AF9l22LxM-3-o=GTRwktys0TF>vkS
zvSO2D6B63NAPnN}WstODmt>P>_LpSe%^)4Qok4a7gPbIbmh?6T#cd3#;gT%d7&K=w
zbb)By0}O^%9FiQ{7>vz0CD}j>Gd&P#nPA2x$|cDr%Bi=AA*LS05asfhWEbTGnJLK*
zQe$Scoxvs;BxWSZv6I1`i6LB)MN5<uY7dy@VZ|-Uy^X==7=wf)x9m2CpqUK(lB^)1
zFj1~;43W$Kmq@a1U|?WiVF1N(9D_Im1H&f<PKM76!VF&+q#3?4C^3AiXV7N&&S1ds
zgTaR3Cxbh~F9v^x-wcrqe;5)N{xTFW{9~wM_|MSD$iOg_k&$5$BNM|qMrMX>j4TZM
z7+D#PGqN#UX5?bH#>fqh_$me-hHVV84D}2R4BQNn3{~JHz`>BfPz+82oD2mF$>1cw
z1qybCY=-(AP>N=_$pA|NHyIkiNq~XjCPNcLGXpaNC&LABVqjqqW;n*s!qCdV${@|K
z51cI67_=GIfs+M0JXt{0moczF<;oe@!O23Nf%!j!I|Bzh12-chBRF|Dvx|b02m`}!
PhHfSXMus+UGHC|@I^+L3
delta 394
zcmca1{Evt0)W2Q(7#J9A8B#ZLRWNP#WM0L{62Z<8HTgS>Nj6t-erZv1s#|7GDkB3|
zNMdoerCwHISt5f1gEIpY0|<afRt7c(Mg~^~1_pfwMg~R(1_oBG?F@_?85kIt7~B{b
zz|ss1HyGR*7#MgU3K%>XJQ)}mI2pVcycw7nTqg^%?WhN-^<ofWU|_h#z`<~vL4e^7
zgE+%o1_g$D45|$G84MX7FjzA@WN>15#Nf^Fm?4Pa2}2UYQ-&OdXAH#*&l%boUNB5y
zc*!uI;Wfh|hBsjQVi-6Xyct3md>DKg*cgHsd>Q;0{2AC8k{E0m0vP-mI2afhmNNu0
z1TipFfSJJz{$M9AX9!{NXJBIBV3^Mk$`HoD%pkxpogthdf`NrWfuWrtk|BzLl_8pe
zfk6zeDu#g>Di_PZ$`HrEz#zoH{Exw!oq?U5A)cKf;WtAv6GI|6V3HUZ8Ir-Q6aW=E
BMiBr2
diff --git a/out/production/Real Task 9/Edge.class b/out/production/Real Task 9/Edge.class
index b87b027cb979f85fa9c1d5da1bb6d1c4334d2855..ca092437a77adfd477d1ab60e8b8ad2890b36f78 100644
GIT binary patch
delta 63
zcmdnZx0`RnbQZ?6$un3=7_%nxvbr(mO%7qTV@#Vo8BAVcwV%wx$}?G(&6+W7awMA#
RW7_0tYz~ZRldrR-003{S68-=H
delta 61
zcmdnZx0`RnbQZ>>$un3=7}F;6vbr&5O%7qTV@#Sn8BAVcwP#G4EX3x<m^3+(&4w{)
O@-#LF#-z#D*-`*Yuo95~
diff --git a/out/production/Real Task 9/Graph.class b/out/production/Real Task 9/Graph.class
index be79eb6f12801224351c14f7a6d042957711f428..9502ef068bcbf6b9a5568b292848bf07226c0b6a 100644
GIT binary patch
delta 2174
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
delta 1827
zcmZ3W)~&*I>ff$?3=9mm4EHy3X|QN>Gi35GWHDqjGO(womiXnTq%tyaYIth;fSA@?
z47m(>><sxl3<V5@lWkcn1FRT|c^FC<N*Nj0i&INNDhpB>8CW!eHN&_VtQg997%CW|
zAX0vbxv3lsRg4Vco_QsyMXALl3I+L@c_qaPIr)hxsVREw3^j}l;*$@sit}?ZR5LJh
zGe|Pj^Ds0pG){iQqQ>3K(8A8p%EQpc&^}p~Rh^@mp_7N9i=lh6533SeFAqZ>L;vIw
zR%MQAhKW23lNcsXp3iElHkF5A8pCu(2A*_?+Z>CE5-ULt)Qk=mVqjpH$-^*<VfJJu
zHWS%uhPgZp^BDRW88}MvgG-7s^U}E(Oc)mMFf3$PG<gx5KFbmwhNYXYvMDq1vE+fn
zg$)uYlfQ8&urU=UF)~O_-p?w@!On1sk%1{Xcya=#E)z@M<PJ__zDryTml>|GGh78(
zcy01Y&LfOBCiiiPv)pE6P@SyDB|iB8mjL74$rrh7m6tIvFfcJJXAolGW8i0CWPtEj
zFmN$2GO#j4F)%W$oNUM)<h_c4fkBReoq>U&h=GNnfPtT(m_dS}gh8F5l);Ljgu#KK
zoMANs1A_tsGlLX^8p9ffwG2!Q3=ED8>loHEfPf>z28N9cj0~G5pW{|wTsiqYcR@YK
zR3!!u1_p*I1`dX52403525E*`1|5bv27iVchERqEhFFG129U{i3~UTK49X0f8MZL6
zG6*oZg6&{oU|@)c+Yt}7gM%TQL5xA1fr){aA&6lsgE#{-!!`y61~CRE28i5pkeohP
zaytVv!zKm>27U&ne+&Zb43g{&l8nC?T%cjGgMpD@Cp08@d85E?hJ-{b11m!tgCIjY
zgCau*gB3#?g9Aesg9k%5*u5qUtPF|_l3@3;Ft9UNg5Ar^z`)=McdsYZy{rr_U{^AM
zUC9FudyvR>1}3o6co>-eGO&Z)#lv91z{n8G5C@K$PrL@6pg`mT2X-HW978|YaxDf>
zz{tZbl4sb(u$F<5fq_AuVK+2t<QeubtYu(kU<74BuxZ(R@`fPO*uW|$flUGh83O|!
z+$27Ry<n3V8TK*kXJBGjIe9mqLKs5VG$dX8a9#XRU6AB;fPs<WAS6f`7#Kb=Ff*_*
zFfasZ?_kjOWwDdh*~uWm$gqgPda@zEMEy2~3@cViR!J5Xqa6%6+Zc*KY*wRf3}r3M
zjLZKY+{EB3RJn~IbRz=;0}BJlA!-bq3=9m57+4t=GYB#)VNhgP%Am)vjKPXwIfFC9
zVg^r!l?;IltH2Hgr7A@RC1@<^F^Do8VmQpe%D~Rx1c|SDkjvoy2!cnLFGhrcM6g5{
zgCheY!x08hn66}CV3Y(WK?a7x-3--{+Zk$ow6-va>}058WboD5$<V~eFq6SgXD34k
zBf|j(D?i<BLJU2}7_78)w=wi=W0(-GyNzMWWNQK0`WXxiAbtxQ<MRKHm;YbCiNRNU
z8^auEKrn*?LW_Zmfq`Ky0|&!8233aj3_1)O7)%*9G6XVgVu)qf$dJsil_8B`8$$uZ
zc5q;TQcWNO55rN0V+`yJstk7EzyKxLLTCtZFk~_uXE?#YSPxE@W(+KU8HCsws@WNu
z|1%hXk|;NX$If8I&Tx{Ek%8eqgFFK>I|Edlf#DYe69Xf|X$DzPl4D?CFkxT>CpRug
zKu9n$tO1uvpqK;&8Uw>|u;W0vf`Nex>X3RyhBFNIP$T9tFoDy%CBz8iuvAA5OHfb>
zgF;e!8^ipW3>>=K7#6Qt{{I>i$VNzzNr98%83tK~vkWQ>=NR-E&NG-WTw*Y1xD0j$
zsC<)U5N8MmB@<A{SVA4dz+lO67E-`5Ffi~iF#loTVrOX91bLU4;T+gY=NT?AFfed1
bFfv?ZU}U(?aFYS#Ax4H<40jmrF-QUczn^W^
diff --git a/out/production/Real Task 9/ListOfPlaces.class b/out/production/Real Task 9/ListOfPlaces.class
index 2e8b52e182dc7376d4069334d2425dd92984abe8..fde9efb0c2466b0a085a4bcd55ea3a3ce289b71a 100644
GIT binary patch
literal 2508
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
delta 1119
zcmX>j{DOz;)W2Q(7#J9A8KNd~trKO>O{@sctV-o(kYJExXOQAykY<pX_)eZ%jzONC
zL4k)skwIy)1fwN~1cM3>gDQjC<VZ$W9St4^O$IGS2A;Icih!KN<W!%`;u1y%E)5^Q
z{FGE{Pt7opc{)4{x(s@gk1}cqN-!AkFc>lzF)}cxr<O1>s7*e|Dm=NJQM6u;!Gwpw
zltG4(fg>}oBrGwf6zmpr9tH~rOGXB^?9|F&kPbl&O`oj9vPAvTlFS_a;M5XpZU$=x
z8+Ha;9tJxGdqxIc6j??F_L6+ZqN2n~Mg~z0&1i_;oW#6zegCAa)Z`Ltb_PdA26o$M
zh?7C?b>?Ak0XdPaC^a{~ER~UgGdMFnFR`SwD3y^x3t|G;cHhJT8?d&?{LBS>EP44U
zsf-M4U=i!dUCeSu93`p6C7_^SWZ(rcU5YZxQbRIxQyCc;GZ`5;KsrD{#?BDV$iM<p
zIJufds-8iCft!Jefq{XUL5P8mfuDhq!Igo5fr-J5fq_AYK^RPmfoWz2Mg~>}cLqiV
z4+aK?I0k00J}Is342)X48Q3GYGjMKY;L>8=${?U6y_G>^BiI~I1_lN(237_JMk59m
zMm+|8MtuemMq>s^MiT}vhI)`B$a*OTZw4O*5RhU3S;xr0$l%MM1+}b?fti7sfq}tH
zYYPL{P6lyC2CXd&B8wQ5KzwbP9SpKN8I+kB!ez9!FbFJR5Y&>{${?_ufm2IcW*dV#
z$RW%O2#1(62rybO$TM0p=+`saFqkshF?caBFepH*fIGyD!H>b8fe~aaLjZ#?0~13a
z0|NsK1Cu^00~07QLLA4K$H2_M&cML14(ynn4BAW#GZ{3Y9DOE+0}OK87>s2WF^Gc2
z5UyR$P+JcY+R0$X$gq>aijm;}gM$?-vl*Kx8^nKcAZbZfQ8uHU49F%qfW`c<$(pf%
zM0IyEI59DVgP2Icqopg#vW-E#g^h9f|M}ohsRsv(5d#kc1EV8@BBK+7F{3+!8>0t9
z5ThqU7NZwK0i!oV8>0`yL`GkR1&n?S%Nacw)-ncxL(GGLouPoioFRz8pMja7jX{wi
zm_e9<g~5{{g&~ANn1PMKjUk;Ol)(`c{|xKkA-fJ9vi9qcf>wip#rQviC<8k?12;QE
g7$XA%JA(rw1H*5I*#8Wy49sw021bSmaN>#t0KxFaB>(^b
diff --git a/out/production/Real Task 9/Node.class b/out/production/Real Task 9/Node.class
index 8090d598ae54a197cd55bb339b5b86116ca854b8..c1f8ebb191fe8a9955c8c03781260046bf884380 100644
GIT binary patch
delta 183
zcmZ3?znFhR0<)kB0}F#H11EzT10RDrg9wAh<U;1C$s8<VlOHmxPj+Pyn=HqoKDmiS
zY;rV<`sDpAVv}dEs54qmKEPtjYR|yR;4qnqHH_Dpft|sHfuF&RL4?75aw=<)s22k_
zgExZ+gAao=gD-<3gBOE3L%`%WtWCVZ4B`wS4Dt-Y45|!aldIV}IHMWZ8DbbD7-A>$
luvf_@G3YZeFz_%iGB7X*F&HoyGB7YOGWaksFfcLr0ssS0ALIZ4
delta 187
zcmZ3?znFhR0<)k30}F#911EzL10RDjg9wAl<U-~sM)k=DSVSj3WLBSinpteJ9E<v7
z4i>S=(JbndU0K8?&tOrX+{7X_`6`PBt2F~FgUw_n)-Yas26hGq27U%71`!75$*HVG
zqHYY_4DJjf3?2;944w>%3~mhS3_g?Jur~4fGl(+;Fvv6bGpI5IO|E9^;0$MAXNX{s
pV2GT|!(JsD$Dq%^z`(=6$iToL#9+W+$iTqB$l$}kz`(@d3joc}Amac4
diff --git a/out/production/Real Task 9/Task9.class b/out/production/Real Task 9/Task9.class
index e231b157e5e4b5d2d1c250e4db44dd428bbe56cf..c55c22f84e75ea90b8ca31e2950af97ddccc1c13 100644
GIT binary patch
literal 2493
zcmX^0Z`VEs1_oP(UM>bE24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00Sb_Nbc23Gf?#DWYC1};Vh!MyyG)FK7X<kXzRycE5XiV`jcb_O1hX}pXK
zq8dI3^MXr?GV{`{HN!X<_!$`lvlH`5Qj5?u3i2=rG4L`naOUJErnsi0rxtTCh%hpU
zXM)tG78j=$WS5|65#wPH2Wb%kY4L=pD+$QY%quD8VvuBzVrP)%VUS^vWn|!R$;`?w
zE-6Z6WZ+LvE%C`LF7Zzb$Vp62EoNkp((nQM%G%R2Sknht&YFuso<V_~L6L_+i9wl>
zfd^TVk%1>YwFGPkNSKj9P(u^q=hBkQ9DU!!0&5`#1_o6g1~mqCMh3RT<mA+X5=I6M
zn03gi(@OJ_OEUBG^qn%D^Ye;Jb5o0~xfwJWwAdN6c^GsUbQu|V!Qlxrn~{M%Ex*V$
zF*$>gK?xexU^#3iX@+qz=rb6wGZ^wP7%><#G6;gr0>?Ed+|pBv7#TP+^Gd=Jb4pXe
z(d`L}Oj8~PGX`@;2KMyS62JVER7M6)4NpxU5Yw8I!IHs>oxz%i!G^&WCG`YX7MG;v
zGBPmdmzFRxh(f|7GhaWTC^N4lxTGjGG1r=l!Jff^oxzcZ!HL0{k%0wdB-Eb7+*C#e
z5m;D)-3U!TAWg133~mhWj11hMXiO~0EGY#!i&;a{1tjaq!{7yy1;va{eqK6QT8M#>
z!H0*zm%)#bK|D7xJJmTqFFCO!JhLPN6xJn)c_qb+4A#&<M7Gey1>$(H7&M@)q0t5w
zgF7sMA&{LRh=(B<lpck_p^NHcMh5l*kpFY?*cn0@8CXLSi?b~m8Caab!OHKGnV0HU
znwykb6q1;flgh{-<ddJAm=l&*lnLTP1zAcmGK(1**nPmdtr;0uauYN27#YMgqLCa5
zb(CfpBLhofQF<{WgD@6pMh3=okWrAN&&a@CT#{H+0&xQ)1EVJ+14~Y3aS0;>Kg4Ko
z;sPaVMg}odw^bITLfvPMs?-L;1&0(Y^soroSu-;5<|O7Or6j6={G(#P$Y21=Bv{mA
z5d!&@Ee{-ij10n96fiQdg9;LGLT3RLT#O8CkaWz*z!jWdT9lmXmI(@XE^yH5fnt!6
zLBJ_LzXVil6!@l=WaOt5^RqD&aWND#l&~|D@-UP!lru6Yfs{gu&CI;A{OnYHAFx+^
zQ%e%l5|c~viz*ozxO0(tXONQ`R1?GkkHox`oYZ0!pZxsn(gJHFk3b_8Nd!e>NM%7P
zvU1`jAy(qoi=5=4COaqQ<OFAyq*@CwR5CKCBl`$admx(#710diXJe@5VhCZV;bBN;
z$Pi$tV`R`o)`};UfHgO8F*GtXu`@J-vU3X~g9=9AL&6D?!`)!PKLgngs0XMV;1GMQ
zkuw_1*O+kz4?GTrHbw?<Mg=PcMjb{4m!izF%)E4klFZyxD+NYI1|HA6ywoD+oW$bd
z)M9pqPDTb*3=d=T2RlPIBZC}%rJxJ|PGt;=3?U3m3?RVFzzAv!FfcNNF)%RbGcYnR
zGB7Z(YHep=+{nPdz{C*Fz`(!;7G!6LU|?Y20kc^dA{n9>7#KJiq8VbKnin&$Ft9K%
zFc|J;V2>2y+|I!5qb<a@jX{9fR$EAT8-u7evj7L{4hD&B403+D+PfH37#MakXfQE=
zEMf**B*(zcz`(%8z{SALAiw}>9*8hVFo-g!Fo-c2Fi3$NparpnA(kNytX7>No*{vO
zkwJ(-o*|JTiGhhhg@KnLnIVONnIRSGV2DT>1G4}ZC>25-T*SZ*HcLrMdmDq^HU<;F
zO$-*g+ZgP0w=uZrZe#G!*~Q?^z_5+MALK$vQ1CG@GcYiSGjK9UFeoxeBDqKj><&<v
zDlud-WPyW8i6NUIi-C!OlR=Uphas1NnSq%h4;-xd3<V4f3_=V{422BL3>6Gj47CjP
W42%q|4DDcFF*0;8bTRZWNCE&w7?eZ+
delta 249
zcmdlhJe`&6)W2Q(7#J9A8FVIc-BV;|kmO;IVqjxr5H2Xn%q#KCD@iR%EiMVj&&(?+
zW@nI@+`_zUvJk68JcA;GGy@X@2rw})GO#kRF)%X7GB7acGcYnRGB7Z(YHep=+{nPd
zz{DWOzyOwJU|?sEXJBC9fhb^5U{GXWVBlm>Vo-)^&Szj|U}j)okeyt>AsMlaK>}fb
z6ayOr0|OTW7Xvqg00R$$5Q7MV1cNAp41*ZhPz8ua1{DTXusUG|H3oGCMg}1UZUzko
NO$LxFwZP8N1^@%A8@&Jk
diff --git a/out/production/Real Task 9/Utils.class b/out/production/Real Task 9/Utils.class
index cde6d7e51e8398ecb1dd4c37be2fa71631884c21..9c0d2eba1043b6ecb1c7f69588aa8d5613e23a7e 100644
GIT binary patch
delta 161
zcmZ1=zCe7#J9fs($?w@CB^w!-7@HWl8Cw_x7~2_y8Cw}d7~2>m7&|5>ax7<^#K6xu
zc``5OM%(EOtc)`lco}Ch2r$lKkYSw7pusqYL631RgBjyI1{=ot4EBr*7~B~bF?ca9
zW(Z|m%8<agj3I+@7DFE6%E`YupR2BAU}ap#z|OdyftPUugBasR1~tY_44RCa8SELi
RFnBR;U<hE`HkqA!CIEq6CxHL}
delta 161
zcmZ1=zCe7#J9fsf$?w@CCF2;F7~>hZ850=<7*iO88Iu@97?T+!7*i)Fax7=fXW(Zn
zn9R$$(YAzvm9dn8m$8gNfU%rGhOvS{gRzo9kFkoujIo-*hOvghp0Sp}ow1(5i?M+r
zl(C5+fw7q(gRz_;kFjm?Z_ekcT@0*@-3;uEJq)~zy$oWEeGF=h{S2Cn6Bz6nCo*_3
O_A&%8PM*xpJre)}-6E9$
diff --git a/src/Task9.java b/src/Task9.java
index 58d3477..073c4fb 100644
--- a/src/Task9.java
+++ b/src/Task9.java
@@ -18,7 +18,11 @@ public class Task9 {
System.out.println(node.getLatitude() + "," + node.getLongitude());
}*/
g.loadInterestPoints("interessepktIceland.txt");
- g.printInterestPoints();
+ Map<Integer,Integer> list = Dijkstra.getListOfPlaces(g,0,8,(short) 2).getPlaceList();
+ list.forEach((number, integer) -> {
+ Node node = g.getNode(number);
+ System.out.println(node.getName() +" : "+node.getLatitude()+","+node.getLongitude()+" Driving time: " + integer );
+ });
}
}
class Node{
@@ -162,9 +166,7 @@ class Graph{
List<String> data = Utils.readFile(inFile);
for (int i = 1; i < data.size(); ++i) {
String[] splitText = Utils.dividedText(data.get(i), 3);
- Node node = getNode(Integer.parseInt(splitText[0]));
- node.setType(Short.parseShort(splitText[1]));
- node.setName(splitText[2]);
+ this.setTypes(Integer.parseInt(splitText[0]),Short.parseShort(splitText[1]),splitText[2]);
}
System.out.println("Interest points loaded.");
}
@@ -182,7 +184,7 @@ class Graph{
System.out.println(sb.toString());
}
- private void setTypes(int nodeNumber,int typeValue, String name){
+ private void setTypes(int nodeNumber,short typeValue, String name){
Node node = this.getNode(nodeNumber);
if((typeValue&1) ==1) node.setType((short) 1);
@@ -257,7 +259,7 @@ class Dijkstra{
Node node = graph.getNode(nextNode);
if (node.getName() != null){
if(node.isTypeOf(type)){
- listOfPlaces.addPlace(node,currentSum);
+ listOfPlaces.addPlace(node.getNumber(),currentSum);
}
}
}
@@ -328,43 +330,47 @@ class Dijkstra{
}
class ListOfPlaces{
- private final Map<Node, Integer> placeList = new HashMap<>();
+ private final Map<Integer, Integer> placeList = new HashMap<>();
int maxDriveTime = 0;
private final int maxSize;
+ int numberOfFarthestNode = -1;
public ListOfPlaces(int maxSize){
this.maxSize = maxSize;
}
- public void addPlace(Node node, int driveTime){
+ public void addPlace(int nodeNumber, int driveTime){
if(placeList.size()<this.maxSize){
- placeList.put(node,driveTime);
- if(driveTime> this.maxDriveTime) this.maxDriveTime = driveTime;
+ placeList.put(nodeNumber,driveTime);
+ if(driveTime> this.maxDriveTime){
+ this.maxDriveTime = driveTime;
+ this.numberOfFarthestNode = nodeNumber;
+ }
}
else{
- fixPlaceList(node,driveTime);
+ fixPlaceList(nodeNumber,driveTime);
}
}
- private void fixPlaceList(Node node, int driveTime){
- if (placeList.containsKey(node) && placeList.get(node)<driveTime){
- placeList.put(node,driveTime);
+ private void fixPlaceList(int nodeNumber, int driveTime){
+ if (placeList.containsKey(nodeNumber) && placeList.get(nodeNumber)<driveTime){
+ placeList.replace(nodeNumber,driveTime);
}
- else{
- Node testNode;
- int testDriveTime;
- Node[] nodeList = (Node[]) placeList.keySet().toArray();
- for(int i = 0; i<maxSize;i++){
- if(placeList.get(nodeList[i])<driveTime){
- testNode = nodeList[i];
- testDriveTime = placeList.get(nodeList[i]);
- placeList.remove(testNode);
- placeList.put(node,driveTime);
- fixPlaceList(testNode,testDriveTime);
+ else if(driveTime<maxDriveTime){
+ placeList.remove(numberOfFarthestNode);
+ placeList.put(nodeNumber,driveTime);
+ int max = 0;
+ placeList.forEach((integer, integer2) -> {
+ if(integer2>max){
+ maxDriveTime=integer2;
+ numberOfFarthestNode =integer;
}
- }
+ });
}
}
+ public Map<Integer,Integer> getPlaceList(){
+ return placeList;
+ }
}
--
GitLab