From 26a6dd9d3110c39d9466edc70f2fdf67da99b70a Mon Sep 17 00:00:00 2001 From: Anders Austlid <andemau@ntnu.no> Date: Tue, 15 Nov 2022 15:29:40 +0100 Subject: [PATCH] Fixed landmark preprocessing. --- .idea/runConfigurations.xml | 10 ------ .idea/vcs.xml | 1 - out/production/Real Task 9/Edge.class | Bin 1226 -> 1226 bytes out/production/Real Task 9/Graph.class | Bin 5354 -> 6226 bytes out/production/Real Task 9/Node.class | Bin 2206 -> 2206 bytes out/production/Real Task 9/Task9.class | Bin 2407 -> 1046 bytes out/production/Real Task 9/Utils.class | Bin 3396 -> 3203 bytes src/Task9.java | 44 +++++++++++++------------ 8 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="RunConfigurationProducerService"> - <option name="ignoredProducers"> - <set> - <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" /> - </set> - </option> - </component> -</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 3efd6af..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> - <mapping directory="$PROJECT_DIR$/oving-9" vcs="Git" /> </component> </project> \ No newline at end of file diff --git a/out/production/Real Task 9/Edge.class b/out/production/Real Task 9/Edge.class index afeeff6b44c8ec35823fa38da5e2c49bac4baeda..14558bb7546093f55720f9c15345ba0d27851afb 100644 GIT binary patch delta 91 zcmX@bd5UwxEGE$w1{Q`U22O@n20n&124RMF1__3a$?KV-7`rDQWEPz)&#cba4`#(M qt20gpvt}}@Gftm;klB`XHUlfeoXN~A;fxC=N3(b_)=gf<q5=SK4jE<u delta 91 zcmX@bd5UwxEGE%P1{Q{L22O@520n&r24RL81__4R$?KV-7#k)ZWEPz)&#cba0%pZ9 qt21_hSu>f{8G9xlWVU6Uz`)8daWXSYIOEjG(JWq!#gmt@r~m*`vKY(& diff --git a/out/production/Real Task 9/Graph.class b/out/production/Real Task 9/Graph.class index 40f31e9f19e17ce985ba42d57de48b50c8f227ad..0c6c382ad9a41d781e20acf34e6f6501c83d1319 100644 GIT binary patch literal 6226 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 JwXK;L*#JR2*$4mt delta 3257 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 diff --git a/out/production/Real Task 9/Node.class b/out/production/Real Task 9/Node.class index 2de2d582346d50f8eceabced107d5e3a19a8fefe..71fa9ab4bf0e98c63565b85282d57b5e83bbb33a 100644 GIT binary patch delta 215 zcmbOyI8SiHb!I^`1{MZ$22KVG20jK$1`!6U$uF3r7;Psvu!v5MU{PmuoZP@-!{`d; zUt&>b^aQi`S=AYR!7LwE4c0&gR)(O-m8^SILmAi^!Wj4&A{gWuA{q1<q8RKMq8S1i zVi=McVi`&q;uxwJ;wMM3Rfr}ra5E$`h%lruNHe4|C^955s54|te$Lj!o6R83ki#I) zkj<dVkT<!Ey@Ruuft{g*L4u)lGCN0=Y!!ne0|NsO10w?igAjuggEIpI10zE`0|NsS GLjnM0QYlaX delta 215 zcmbOyI8SiHb!I_r1{MY#22KWD20jKo1`!7R$uF3r7>y=3u!v5MU{Pl@o7})+!)OKO zUt&>bv;(vFS=AYxz$_nD4OTY>RtERUm8^SIy%^XTyczfzd>P~!{225Z{2A;S0vG}r z0vVDSf*48}f*Gn9LMBJCRfvW&a5F?Oh%iJlNHat+C^CdIs58V)e$Lj!o4_E>kjNm< zkiekIkUY7Jy@NA@ft?|fL4qM`GCN0=Y(9e{0|NsO10w?igAjuggEIpI10zE`0|NsS GLjnM|e<#EM diff --git a/out/production/Real Task 9/Task9.class b/out/production/Real Task 9/Task9.class index 47d6ee4f448093bd53bf445cdfd44fd70bf5527d..e91aa3619c6fcebbf9ecf7dbbdb5e0d015315356 100644 GIT binary patch delta 577 zcmaDZG>wDn)W2Q(7#J9A8C)lF*|Txx<)@?;O$^`7&Xt{*SCU#ZS%Fcio|(ZUf`N;H zok4+zL6Jd;k%1?zC_mRHF)t-Iu_&97fmOp(Guo4bL4}clrzEww#J@NvU$3O1go{Cq zL7kmJgNH$rL5q=rHMAr%r<jp}JF%!Ju`(pzEi)&TkwIJ|+S4a1u`E$PCowNwKe(hQ zGcVm*GmM=<hmk=TBq0uwaji&BEhx#%&*NgyW)Ng&(4Xwh(kd#7q!+GY@>>?YKvu9d zj0{ZCo{S8<!6k{w*}jPdA&E&jsq75a><spd3|ztarA5i95QlJuBo=2|>Va%zP-M_! zU}69PCI&_ZRt7c(Mh1h)`s`xHh71f~9s>g>gAoG*0}lfu0|NsqgE4~%14zu2!3?C9 zfq~&812Y2)0|SHE<O+6$dTk-OZ4C0hIzq}j7*v-taQNwNW6<5mz{J4Bz{9}Lz{jA@ zpvz#upv}O{0J6e}fd_0j69XRu4}%~BKLbC50D}O72!jxV0)qmBI)f5}E`utA0fRDw zA%hBoDT5B!IVKFO3<3-+4CV|L3``7$V3s8VGeZaigBgPrgEa#K0~3P@gAIc%10#bv z13!ZugFOQig98HtgE|Ate+GUACUyo#b_R9^Ms@~1mj4XW49pM#b_OSqm^KRoBZD*8 G7#9GP^kmck literal 2407 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 CFiYJ4 diff --git a/out/production/Real Task 9/Utils.class b/out/production/Real Task 9/Utils.class index a60a2172accb5a71c732692a1b729c9012d2ff6d..e752a6ced322f09e3c572a918ffc150f19a687d4 100644 GIT binary patch delta 1447 zcmX>i)hx+%>ff$?3=9mm3`;h06*9>RWhIs+>SyNbyJhC2h8Ja)q!w{8=rI`bFt9Qh zP3C2hs25^jWH8}j&|xrTWDwQx)bs)C$Vtpg*AFf!%FIi*25B(oVX$B@Vq{<~2blp9 zvEpH{W?*AvU`@`+FHYrRU}v!9VX$McXJlZ@NzF?y$zWt)*3k3>NjUN_I59XgGO#6Q zBo;ZAFfy=ccxpO>WL$Yz7~B}#C$}-HGkQ*5$1JVr&B%b_=AhKX6p)*J8T{B8{COAx zCck2q=JjGQ<YMq(2nKm0WU@Ysgs=xg7!N}@Lj)rOM^S2Gice-<>SRe~X{jh4hG>u| zOG!~?E*C>ALmWFpJP$(xL*nKNmOMtr(#g+R3x&87i;5B}L-IkP#K<775$!oykVV9w zk%2Lbk%7^Zk%1MgfRTYI+LMui4IBtXj0_@>z(NULYj%b@Mg}g|isaOSlFa<PVnzn; zl+3csl+={TacqWMti>gXMJ0?3jG2>p*=6K}qakJ>2RI`GOL1mZDmz2hWFvN`$&Ku~ zd{em?rZG%sXP5zsshN}aupd#G&B(ya$jHdSFqe^miIIzufyXm1FSW=yC$YFVwV0h@ z0V9LzWJM0~$^Y5;*w`5sF*3+Ox$H5F3~WC6`Prof3<?as3``6lz{bG9z{<eJz{rrq zz`&r-z{tP|64Bbuz_^itfq{u3nSlW;&A@2Mkix*gzyndhkjjw8z`(%Ckj{|7z{HR= z*^$$@9;8-|ft`VY(UF0P(TRbZ(S<>P(Van<(Un1j(TzcZ(F1IT76S`|2m=d4CPNkj zGXn#I6hk&c4%jvchFpd`21W*M27ZQoh5`mAhC-;FObj5oA_hi=Vg?2VF$Sjp48jb| z><sMe3?=LgvJ8yu3?iZ|3}s+r${9Er0vI$wzM9O=r3-c#7s$tqK@9wi!C*&-f%ptE zP^<YFco`}f3K$p}I2kG#sz6?1U|`tDzzp&ZgXwMty-4lt3<kbhe!Bb2SeVUNMOj5z z7BNWain8jNvFV7i?P4%yVA#fB*22oT{Qpy(Z48#6@M8vtU%eCq8v_GlI0GkR1cN+d zB!d=X1cL!%G=m9a4A?E80Fh_lW~gSU0jXp#WvFGS14R#mDcF4=SLra+Gc+(TfxRyU z^1cuQ8#_ZII0W?A85$WG85n*r$TBoBFfgz%FfxcTa56MAw1C2(o`HekKLab+D?!qG z8Q6W9?X<Qr*g!oZy@<h9OLiNBgMh+f2F?~{#^wJ%%bKytf;=b;l~@9mc&j7IswK)M zyN$sm80^)<IvW@m7$E-CV&Gz6V2o#AWlUgTXG~<^WlUlaV@zg9R%1+I&}2+yuxCtT z@M2722w=<r``d$ook5d9k)ajrZvh4ehBk&8237_Jh9HJ^aFPJAIv8pg7#Ua@d>J|! zx)_)k*crURA;rwV%izk;%}~R@!caW9mq(?(mmv`vb72gu;P{o>&EOHao53qmYX^hR zc80+13_(8H+ZaN(F+}cQh*<+pEudrzNgX*1!i>3KmqAj8977-26~YYM4E+of7#NX4 xmziNASob7`$qWn(d<;wsQ=}Le8D=p|VPIsK!!VD5fq{#Gkzqc=LWac*k^tC^|2Y5v delta 1671 zcmZpcJR-$)>ff$?3=9mm468PB6*AR}XC;;;>gOcprRxWm6lLb6JC$bUq@)&cG3YTc zb1|?p81XO|Gng<ku;rxYrI%zdGB9gsdV(a(co@tXEEpNsk~0#E97`A(STsB}ow*pS z7_8YDY<L)K8SEGtgb~I&XCxLSCYPiZF*5LE7KdkKmZTOJC?_VTf^<4-MuBW};9+oN zaAIWOD9MMohLJ%;WAc6`(GYe97aj&z1~*0q_RM0ZoW#6ruuH(YJa`y98N3)7*b)m0 zQu9(68Dun^HGL2^LyUrY%o^l&A07r@2EWP1%<3!wj0|Fv1=+>i*cpNt8HBPx!I7D- z@0OX98kCv{4v7$kP<Dne9)@rRO-2UR(2~rYVnzm@^whl6qQsKafW(pvE`~scNFD}O zhN#JQEaKc@TnzpUF(7{I<o(PNhW-rkJPZk7j}@gRruby$rGi|M#KVvb5@abU%FN|r zNM%T4XGrH^$Y99aEYFh1$XGkMkF}7Ov$!B9vm_+7qJ)t_W3nTQ@Z>%=aV?he{Gt>_ z2F6TA21ZXt2DV~w<S{bv=9T6qr55?8h36Ng6f-giM^FC9BI3YQoW#f=i8D+X8CWy( zQc^3}89EplxKlFAGE-7hAXc&#mn0UIOkU3>!^xP%$iPyZS(Q5ZC7TnMYejNuK}lwQ zUh!lNb_2e-TnzIV=Cd;_;9<~VSU5S2{fOjZMh0d^Mn*;k9?!hI)FS7c#Ny)AVs?gQ zlf5~#SXMAH$W8X+kc(ktVDrh(&n_)sP+$mQU}69PHU<U;Rt7c(Musc~1_pfwMg~TZ zh}L!n#*GXN3``8!3=Cjt21Xu+90mpk9*6>lT!uUb1_n-se1-xBCWfrZpE-={L2Bg~ z*cliYMHrYEMH#pm#Tf(`r5J=6B^X2)B^e|brNL%sF|aU*Ft9KbG88c|GcYhnF%&bD zfNhgtC}k*PU}WHC;Abdjs9<1XsD#?d!~l}3Vqj#bW?*0tV_^EvAk4tb&cM#jP{Yn3 z%fQIaAR@}bPzN@qo`DmTh(NxYypvNG>@Y5nj~P`N_!-r}jt~R!8DyYV^E2==G%!>! zFfwp5G%_@SbTTk7nlLbfyu(l+y_bRAcQ=Dx<aP!FKV~x)W;0e%R;_IehKm?NwM1FB zF_`XPu$;-Ds=JNB-il3<Z5xC0ECvxBQ5H$I;1-s8Mwr&+41Br}_1hTS!y!hnq%2_I z))8d^=?!jSWnBJ$h0X>B1_owu*gG)@FfcG`F|aafGw?F%FbFW}GRQFMF=#OAGw3lI zFqknKGT1O0G1xO2Gq^LFGI%kXF@!Q&FeETqGGs97GUPGZFw}!0&VzxSL61R_p_!qC zfsH|!A)29up_PG^fq|ibp$#1TAXYm=D+40~D?>IzBSQxR69X?pGD9ar7Xvec07C*p zH$y7}3pfH~7}!7&z{bwN&dAQt!_J_`$jHE8%)}-1i-DDalc5(Dh7A81SnI)o7z7SP zW;;-@K|@e_5reIk>^25d0fog3oGr|Z%m06tHDi+%Wm&`^43$^{m3XTo%Bm&GCcBNn z8xl%~kwQs}fs28G(Sd=L(UF0j(TRbV(V0Pv(S<>c(Un1yG1iU2p3$Abi_w`OfYB2i z`=HR!WKd-2V`ybyV-R3)fQLp9Lq9Y$f*2-1L&KM0A~-bI8N3-LF|;x;Gw?FFGE9bq z#^ht%D)mzsGC|pZfq@~6ffbyx<aRUoNA6|_jMUn}5WJlsVmm{$kM=f(xNQuHI~Y>d zfYT``!$8udFM}|nAJ}D(bScL$73>OO25yFF4AU7H8D=mrFt9K%GKexTGt30*p2aYm ifq{X8fstX32m>R-B8DXl3=CWhj0{T|mNTqmkOTlQ^f!0_ diff --git a/src/Task9.java b/src/Task9.java index cfdc631..3ee5cc7 100644 --- a/src/Task9.java +++ b/src/Task9.java @@ -1,7 +1,4 @@ -import java.io.BufferedReader; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; +import java.io.*; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Files; @@ -14,25 +11,30 @@ public class Task9 { Graph g = null; try { - g = new Graph("noder Iceland.txt"); + g = new Graph("noder.txt"); } catch (IOException e) { e.printStackTrace(); } - Objects.requireNonNull(g).loadEdges("kanterIceland.txt"); - int startNumber = 0; + Objects.requireNonNull(g).loadEdges("kanter.txt"); + //g.loadNodes("noder.txt"); + /*int startNumber = 0; List<Edge> edges = g.getShortestPath(0,3); System.out.println(startNumber); for (Edge edge: edges) { System.out.println(edge.getDestination()); } System.out.println("----------------------- Dijkstra Done --------------------------------"); - g.loadNodes("noder Iceland.txt"); - g.readNodeInformation("interessepktIceland.txt"); + g.readNodeInformation("interessepkt.txt"); Node[] listOfPlaces = g.getListOfPlaces(0,Byte.parseByte("2"),Byte.parseByte("8")); for(Node node: listOfPlaces){ System.out.println(node.getLatitude()+","+node.getLongitude()); + }*/ + int[] array = g.fromLandmark(3430400); + try { + Utils.arrayToFile(array, "testOslo.txt"); + } catch (Exception e) { + e.printStackTrace(); } - } } @@ -154,6 +156,7 @@ class Edge implements Comparable<Edge>{ } class Graph{ + private final int size; private final HashMap<Integer, List<Edge>> adjacencyList = new HashMap<>(); private final List<Node> nodes = new ArrayList<>(); @@ -162,8 +165,8 @@ class Graph{ } public Graph(String inFile) throws IOException { - int numberOfNodes = Utils.readFirstLine(inFile); - for(int i = 0; i < numberOfNodes; ++i) { + size = Utils.readFirstLine(inFile); + for(int i = 0; i < size; ++i) { adjacencyList.put(i, new ArrayList<>()); } } @@ -268,6 +271,7 @@ class Graph{ public int [] fromLandmark(int landMark){ PriorityQueue<Edge> priorityQueue = new PriorityQueue<>(); int nodeSize = adjacencyList.size(); + System.out.println(nodeSize); int[] pathWeight = new int[nodeSize]; Arrays.fill(pathWeight, Integer.MAX_VALUE); pathWeight[landMark] = 0; @@ -283,11 +287,11 @@ class Graph{ for(Edge edge: adjacencyList.get(nextNode)){ edge.setCurrentWeight(pathWeight[start]); priorityQueue.add(edge); - index ++; } + index ++; priorityQueue.addAll(adjacencyList.get(nextNode)); } - if(index == nodeSize) return pathWeight; + if(index == size) return pathWeight; } return null; } @@ -329,14 +333,12 @@ class Utils{ return currentDirectoryPath + System.getProperty("file.separator") +fileName; } -public void arrayToFile(int[] array, String fileName) throws IOException{ - FileOutputStream out= new FileOutputStream(fileName); - FileChannel file = out.getChannel(); - ByteBuffer but = file.map(FileChannel.MapMode.READ_WRITE,0, 4L * array.length); - for(int i : array){ - but.putInt(i); +public static void arrayToFile(int[] array, String fileName) throws IOException{ + FileWriter writer = new FileWriter(fileName); + for (int j : array) { + writer.write(j + "\n"); } - file.close(); + writer.close(); } public static String[] dividedText(String line, int number){ -- GitLab