From f445d976f399386fa2c2b0bc65235b1ecb21ab2a Mon Sep 17 00:00:00 2001 From: jozua12345 Date: Tue, 27 Oct 2020 09:15:07 +0800 Subject: [PATCH] simulator version --- src/algorithms/Exploration.class | Bin 7072 -> 7072 bytes src/algorithms/Exploration.java | 2 +- src/robot/Constant.class | Bin 1622 -> 1627 bytes src/robot/Constant.java | 2 +- src/robot/Robot.class | Bin 13321 -> 13321 bytes src/simulator/Simulator$1.class | Bin 466 -> 466 bytes src/simulator/Simulator$1MTFastestPath.class | Bin 2656 -> 1847 bytes src/simulator/Simulator$1MTRealRun.class | Bin 1127 -> 1127 bytes src/simulator/Simulator$2.class | Bin 542 -> 542 bytes src/simulator/Simulator$3.class | Bin 542 -> 542 bytes src/simulator/Simulator$4$1.class | Bin 1205 -> 1205 bytes src/simulator/Simulator$4.class | Bin 1301 -> 1301 bytes src/simulator/Simulator$5$1.class | Bin 1114 -> 1114 bytes src/simulator/Simulator$5.class | Bin 1295 -> 1295 bytes src/simulator/Simulator$6.class | Bin 534 -> 534 bytes src/simulator/Simulator$7$1.class | Bin 1050 -> 1050 bytes src/simulator/Simulator$7.class | Bin 1280 -> 1280 bytes src/simulator/Simulator.class | Bin 6135 -> 6135 bytes src/simulator/Simulator.java | 8 +++++--- 19 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/algorithms/Exploration.class b/src/algorithms/Exploration.class index 1adeb24b38f05c2bd8c728491ca8e06ef4ec2ea4..e006a72a4d5d07a6ec58f8dcf0d86fc7ce4edee0 100644 GIT binary patch delta 14 WcmZ2rzQBCLIX*__&FA?p@&EuVum!9D delta 14 WcmZ2rzQBCLIX*^~&FA?p@&EuVwgs&K diff --git a/src/algorithms/Exploration.java b/src/algorithms/Exploration.java index dfb052f..21efe99 100644 --- a/src/algorithms/Exploration.java +++ b/src/algorithms/Exploration.java @@ -31,7 +31,7 @@ public Exploration(int timeLimit, int coverageLimit, Robot robot, Map map, boole this.map = map; this.limited = limited; this.firstMove = false; - this.updateAndroid = true; + this.updateAndroid = false; } public void run() { diff --git a/src/robot/Constant.class b/src/robot/Constant.class index b7f3eb7f40400712690711aa14acc3c4223f7a1b..8f9d41b1e550f045df895e498ce57f08654dfc2f 100644 GIT binary patch literal 1627 zcmZ{l*>(~^5QhH-2@}K^;}UU;`>t`{5;dJ!V9YRsGn2)2gortK5Y8dQE3bVGpFzFw z94~wTAIjt3K}Z|pO-+AQUDZ|9)$sGz_a6XmU?qnP{9z0s7{)eKvUr?Dm_;NoY`LLr z#%|yXzrC$3reDYf516pLky27xi#k>3dEYflO4fZA(SSG4&{xOoasq9Pm2r zTDv>h&*S8vtSMGe45XKY!J={;>$4enigyeGal>FuBiE|>#0;WXZM;TBJRkZ4#cS5> z`i|?naetTi_=#;?cXNVpQHGYlnD@5&zB<{gwpJ#iZl}>&nKCfnk3K8SIRgv**q-gg z2AD@~{ix6_mdHy2qo(xS*--MRUgHcrVT(6w6DJIOdOT%=|FQLgKikSwkx^ve`Bo-J zx}Jd-Oi3MVCzgz*ftLa!8_Ww_G>{1F>fMRGRPh2P%ds->iaqG59T~-T6ekrKmkd;U zA+1D)w$G3?a@lf{C=Ok}XkeMGjOCo2R9utYunn-|qgv?13Vdqo0z=b{R-^ksAbs{6 zd%4YQzovGl*J#!KwRg38C$83-)ELvt%|APHQG2bkTz48uKbYUk>aOxAqLjxQjOVcr zNr{RQffAt- zu@bft4n=xi`H8YJRFr`Om+|>ROE|`tp5fdcK>^#52dgBdFhbs`@hEwh#>zgX@ow@S zjrWq-6~-!Hzosvc4`_Uld`M#z_wXh@qVWXnM>Rf1KCbZz@=2T;)Nz`8M&q;Oa~hu~ zU(om>`I5$$$&(siAz#(_8u_}$H^?_NzD2&R@g4GAjqj1CG@d5k*Z2YXp~f?0sqrk? z)Yu~18aup8p(d5mMuomkfa*)K?aMSAn*5k~gt YnnIaw{K@2Mh|`pvDM0;yh#YqJnY51s71keFK$dGLwuqo_Jz%P6%Fk?Q8f9 z>V@Zc;RE-?Em_MV6fnyEl2x|6NMIziywDHgu;d3(97wNd#bt+H!V%bG zwwi05YO}LcZLBA09xDFhAyQX8*Q5iJH@Pw|Q+ zJD%-$PPDm8eEh@?Zn)Wguq*?nIqbfzzOPOoZwSl!2H%=&EfQMphWb6&aNb zyzGW7#4@lvhOCmy1v?I-!10O(YHVdB7p%DAnCymSV3mE)LdON)qn7v3H(PJkJNE_B z=O@^_U1sZ5BCyx3HxqCDT`g%x)mnoZV|KOiXXilJT5qo=c3tUvqdTSUDhC_I91@J= za1bM`^zY$f7F$>9*WMtMLqZR^xl*`x-wW&uJ{l z^BSAvg2oo_Qm9F#Eb%su@hkYvOn!s-%!PnM*|(ug!@$Gd*0Bv8ko|(xSERRZ9%SSN Yx~AaLjX#-O^>LcAb9t!0j)A%SZ^2Ls8UO$Q diff --git a/src/robot/Constant.java b/src/robot/Constant.java index 9e4f586..62db4f0 100644 --- a/src/robot/Constant.java +++ b/src/robot/Constant.java @@ -10,7 +10,7 @@ public class Constant { // range of long range sensor (tiles) public static final int SENSOR_LONG_RANGE_MAX = 5; - public static final int SPEED = 1; + public static final int SPEED = 10; public static final DIRECTION START_DIR = DIRECTION.NORTH; public static final int GOAL_ROW = 18; diff --git a/src/robot/Robot.class b/src/robot/Robot.class index 45e87755adfe9e782543be60577d7e13d985c9d3..d5dc8a55c03796bfd23c71a2ebbd945a0a20f7a4 100644 GIT binary patch delta 21 bcmeCo=*-w~K#-AZ^FcvDMj&-r$V?FcSN8`1 delta 21 bcmeCo=*-w~K#(zI^FcvDMj&-r$V?FcUZn@L diff --git a/src/simulator/Simulator$1.class b/src/simulator/Simulator$1.class index 3e4954264582c018fb4417cfa11ee551391e4c9a..b90dd65cfcfbb2d8084fa3c5226ec8ff9137b5ae 100644 GIT binary patch delta 23 fcmcb_e2IBOJtO0X$qkH}te+W}8NN(j$EX4TYexuP delta 23 fcmcb_e2IBOJtO10$qkH}tRESe89q&3$EX4TYYhlk diff --git a/src/simulator/Simulator$1MTFastestPath.class b/src/simulator/Simulator$1MTFastestPath.class index 8bd0d3e6c94c7f427bb15a81c8efd73fb63f5741..b8414c93162d01b7ad70afdad2d18f5386dd73f8 100644 GIT binary patch delta 837 zcmY+D-&0Ld6vsd3{@Qgqa=VD6A3}7yTqPpE`++DTBtJVPx0~Es_a4+!{{nMfc!(MP zff&xc!;H~*As)?mGamf`#v5bpY6dfBebbaD z*`cAyWIH=ecG0Y@-6nfz(Xdys&!mw38V)E9njGSA0j(x&v}>oMkRu#b95ac~SU{)N z$2FWNpiAp+larh>rHtxPoK~E@|0TWF?3f%H9(R)IR911$peQly^x0EA>7?7B%G?LW z!|C%DeXO^r)=)vEMU{pN^eZk}T+-poTv1%LxW<5m&7eW4J(fsklFrDjZ2X9wb%wJ} zkL`@;V}>lQGi*?tNe`x-c$?IA?3AOpVUb|Oz=$c57Ngv>7&E!0NLi#AcW3=ut0u@; zOprD3#i}hFZY%Cs+@;Q9Bb(eG{sA`;`0h4`qV8O%xgz$YS23ZnZI42VeY7}U6*Rn7DU@r&^b&dAy$OdgAt z(z3TkqEq7O)y_Ntk6@mVd>+c9;5CK)5*0s(*;OBXfnUVuQS{$RcPtzUFOz5qU-K-R zmBS2l*-8}C@PrUgWu!Ubl_$nqT9~7ichpK!K$16$Y@tqbmdKd!(Tv*bBgG!eyQ49G zW1jF!e9>57(egj1BHl+l`elMIpP{O=i z;756mpTg~O8PTQ7sE}MkvVu{MwSOB4Ed*!&;Txb{(tOg*)&;$dxaffV1`YIzWy+3n J(Pv~pe*oh$kJbPH literal 2656 zcmZ`*X?GJ<7=ET{JLz;<+W?h<)rcrvQc}RZh)O9KN!m&Z6DI{2PGVguwJNMm}JHP+){aFCl;<$z$MC%Yn zOo9OocVbY(5bl!L77cL>OR!bawy7A=pdl*3-F4WG9e&)S;a=P)Dfj#FfLtF`VfZns zA%UbH!jCbHqEjlyHMGK%U}qgBkglN#{MFBD+-3Z*RM>uGH9Q2z4_6BC2IvX0`kxSewnVxw7b zIBsTgX~VOfmC{Ydq~A)UZI^Om!W*}fDxTKy46f5zF$AlyTE`j*p2c%2p4ah$B)^E4 zRJ^R?6}+nBHN39l4ZNvfX~NEAa+aAeWGKRYvz_3^(zzj?3rhKhmDI5p`lh&+&zhFL6}Cr5EHD)3`oorjx>J(Y>Q$px5$jLgzL+;3ThnT3g&l?X_aKECsW4A zhS{QIP)lgB6E`_VcHB%*&-wN?ro8YRndcj`1~bBX%G#EYwbN2+*@|P zEY6ko9g^l}x64|jf-7i-Eb9Mh0;(#H-873n!y#qosB%%UeN8(�lXs^}@)Ip%~dp zGCj=7LuneJ+3cjaotTg@X>>$Fn3E#LXc{RFkjfcT8Vekd;-Q=&BVRF_N+YOahl1Aj ziX5Det@PLDNat(XBN4f4D`YWh2_mf6CCkDr4q9XH8>>8GsRKH@r;d{@2MK9-%`9s9&qK|_PYOwOr=e{>h5BgM$Sm~e2{Z&6^SGodk0yyX6DK{7 zKr9qkn8%_$sGUJuD9}QDFPcMvOACm1VJeHoo zWed@k#}!g;kaB0B4@i6&@d~zq?xsLf16i8!=Pa%|Mn9jz+jtLG(ktolC>9eQL@f>> zz`@;$!+dvypAIt&>t_t)m*~Y&UIAZWGrqk zcpqmNyR+o@5hw8zZl;E7Q2RI5sObG0OH{1=3oTXW&<&r8TS!!~4vLCf{kV;1t7+x! ze0c2;%G9Nq7nzw2U4i9!TpjBS`Bu;38kxaRbrJK?|I=8(1hfY_^5`svsw==?O5B$R z6Vc81T*!6{#PEbco#82iHpBDDf0#{x@`fyC0BWTU A^#A|> delta 45 zcmaFP@tk8rKQrUm$rG5vMej4PGdy76Wq8P-#PEngo#8QqHpA1&f0#{x@`fyC0BKbY ANDN7-V)#4x6Qd3QY&!_& diff --git a/src/simulator/Simulator$3.class b/src/simulator/Simulator$3.class index a9d522284c62d661c37c180b5eaccd507acca84c..8a87fd3114635c73114ba3f1f480e73384ae6af0 100644 GIT binary patch delta 23 fcmbQoGLL1$9!5si$$J?MSUDKD7&#|@V$=ZuP@M)0 delta 23 fcmbQoGLL1$9!5sy$$J?MSlJl37}+O(V$=ZuP-6xL diff --git a/src/simulator/Simulator$4$1.class b/src/simulator/Simulator$4$1.class index f3acc6a5a87bb0cbdcf3108a2145370eb57c8bd8..ba1f4553871237d7676b4a87a6f29e0ab2c32d8f 100644 GIT binary patch delta 39 ucmdnWxs`K+01KnUWI>i_Q7HxvMrj5CMi~ZiMp*`JMmYvkM)}E&EG7VoCi_Q3(bPMo9(%MkxkyMrj6ZMi~ZEM%l@YEG7VnHU;kh diff --git a/src/simulator/Simulator$4.class b/src/simulator/Simulator$4.class index a47cf0389e6acd8b565b2be333e1309ec17bec72..450fb7cb72b633147ee09b45eb43cfceb9f5ed65 100644 GIT binary patch delta 59 zcmbQrHI-|F2@50tWK))IO(6z8MqvhVMiB-jMo|WBMll96MhOO2MkR(|MrDRbMiqtx OMpcGXMzzT=S#$ssHVFFw delta 59 zcmbQrHI-|F2@50dWK))IO#uczMnMK~Mj-|zMqvhRMiB-xMll9gMg@joMn#55MkR&> OMrDRnMwQ7gS#$spstDr% diff --git a/src/simulator/Simulator$5$1.class b/src/simulator/Simulator$5$1.class index d0b0782d949ef2a7deefd4999fa196027dd34737..8dad433c0eea46993d00f08e7cd83d491940a68c 100644 GIT binary patch delta 31 ncmcb`af@Ta31&vq$tRfuc+D9&7%dnS7%dsJ7_BC&v6uh=l==r+ delta 31 ncmcb`af@Ta31&v)$tRfucug5N7|j?I7|j{97%e8Nv6uh=lynDB diff --git a/src/simulator/Simulator$5.class b/src/simulator/Simulator$5.class index 224b3908d3e843cbca832674f653400d2f925fa7..d72dab6dea43ad8ecf054e245c56728419867081 100644 GIT binary patch delta 59 zcmeC@>gU>^$HJ&HS)Zj_Q=fs4(SSjm(U3uj(TG8t(U`%E(UifJ(Uu{Y(T*XK(ViiJ O(SaeA(Q)!)799XGZVE2| delta 59 zcmeC@>gU>^$HJ&JS)Zj_QSUnlI7`-OHV$=ZuRhb5; delta 23 fcmbQnGL2=!7Dh(b$y*r>Slt=87(FJxV$=ZuRbK|8 diff --git a/src/simulator/Simulator$7$1.class b/src/simulator/Simulator$7$1.class index 14b3ffa5467b43d3ce96dfc5ca8bb9982e4fb9f4..c0121fffca9e56936d4d307da2a87272224a50d4 100644 GIT binary patch delta 35 rcmbQmF^glvG-k%I$AZ diff --git a/src/simulator/Simulator$7.class b/src/simulator/Simulator$7.class index f5e375edaefd42d3985da7bb477caa77f5a5239f..a57776268b55c2228eba9130d9fc5d1fb72f01dd 100644 GIT binary patch delta 59 zcmZqRYT()+&%)?8S%IZnGk}4QF_1x=F^EBlF_=M{F@(X4F^s{LF`glqF@YhHF_9sG OF^M6SF?sS8799Xj<_mTJ delta 59 zcmZqRYT()+&%)?4S%IZn(~p6V(Vsz_F@QmdF_1x&%0799XhS_@tP diff --git a/src/simulator/Simulator.class b/src/simulator/Simulator.class index 8b0cba778a6abee3daef5b0acc3416fc93d1ecb5..63986b2ef03bde4592f9da142537f7601bda6851 100644 GIT binary patch delta 392 zcmWNMyGs>t97oSd;#Q)Pc^krL2oof^1VVy?=wKM=5H>`E5Tco0vdE+|%SSI?B{wVU zmT75d(e;I3iIs~(TR8OxG)hZKIMi?dp7Z^jt=Lv<=GWfS8|>jXQT}p>Z3;}I$eom$ zL8V#LSU{~uX|jT=o}kMr2CQbpdd6&E%Ja8XeT%AqQ`D}?P1tEB)!Y1_Zas+6F%Uby-eFj%0cGr zXTbrMeaKfIvE~p-pq$7*>WD-r(?n|D&&tO{946BzM14xG&p7NzsC>>bUxZD`Q2LSz zUxiJhq4qUr9pjwiH2Q`X-_qs;9Zn{GE^P5q3{0AU1U#0*6 delta 392 zcmWNMy-U?`7)Q^k;hLgQb{(W>2u*~z1VMpAC>ofxNDa~;#MLr0r7$b-HG9#rz+YD8 zEz=ZJs;efXVk9jMZPDZ(&=hWUamw%hob!B6CXq?Z|K5G>57}%IC&K}@C{>QSlN07p zZ7ydmq25xOt>lJP^jX7@rx`WLgbmEv$buJH@e{Wph-v=Wq8_cG*gfZRC25 z<6fu2c23#B8E;bSE$X~Y(k@!UsV$ngC ze8`$ZtoxYnJ|P8E5c^M(Sd4Ow()kPxT jur5Vc;w}3>2Vyx8D}h)I#2Q6@3ID%_>-A6n;_lc6mlt02 diff --git a/src/simulator/Simulator.java b/src/simulator/Simulator.java index 837a986..9d85f0a 100644 --- a/src/simulator/Simulator.java +++ b/src/simulator/Simulator.java @@ -161,7 +161,8 @@ class MTFastestPath extends SwingWorker { protected Integer doInBackground() throws Exception { bot.reset(); map.paintComponent(map.getGraphics()); - bot.setRealRun(true); + //bot.setRealRun(true); + /* Communication comms = new Communication(); comms = comms.getComms(); System.out.println("Open comms in fastest path"); @@ -177,16 +178,17 @@ protected Integer doInBackground() throws Exception { getWayPoint(msg); } } - } + }*/ FastestPath fastestPath = new FastestPath(bot, map); fastestPath.run(wayPointY, wayPointX); + /* try { TimeUnit.MILLISECONDS.sleep(3000); System.out.println("Reached Way Point"); } catch (InterruptedException e) { System.out.println("Error in waiting in way point."); - } + }*/ FastestPath fastestPath2 = new FastestPath(bot, map); fastestPath2.run(Constant.GOAL_ROW, Constant.GOAL_COL);