From b438aae248cec84b77508b67b03467038e9c9224 Mon Sep 17 00:00:00 2001
From: William Chen <billyskc@ucla.edu>
Date: Fri, 17 May 2019 15:11:49 -0700
Subject: [PATCH] minor changes in analyzer

---
 .../__pycache__/data_analyzer.cpython-36.pyc  | Bin 6989 -> 6839 bytes
 CoLo-AT/data_analysis/data_analyzer.py        |  16 ++++++++--------
 CoLo-AT/gs_ci_journal.py                      |   2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CoLo-AT/data_analysis/__pycache__/data_analyzer.cpython-36.pyc b/CoLo-AT/data_analysis/__pycache__/data_analyzer.cpython-36.pyc
index dffc9d42f386adb855d92b044eb516afee063aa8..a389a7e49c27d97a6b79803c7c08a5cd8d519b3c 100644
GIT binary patch
delta 1193
zcmZXSOKcNY6o!56*dEU#!A)W(4i6`RkRgSD64DSUFP^Ftk``!@l9plYxqyxBF=wt(
zf~*E9Yov&~>4E}Mmt7$*psTJB8|aGFAjGoGqEe-9s<x;-XKaE{ucgob{O3P2bI+X@
z6OWIoV}_wV=zsIo>d+%~Ji=z=Y~;zhR*X6A8;phOS~2c)w3OoP2$YW1WJ|>zy`>cA
zqn1iIole&s>NYUh9k>SGr<pX0?~+FGeKJv0os^TNE)kNiI}Q1L+Yj<~bo|qirJTp%
zrY#C?CF>MC0kvE$xL6s?x>XKA#T)f_{_9)%Vy&EYuVh{7@!N9T6DIQ`B{zTTp!_Ym
zbMOCJu8sxkk6Fycu6b2E&l}6Jql`_;&G<m7O=b9t1`O+w*1vonpJS<pq5R0^>I}E0
zZG`c~V~#GAI&M=Wh<%}!YoLpxLl@a}>ygbc==D%hmBZ>YZ7389!G46P$-h)L2|8*&
z;?>Id^1K3v<%TxT_RFUl>=~x4NjN|uLjb<Bg@dr5R)Kx;OWkKxdBi9*?is&?*FU4=
z=Y(^F^VAcm)XEopt;}t&2E5EG0wPolvSXyEVJq;cYb#0~wQj{oT_A)JW?Qr8!~1Xj
zi_46|I3~V;2?~FL@Dm)LO9#fmAajy%3}Ggro%A$ehA>B%Cmbi7AkYKhB;l02nEaOA
zZ~UI@2(z)fUFVo1&v#u~NMX^`Ax)VcLWa;s*hSb)*n{vDj|*$9R47B1E;UieU$?3@
z*kup;DK#M9c8zwAko=f%kT6KtE9bipuvd*z_b6kt@?L7->=gNn1Uk21OHe^&CW3wW
zNgKd&Y++l#^Da0XpiIH*gc2dx`Ds#Tq?SIy{%K67mszZNc=EfRky!Ke<j+0(6plHQ
zfg}I!Id;)+&*j`zOSqO@$zOBfDi(45`O~&A!_CtbXq)ZL(Ql8)kBWjQakz{{SVrJi
zCjk27?cVHomdpW!sk}cRUk5km3ae!2c*%ocL@N|j2$$r`-eIQ6x4nyONiJljGKa|y
vhI5$|%>`}{zL5_zhkBRPX{BH701YiO;YaZksjm6qN>%=v8DeSK(KquS9;hBc

delta 1383
zcma)*&u<e)6vubg_}A{*i5n-eofMq#BiR6nB9fL+S_A!wL?HyI)IwO+-gRPQd#$%)
z)S#6j)#pf+=2BIvs$OXit$YYQ^&e>efmK!YQlW?=mmWay-q=uDap+k7?3?d=pLgcH
z@$T|(Z)hh{Deau`$Bp5cpR}b2yD3VM``cPQ>7<>4li5+366p1q^IDh5DDI35qJ)zj
zMC6?qcn$Q9O5Lc(9b*tBoUuVf-pQA|<FE1_d&&Izz?`gWPR_~i;5N8Y*SiW+9Oa5)
z?iXL|`(aV9xGnBNvEf!ZL=;7NfL|PcmP|E_G`vcfE|<N}E$&%%tFq~VI38VInY~o@
zUASZOn%62iHJ?ML+>w*(UfTt!FZga{{jPDb(=2+`qDKjL=fwBX$;<z?Y@CqeQORUs
zY}0Ss71vbdRv?QT`9E>*VRV_X(_$(<T~O1i#_*%2Bma4dPvd9U$==uTpV>B#*Aqdy
z%j7fFW#fvBhPo`LPz`x3VAx8%i*4jF$KYCkE#W$GLK&zjREMRC?5jcKOBLn=rEUa9
zFdSrpRFDpaHX=dPN$*7QB1p9=eoWreXYh0|OGiuzSMv&?+G<0TL<12<{7w@);I?2<
z{H2{`vtmYv117D{5ss26#R2POVa+Y*wBU%iuZIkTFly>F>peCesM~8~zCyT4xJGG_
zR;PJ2)SIsDcff7p73ddSdY7Ij?9qLYS$lF@l)4uq?Gu8EF!#YLet+*N4l@qR=(q-N
zlKCVeOuG19x*jg1NL(SDLYNsyQ(PjPA)F(;OL&j)K7n2c9}qqiyTf0xZ+okmA(btO
zTO(_%DtaR~FO1`=X+VxldBOx?lCYm}fKWt)3E$<`R-@L0DVplMR=I7pZLpg@Oq1)N
zSkEqu9;5I$VV-b^a9DhoonycEe$6g0c2+zdo&NYO(pL%8J9#E(V`L`f!NQCUU^zCo
zEpRIyI4*!k#wMXfkVpTBqVwYR*dlw<`)2Gj7VB46JQ+V4>$gwL=ME<}&}TBJitD+R
z3owQ=QgHnJ%ZuRoALkCrX1ZVS7j+4vyv7?YlyMPmAn>|zfJyN%S6rfkz(Gn&{L_}u
z0I%$Et6`Vjh7YnX>tsw2Zi!NUmKkC*f011lyZKXvMUrJj<U6Ps;1jlmUYIYeYHuf|
cv?0(@GLvBxFGhO{PUB3h6^^i+*ebm93`&zeF8}}l

diff --git a/CoLo-AT/data_analysis/data_analyzer.py b/CoLo-AT/data_analysis/data_analyzer.py
index 2de013b..1d5064c 100644
--- a/CoLo-AT/data_analysis/data_analyzer.py
+++ b/CoLo-AT/data_analysis/data_analyzer.py
@@ -49,27 +49,27 @@ class Analyzer():
 		fig1.set_xlabel('Time[s]')
 		fig1.set_ylabel('RMS[m]') 
 		#fig1.set_ylim(0, 6)
-		fig1.legend(loc='center left', bbox_to_anchor=(1, 0.5))
+		#fig1.legend(loc='center left', bbox_to_anchor=(1, 0.5))
 
 		fig2.set_title('Trace of state covariance')
 		fig2.set_xlabel('Time [s]')
 		fig2.set_ylabel('Sigma_s [m^2]')
 		#fig2.set_ylim(0, 0.08)
-		fig2.legend(loc='center left', bbox_to_anchor=(1, 0.5))
+		#ig2.legend(loc='center left', bbox_to_anchor=(1, 0.5))
 
 
-		fig3.set_title('Observation distrubution [operation/sec]')
+		fig3.set_title('Observation distrubution [# operations/sec]')
 		fig3.set_xlabel('Time[s]')
 		fig3.set_ylabel('Num of obser') 
 		#fig1.set_ylim(0, 6)
-		fig3.legend(loc='center left', bbox_to_anchor=(1, 0.5))
+		fig3.legend(loc='best')
 		#fig3.tick_params(labelsize=14)
 
-		fig3.set_title('communication distrubution [operation/sec]')
-		fig3.set_xlabel('Time[s]')
-		fig3.set_ylabel('Num of obser') 
+		fig4.set_title('communication distrubution [# operations/sec]')
+		fig4.set_xlabel('Time[s]')
+		fig4.set_ylabel('Num of obser') 
 		#fig1.set_ylim(0, 6)
-		fig3.legend(loc='center left', bbox_to_anchor=(1, 0.5))
+		fig4.legend(loc='best')
 
 		fig.subplots_adjust(hspace = 1.2)
 		plt.show()
diff --git a/CoLo-AT/gs_ci_journal.py b/CoLo-AT/gs_ci_journal.py
index 91ee021..3a07078 100644
--- a/CoLo-AT/gs_ci_journal.py
+++ b/CoLo-AT/gs_ci_journal.py
@@ -22,7 +22,7 @@ from ekf_gs_ci2 import EKF_GS_CI2
 from gs_ci_bound import GS_CI_Bound
 
 # dataset_path = "/Users/shengkangchen/Documents/CoLo/CoLo-D/CoLo-Datasets/official_dataset3/"
-dataset_path = "/home/william/CoLo/CoLo-D/CoLo-Datasets/official_dataset3/" # for desktop Ubuntu
+dataset_path = "/home/william/CoLo/CoLo-D/CoLo-Datasets/official_dataset1/" # for desktop Ubuntu
 
 robot_labels = [1,2,3]
 duration = 180 # duration for the simulation in sec
-- 
GitLab