From b85ba1fefefceb42a9ad4b51af95e72e37247c2b Mon Sep 17 00:00:00 2001 From: Patrick Rathje Date: Wed, 3 Aug 2022 15:18:05 +0200 Subject: [PATCH] Smaller tweaks for graphs --- out/current_per_functionality.pdf | Bin 27598 -> 27600 bytes out/export_usage_seconds_per_day.pdf | Bin 28082 -> 28082 bytes out/tek_check.pdf | Bin 29824 -> 29825 bytes out/weighted_consumption.pdf | Bin 28094 -> 28094 bytes scripts/eval.py | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/out/current_per_functionality.pdf b/out/current_per_functionality.pdf index 9f051b4d936140e93afc22c356d5f7ee838b1feb..d2ae39aa81e9aef0c3a4d0ff36f3b5e3368bee24 100644 GIT binary patch delta 1195 zcmX?io$jOLSTm{jV0i-WCszTVn@=yX}5^2z(gIZ<|2{jr&8_n0CKmbMt> zHcks)_J7{v+1HQd39*Mwm^nLU{)tNyb-ZWU+V8ftx2>)%$(T3y#m%hJs>L^Jj%_wb zv3vY8@rKO9$c#g;f{KM+cY8Cg?oKA z1v(2~^(6A{%?R*2YIK~lHsC_jy(M3GId}h4eP_5)w_ej>hrf^KHS45rwQ1`T*!YxJhNMgB z%KqDK@$y=+pj}(i(R9uJy!%{wJI*RzuNCj@6RRyKC{sASdY{8dho2iHSy{yQD_Lz= zDpBh-_b*%NwY#&gx36%t|6*PECv z$TXaMyRTDjpHq?l&C(zb^*J+A&j0;s@?nD5~YZ;FE=$K)OJ ze3<)B9;n%4uWLSWW(s@Eyp`Fd%lEB%|H}LH^NB&HPNdJA!c}#?KH%|f+pjY3<|=c( zyK?)lZq&s?1+7KCnH5`<6ZEgvzv6QI&9^rG!#BBI=Qr+(=6`rBOuf?CI)Z=xg}-qw zmcM_QDY!B}eldyl?~J7E8dkpE zE_1M()^~tQR`^4b^D~pB#~bP$Weh7MLZXzBMJY`c;_jlu)+tP0xPt7X2&QHRJRg^H;pr*k8qFN1R#x^oYgOKXr@l zR0x~#75z$iY*4W?RifobKF^f3CDj_yrI(*v-Zb^&l@nrbHFq}MG%tD^`@&;iL{Z?x zNz(&o%-3>C@%*?gDTIIRw*@P=C-jw_6Mm~Tmuc?4{cN$x9NSnTx3THet}8v)?Q-W$ zVi^BQrJXrmFIZ1!#k9|lIps0G+3w})s~i7uYA&q%Hu)v1C9|c0@n%&v)?^^VY_e{q z0+n7XY%Y B|L*_* delta 1222 zcmca`o$=gt#tqd>jHZ)om{jUd=LH)Ie7zO_Fm?BVk3IK=X4_@3?!M%q)4-~wD)N<4 zSLEw^%d(7Q^UmNflS{tq{Er!@AN%|v<^Pv&Z=QU4`*7VY>uHmZzIx&|=~r9&vYuaU z&$la;cBHHEhKWy7%ATJ4C1S3*wpZlwCyg_o{armJ{z(e^?Rd{uPtPsqHgWBZmlnRz+9p=3_HLr$+{Nt$_48-QY~9>;;_J+v4V)G|M`Gq=ZYlXu zTzEom-JM|J1(EZtmT778W-jR<1mM!RUfri4(KqLvfd?OKL3Q z$?5wY*KYg%?5SSWh5Vn)_uck7cx(PwDm(T}!g88N+78~Eleu?VhfZb=O1bjIJ2&|9 z`A>Uq39Ua`pI)fvxBaTSX{~a+@6(BEdQy_+PU5yJ_mL_&q4FqRI=M(~_8${9>x81+ zYnz(aPq-sgHB;mgr~0vzf%SI0HcMQOy|htJHL~r!zR^N({*k9#MhhOy?ZZb}{E!2H?r2J!W%+?w?O;gUFXF@fTzwwyX-KZD(UGSdAvq0T0XZ^)4 z!8Rc;)uj(Fwl&Ch#6J>p{LQ&Gyy7>@-SmjNy6pu|S3KU5B%{;bfA(*ji{;KwW(uin z#|%}CpKat^`;pbcM2?v$$4pI-|BP^<=cx%v+4~*aSx%(9z1V5?Q_C>;gLz%6fUwrB`hvI6|->dUw#X?_R8$)@}C-utxlx9)x6oWJAZ-EZi9(7Rg-zuto-F#e=arX zSR=S)o#a$!ZQ~W^rk$B#a&Ct2+Q|zqe@(r>%eH>=^Pd?9goMRw&l$3Zd^1?x9x^e; z%I!>3rMcc?^`|zM(iiss&MQ^<&ma|3_k8keR!e3R6Z6gLY^=#ZhUH}aOa(91mUX?cf&mC9f#U< z8(A7zpldcZ!q9AFW@dtJpplumr2(2=BQpyVgUQC(cJZdpMkeNN7C?U)niv4X!`RZ) x&B(&i#KP6d$;`sd%}&9FppsYxJ3Fr8lEk8tilWpsE+cb814AxVRabvEE&#l>?^6H( diff --git a/out/export_usage_seconds_per_day.pdf b/out/export_usage_seconds_per_day.pdf index 0a5ba66887b8c8702c0879260f4cd126b4db9b23..3b86619f51c56350ff3449cfeb35e814815861c0 100644 GIT binary patch delta 753 zcmdmVn{m@^#tnCvShRNgRZf1uv|VwwM~Z6t{*9g4Avt=A6K6Zc8=Jf^=9;K^bB=7lR- zBL&XuU-}wW8-Cs6rftOjhqonn=zsY3!K5+Tdj9-3=krbWEkD_OQ0KYQaiL}T%z-8m zGQR1b*e8~KG~JO~C_cSdI7i3I@w}3Hy)t8-#=-?_#g#%rl@odSR7JKOJ(zFlYiBt@ zpiO8-qG86GJ8vDE`CK1dONNv zw$)dgw)aa-`C2~X=*?9;ygA8yN3Jy0A9!Bk-ai+Z^f(0 zYo}jdEjvA&=fAx8gR(EPQV;l=E<5gadh1!eTd~en%>K1gFY-!Ul__iqJa?}5Q*20> zSpWTp)0871YP%L5 z`T1Pk#GC~}HkBT(R$iWuyuU5%@rVzL3c7Pi?sYxme5FN)Cfl=FGFuuLZ?0yWoC0K+ zO%}{n0MVOGvgMiL9nIWKO)Z@aTr4bH%q-2!4a|%zoGmPjTn$Z)jGSFu>=bMWDv4FF dv*Ri*Nh~UuN>UwFGUJyAe^+G|RQ#&yDF$fRkgSzRQVKZil2~yfkvUo9`FR zswq-XkT)4G{Ww#(sqV&sI-g%f^E>@o>!ysV=)^^UAtb6+USj%tzi-REtD z6q5x#b*4)=mCNw%3T0WF#y&gN%RubgVe5lkRkG&6t25$!=E&$=zpXpXqb`v<|4OXy zc5RjV+k0mncIUnH%lgctoT+VW+YH&0vJTll_`LU*b8XJ_@@IFGr$=)K-Dl1By}Gt{ zx!uiMd*a?^#2NmnH#zY3h3V;r*;zjQt<$n+#%@{O_LkS?YN(s(10S6)#Iy3HoJ_d1r9EHt^Pv7)elskW82O2#slnTA{T zotjmCtviKz>VuR1K@U|`JN0k28!6RBW_lKSSFiccI<;`o=E?SKmdqw5=9{b8CZ{l) zm>NtL%vJ!=n@zIinc@wcEX>VJ-3*Og3@n^XEiEk_om`EKjGc^}T%3#zOr7l%YzQie fRj{+;DlSPZDyb++P2(~$H?=V3QdM>JcjE#8kOoHm diff --git a/out/tek_check.pdf b/out/tek_check.pdf index af1a670b563ebbebd16190efeeb4f8a174768c75..01e2a174e65324accac17790dcba3f59586c497b 100644 GIT binary patch delta 763 zcmZp8$=LXkaYGRkqsiotoMM|hna(rUUz{+bB{-|?%@-4|X%ROzO@8*S=SskZfI^eT z<6;qW?kR4HJD)K-Zc4Tc=QUGJ)s-e(Oy_RB5K*5w|LUTsyujJB`D=bHYGU4V=5AN` zDfYe1egSW0=!&kdp87C}KRc^*?eW}K&-rG5UG>!UP;Ghf_O=Tj65A$w>XmzF_pFg@ zd5}^6>YcFHg|wBH`U@T$Hw`%CIO~PM z=Cw?pTQ4!j{@kxIQSr>76Izn9E$2K}`&hE$0DTZmDjQ!OYwjNMlnzF%U;>1w@uW1Up_3bF5Ryp;>9 z=Xb4=c~|>N>+($Pf)_U;o)x>CZizBqw64=mbLrxZcP(8{?sZh0w|W1mEwLZ|Gn5y8 zS;Uo^mr`6(l$w~!l{)zfyDqb(fyrhTjvJXkhWX_Cg$iJrsptfw>EzQzR`q5E3I-sc zkf*=}W*8V57#d=T8Jd}6h#4DVikTXlp{p}CFu*VmsMQp#E*{BZV-o`l49(^S#%N+j z78d3hVwMINjxn+{Ff*V0xY#b<*~rk+#l+3R#MIc>!o}6n!qvdZz|qy*(8bKa*vP=Z kPQiwtl2`>hJFeoA#G;alqSQ1lBTHi=3ocbvSARDy0EO5cX8-^I delta 762 zcmZpC$=L9caYGRkqwz!?#m!Tgjxg8n_UaAJYJ2m=#A{l_jZKrEz3aIWaN)v|ET(?l z4HkQyQ})igXtr15x`oi1Y@vnc1EoY6+jF;cO}=uzDo}6xi?esx?P^0$rWNgeH1(6? z`v<}z)@j~HU#F$+xOsR{)ZN#GvwxjDoVWK?u`amV;8LbmTjm(NI&c{A_S@3k{dsd(Fhqp>6{EmB9(!ObHro7v`R<>Ol z7ZTjBm|pxkH}~qJpoBKc;r=x#hQA#@}|u&8^=OH8;5Z%|oxKQt$FtJK~ld zeHp`AI(I6g&Sa*xuM4sp{k={mWGX4IUbg1l<-Ve$hIhYLPni&7_AWs0-OcH4kG|Q7 zg<9VEeIs<4@$?55Hf}ugyki>Y);yP3;o2ZC_vGEhU9+m2y=>C!r)KVc@SoB4_LnnU zsd*{IB}J);xj@$BYwSAACMM>aSvhWGGMkthOny+P0H&FXPB5BGK2u~>Z)&Mv00Ihm z3S3}@fsuis0fv~NnHh$du_30Isj(@#I%AOOV51Rs7#o_KfW_jGEH*YVFvn16ZeWBa zW@KSujv;1gfZ-S;O9L~r$xn*y;!PbLos13KOw3#iT+Ez|oD9re4GfHdTt_!U6IXLL kI|UnpN@5l4?6`_c5{pVIic-_Kj4X|f%(+xmUH#p-01&huIsgCw diff --git a/out/weighted_consumption.pdf b/out/weighted_consumption.pdf index a0eca113f953c1560af68adac0a3f67fae4f37d6..31396bc7a41d4aa10b7123c3223da313588e6162 100644 GIT binary patch delta 224 zcmdmYn{nT5#trLOBW(KW3M@)*n;o*{nc|HtOpVRW44utP%-t*uU5pJ}9No-a v%uF2}EiIjmES>EXYzQieRj{+;DlSPZDyb++P2(~$H?=h9QdM>JcjE#85K2*N delta 224 zcmdmYn{nT5#trLOBlcXkw3uU+v(0w5>y41TL5U|Uue%+|DgAcv*pzKM&m79t+MH@( zeD2boi4F-bBRUNhC= 0.01 else "<0.01" for x in xs] - ax.bar_label(bars, padding=3, labels=xs_labels) + ax.bar_label(bars, padding=0, labels=xs_labels) # Adapt the figure size as needed @@ -225,7 +225,7 @@ def export_usage_seconds_per_day(): bars = ax.bar(ys,xs) xs_labels = ["{:.2f}".format(x) if x >= 0.01 else "<0.01" for x in xs] - ax.bar_label(bars, padding=3, labels=xs_labels) + ax.bar_label(bars, padding=0, labels=xs_labels) ax = plt.gca() #ax.set_xlim([xmin, xmax]) @@ -253,7 +253,7 @@ def export_current_per_functionality(): bars = ax.bar(ys,xs) xs_labels = ["{:.2f}".format(x) if x >= 0.01 else "<0.01" for x in xs] - ax.bar_label(bars, padding=3, fmt='%.2f', labels=xs_labels) + ax.bar_label(bars, padding=0, fmt='%.2f', labels=xs_labels) # Adapt the figure size as needed fig.set_size_inches(2.5, 2.75) @@ -307,7 +307,7 @@ def export_tek_check(): bar_labels = [means['GAEN'][i]+means['TEK Transport'][i]+means['TEK Check'][i] for (i,x) in enumerate(xs)] bar_labels = ['{:.2f}'.format(l) for l in bar_labels] print(bar_labels) - ax.bar_label(bars, padding=3, labels=bar_labels) + ax.bar_label(bars, padding=0, labels=bar_labels) ax.set_ylabel('Estimated Daily Consumption [mAh]') ax.set_xlabel('Number of TEKs per Day')