From 8be5badcad4d38a1438c6f1096c04c176d31e7e2 Mon Sep 17 00:00:00 2001
From: Anders Austlid <andemau@ntnu.no>
Date: Fri, 18 Nov 2022 11:03:17 +0100
Subject: [PATCH] tests
---
out/production/Real Task 9/ALTGraph.class | Bin 4553 -> 4553 bytes
.../Comparators$AltComparator.class | Bin 0 -> 1129 bytes
out/production/Real Task 9/Comparators.class | Bin 370 -> 427 bytes
out/production/Real Task 9/Graph.class | Bin 6336 -> 7101 bytes
out/production/Real Task 9/Main.class | Bin 1198 -> 1201 bytes
src/Graph.java | 2 +-
src/Main.java | 12 ++----------
7 files changed, 3 insertions(+), 11 deletions(-)
create mode 100644 out/production/Real Task 9/Comparators$AltComparator.class
diff --git a/out/production/Real Task 9/ALTGraph.class b/out/production/Real Task 9/ALTGraph.class
index 7576cf8ad9e74efdd778b196ef3fae262dd6e579..45d937cc379efd137d700a65acd92b3315a0b87a 100644
GIT binary patch
delta 254
zcmX@9d{TLX4mV@?WL@qS#V7_AhCl{>h9CwhhG+(Ph8PAFhFAt|hByX0hFAs{hJ?wN
zxX()_Gq5tGFbFcFGAJ^nF}O3NF!(ZLFoZH>Zr;VC%V?Uzz{-%zz|WA!Aj^=?pvO?a
z;Lec8;LA|N5W!H)(85r{(8o~9FoU6tVKze%!$O7%hLsGJn`QXUGA7nAa4^&|2r|?$
zh%?kP$T2i9s4_G%XfZS~m@zancrvsw1TeHRL^8B7Brvoyq%(9dlrVHM)G>51v@&!v
zOk?O_Sjf=JaF(Hu;W|S<!##!x3=bJ5GJIv2%*enng^`(I>Siwi2S(PJ3~~&!Cie?k
F0RVdpIRF3v
delta 254
zcmX@9d{TLX4mV@iWL@qS#YhGgh5!bBhCl`>hA0MkhG+&Ah8PBIhFAtWh8PAHhWN>s
zxX()_F|aZuGYB%IFeoylGPpA&Gx##3GlVi^Y~IDA%V?U-z{-%rz|WA&Aj^=)pvREU
z;LecC;LA|R5W!Hy(85s6(8o~1FoU6#VKze{!$O8~hLsEzn`QXUGA33ta4^&`2r|?%
zh%?kN$T8G2s4_G#XfZT0m@zalcrr9I1TeHPL^8B8Brvowq%*WLlrVHK)G>52v@&!t
zOk?O~Sjf=BaF(H$;W|Sf!##$6hKCFj7``%0Vq{>L%*f0zWwV!n10(AU204bAlluj&
E0A9#A#sB~S
diff --git a/out/production/Real Task 9/Comparators$AltComparator.class b/out/production/Real Task 9/Comparators$AltComparator.class
new file mode 100644
index 0000000000000000000000000000000000000000..db51ddb8215477d1e1f2b8161b3338dc8d10e03f
GIT binary patch
literal 1129
zcmX^0Z`VEs1_oOOdoBhh24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00SP6iGJPId+^9tLg(9!3U9=ltA)#G=HK{GwtN$D9%bmyv-ZCowO@H?b(2
zk%1}N6Qq%khk>6#fRTX@CgWF{o0M9_$iV2y$soia%+4Uf!ypP$!Qz^dp32C;ol=xp
zmYJ6xl9`(dQX$U6AOVu*O)f1eO3f<?Pt8ovC;`bx@i0h(WVlmOi%T-|5=%1k^SBr|
z7-V@E<QU``8935YOI%WON)j0vSTsB}J-HYZ8I;%=lzA9b7*rV<1QFi$%qvMv2RVv8
z8SJ-IMg~?5Pp}pa26d2n4Mqlj4IhvTts$hQCp&`{BZCOokkXRO9DU?)VAF{9^wbPv
zWMFa5Pf2BD;P=VQONID6Brz!`m61WnCqFqcCoHij6U2uKvXo?G7BezP`yk9h3u0@e
zkPJ)ADNQYAWMIlSWMp9T0Xq)FGh$>=*YE*53@K8rF-0^z85uZ(Gt=`DOG=AU85s;P
zl|V$${AUBP%g&mSfh#z_v?w{%EfeG?0VHSZf$V2w;P6W=F7e1OE@5Y|VPxP&QozW-
z<C&M2TI8IQSX>P91}{olVo+e<U|?ckWYA<_VqgHJJO&WpXAoduU|?ZjWME~`W?*E{
zVPIg01SMw%1_pku?F@`s+FKdewPdz3@NQ&aU|?d<Wnf?sVqjrlVBle3Vc=!pWZ+}q
zW8i1dV_;xVU|<GmW6)<X0GZ9e&tS;F!@vj@16c&JUWGveYE2pg3s}8|_7(;~?JW#q
z30m4)7$mnb$Ry}&VGz^-i|9Z_b}%Tcf!ogpHd6@6P7S!78Vp7Z#$b631``Hj1||k3
zQ0j%+>B_(i_P(Ij76x`{JrJq2g@IQu1>JB_u;F45#c;y~K^cUBQNWQwg~1eRq&WjK
z*c-fB+6NefbPg~GZDUYFH;xl*93(7wp~kT=n1Ov{&R_wiEg7u9v^9e*0|NsW10w?m
KgEfO40|x+pv)A?j
literal 0
HcmV?d00001
diff --git a/out/production/Real Task 9/Comparators.class b/out/production/Real Task 9/Comparators.class
index 00fc4d200a626ddd671ee1b7a70a0a96db58c6ee..4d0a10a41277e7487dacb7e4c4299ea49499039d 100644
GIT binary patch
delta 101
zcmeyww3?ag)W2Q(7#J9A86+lh?U0pp&d)7KEJ`fNFDh1X%qc-|*%?G89x&qLMG>6%
jAy=M_fr&woL6||5fq_8?%w}g0W8h#AW?*L!XW#$;sRtT%
delta 47
zcmZ3@{E3O{)W2Q(7#J9A8AK;??U?w`V6q}(wkQh&BZDA=FarYv7nsG)Ai}@_08~H;
A(EtDd
diff --git a/out/production/Real Task 9/Graph.class b/out/production/Real Task 9/Graph.class
index a2423f835c0feefdb94c135665d7d6a634ce19e0..9a481943f7d0e127b9212ab4d194fd1f363ef25e 100644
GIT binary patch
delta 2461
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
delta 1931
zcmdmMe!!6H)W2Q(7#J9A8QC{-U1sCwVkl+c<YKU9*v!MQg<<RDM0QoB?K})S7<Mu;
zaAX#TR2HQAr!g|HXgFy`aWR-O?B-$E!?1Vq3U+;#{X7f@Hs5CVWMsUuS(WoTBjbn3
z+T6)Z3_mAN;Lc)Xo&1|yxt>9Rfr){Gfq{XEL5M+!L70J&;UJiIh(U;fm4OY;Kg__*
zz{qff;V1(W!!ZU127Lxb21W)323D;t42&DVT8=X?fHg2Ma59`=U|`^ZC}23raEgHe
zYV2tSMh0$%D5xR(Ca>l3WjsFlH;;NONQV{!3xgtq9K#ugvkc4(3=9rXy&%>(hVu-J
z4Dt+$3>O&AGB7b*WME(rVPN{tpvb_&&cMXZV9LnI!0?Mfmf;cu0|N^KBg16|Muw{l
zQ4EX>$0pbFrZXO&{G3-g9b}IQ11p0fgBrs%hU*M04D1YUa2vzmHij`kY-D8!WVpe=
z#=yjI6Y3|3$StTFco>-eGO)8V=rI0baAja*xDB<jkS~hy_~bKu%DxC2CE+$&!fo_~
z+vo|m(FMaskO<hu$%+EP?04XH7));C*J3<Ac_Tk9?70iI$66qn@%ZHV0_x!)zt}Ob
zF(@)<LH%OJAj)u$;XVT^13QBk+*d(xUj@N^<%{7fkO;(AvVxL~$0nN#8hC<I5f=j!
z0|SFKgB*hmI3<D71p|XT+)R0f2MlMysY{;WAviUFWFLW34I{&2h9}@S-yryz@%ZE=
zLh<z=R~ImFGc0A0V0g;#jDefMmtg|KbB1ROYz!d`oeVD+&N8qwL^Cvj&E;UoU?^pH
z$#9l|lYxQZ5!}{C46mTJK4N$cww0gZGQ%5&w+ze-5)7vp-Z7kIU}2DBIKuFr;R6FJ
zJiYL1gOz<`U<M~z2L`r(47ThHrHt$hpZ+rhGH|mqFflSh1tzZ*mRI})%8!f;pBcV@
zJi@@hw26V4L4bjQQD!$oY2<c>jg$4o&Wde1#-IeseWF}D84Q^i4lr2DY-89qSxDTx
z9u$a03^EK143P|+3{edH4ABe{3^5FH46zKV3~>xv4Dk$h3<(U542cY$3`q>Z49N^p
z3@HqW45<ux3~3B?4CxFV3>ggl44DkO8L}9TGGsHHWyoQ;z>v#ugCURMEki!T7ls0c
z?+nF^JPf6bVhm-Bk__eG$eO{xU(c|cK?oeu{0zYihruBYa>gETNOLhHGHeBhG&e&Y
z!wPUn^Dxvg%mAk&UXV9oVa_N63v)&phOZ3YK<R=}hT%KIHwI<~PDWvH=(8~JGx9S0
zVED<v${@kW!tjnE?kocvgB-&@a73^(I5OO3_{DIRfdd{T5Un2>Simt7!@&NZ!I6Oz
z91oy~U}yLZiX27;hW`x74E*Tglb1>;tHYHrF)%XxVfYJ;DR~BF1|9|mh8wV$dM|Me
z9362C;tUK7)eIaAH4Fj_wG5&Rbqq2L^$dy(4Gby_jSS`tO$>Gn%?$1gEew7Ptqh?I
zZ45~a?F=~#9Sp?`-3;>?dKgwR^fGK<=wsN-(9f`qVFJS`hDi*U874DaW0(RCdQcjl
z&mag6d2R-Gh8}Rpv(<wQge3A%hB|Q2b1)<^6oP{ul*n(u0-WIn!#{8$=U})14qPS%
z0frOcq|MAA%5WGQqAUz53|qh<ib&)T^&g>yq9+5}e+F{~Hc-g1Gf04wIyf|;sU4Qs
zZ%fJZe`18B_WukrpfH@wDXmk#NqZZ^u9*xRy4x7`ty%v6F4GzY1_ovZP_h<cU}0cj
zn86^+Fq1)-VHSe{!)&nM6&RQqWElj&X$Vwz7{R?{#K-`yJ3uuC4+HZb1}=7ng-X8|
cm_XSMRC6&hF@kh(F)%WeGqNzUF)(rf0D(lB+yDRo
diff --git a/out/production/Real Task 9/Main.class b/out/production/Real Task 9/Main.class
index a5de5ad351464b7e85fb34effd9c790eae6e8690..2439f6d8b1bf160affa3e06b8dadc27131fc5733 100644
GIT binary patch
delta 30
mcmZ3-xsh|iMq#1!)RN$g{GyW7;*x;Gk_<<mkc|i5G6Mj$jtoQq
delta 27
jcmdnUxsG$fMgjix)RN$g{GyW7;*x;Gl8lW<-ZBFKl<W&&
diff --git a/src/Graph.java b/src/Graph.java
index 067dce4..b421f9d 100644
--- a/src/Graph.java
+++ b/src/Graph.java
@@ -86,7 +86,7 @@ class Graph {
}
public Edge getShortestPathALT(int startNumber, int destinationNumber) throws Exception {
- PriorityQueue<Edge> priorityQueue = new PriorityQueue<>(new Comparators.AltComparator(Utils.fileToArray("testOslo.txt",adjacencyList.size()),3430400));
+ PriorityQueue<Edge> priorityQueue = new PriorityQueue<>(new Comparators.AltComparator(Utils.fileToArray("testOsloNew.txt",adjacencyList.size()),3430400));
int nodeSize = adjacencyList.size();
int[] pathWeight = new int[nodeSize];
Arrays.fill(pathWeight, Integer.MAX_VALUE);
diff --git a/src/Main.java b/src/Main.java
index a58c412..fe0e4d2 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -6,21 +6,13 @@ public class Main {
try {
Graph g = new Graph("noder.txt");
g.loadEdges("kanter.txt");
- g.loadNodes("nodes.txt");
- Edge lastEdge= g.getShortestPath(4247796,232073);
+ Edge lastEdge= g.getShortestPathALT(4247796,232073);
int sum = 0;
- List<Integer> destinations = new ArrayList<>();
while (lastEdge!=null) {
- destinations.add(lastEdge.getDestination());
+ System.out.println(lastEdge.getDestination());
sum += lastEdge.drivingTime;
lastEdge = lastEdge.previousEdge;
}
- List<Node> nodes = g.getNodes();
- for (Integer destination: destinations) {
- Node node = nodes.get(destination);
- System.out.println(node.getLatitude() +","+node.getLongitude());
- }
- System.out.println(nodes.get(4247796).getLatitude()+","+nodes.get(4247796).getLongitude());
System.out.println(4247796);
System.out.println("-------------------------------------------");
System.out.println(Utils.formatTime(sum));
--
GitLab