From 922303ea9e91bc5b103b46cb2459419d1b0bc087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 18 Nov 2019 19:48:57 +0200 Subject: [PATCH] reorder funcs --- Karto/assignment3/KTZ004_2019_03_brez.dwg | Bin 39699 -> 53548 bytes Karto/assignment3/measure.py | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Karto/assignment3/KTZ004_2019_03_brez.dwg b/Karto/assignment3/KTZ004_2019_03_brez.dwg index fb51f60242e8f72c542603139c362a211e0d3cda..655376623456b87be88bbc75f7340570a3c138f4 100644 GIT binary patch delta 7595 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 delta 3595 zcmcIniC+`R^6#Dyh$P&IAP6DIp&ZL40tN)-5J3{;#)LzHpagXTy3vOuDl0+4xbOY`gJ1X5R83X)x4P>yT~kw0f>tWgrIb6t@u^ak2%(u^%EsnYFP?1ZO)#|IXH2;bI?{Kco z$|VoWzdoGt=x?H_&bag(dKKGjUZc08nDU8|UHE63PVa>3Q~&Hq6GB2*>X2;k-awQL ztyPU~XMyTueef!PhOF_?rmHygEU^|PBkHD^1u2$&x%Qem`f)OEZH$Zx1KV~Mx+oeu z$pV1DXaoQ{06@A169(3y-^2Y?HOO~33+XE!F3x`3-l>7ulcjEoe4l`jf+)L&R9n60 zx%#0@L~5>K=Vy_Jw~KV+O=*t{l{jpwGcR|1>4P^pKjWnNslQzu{(^(fRA6qhcgtVM zy6eqNVQIb1D;)PxVd*&y@z8b{hnAkT)2iA=Osd+?g%yAG&r_CcVaQ1#XD(+l&-79+t$?{ z5xvnc=$BoNtQK!})4IwBEY~vaOP+ft?{6~W-q2c#yLg)!^-blGFs^&bq|{fTNAK`l zR^y_@={-8Gk}OBT>zgUfm-Mwi*z*T<&n%btDx~U9%#LwB+^ZV?Ddb6*=h4#mtapI4bIqlMmNmC>1?wrcWZJxawy0TJAoud>^y$QAw`z!dq zXk6~RzVLCUr{r0|o!NyCL$@b~E@yUnQ7xt`Gs=FM3hDUrUDS^)1$R~g6D`H>In>wx zqi6hn$ftF~{lyvcjWkl@WuA#Rvt{=9gXvcNSgM$iG8Mj|`>}%wEheq%je55r!CRU3 z#6I9-`#IwVZi87~`_0~9%jEIAimyq9?=wYp^m`37H)rV}psCRsvFrL4^i5A>g$E~y8kjc$;sAi2aH_bB)#9v3^ z-?f>VavA$gRxH({g=I}ORi~*Rtqkqw8K-CF@=vOLoqX3N`CI*K=?HbAWtJ;e8K|BY zi~z~peBTz|=a;z~Q+Z|M$#q_F)ANH{AH+>4b>y49d;YgtN+a7snWjWLFA?&7vR`&6 zlsshBD|Wn_(8ws8(F}c@^3dcDqpP-J%ejJ^oP*quYc)TYr8UPd4a~htee~m@cdPpN z!cy_fOkdsnktJ?`BW^=SsN}`f@#fI7+NT|lhPHI%eI`0;F_V7hv6mTj;u*t>3!1;} zW8S*DFeNLgpP%_MJRTz{A1QxWnebiS=ae*e2bqBr!w*H}J>d!CN*!P1WN$TPvFFN1 zR`a~i==6*#b#(vBzU4s8+xWW<+mp_p!#yn(>rK_&{2`%PPuyB;HUEpd(A^=WJO0b< z+nm+bx%WT&s!GbES#`YeBu9=`om^1eVieHlc>vj|~Icmvfsto2NZ4>uE3azv&rt zN*x)DeIIChtUsSgl~cG{b8IZEx$}@?EY;nG8rU8^XE8iMJ?qA!<|)KH+SxluUtmvc z#l@69^c2WQ=n>bWe@QFrNeHN&a#Et93-u>TE6;12OilXHerRYdEnEqxd|qgt7TwV) zj(t*ESjD`R>1L$eu9A7Oy{r9$MEG-cuM*8hdrD+3K03Kla%SjtyGEbg(@(G4J!Cp6 z^Ty9hY89%u97!z?w>;n5Gq#^;H`sb2a#UdGpMJC%-O^Iobb3c$bE(K?&?3RM?UPT& zqsY30@0ZLq?FW72Jp=F1<*%l>+hN9TEA3(Hq+;#1h!Jj%o|r+skb&VEjm#YVh-2== zY$_dXfd~Fkmi@}@T4a0L4SGDqkcUpKJ`ZPJ$ap^giC3W|xn_{b+4Hsb9%ppFf|*4^ z5S?a}!gh$Lqa2{A+gH#tIpr0GIgi;6Q55artX4zPrrhD#MWar-{PU%rai1IDZo>)f z$cx;f2RcjqxygGf=3GSuEW`T}qi1#0uD7t#)w;1b5o=+Ule{gCpyst2;^ED*s^Tl< zB62ps9&7_v*xeFXpi%1$(YvZ@RpF{+9PgEr4EXHAat`rhITJCOz~nVr9eph!4t{PU z9*N+v_y7U|_EAE>_h5H0Tt|mM8h{iCfE1=Zhw&dVO2&w9lO%ls){_#X$V#dJU-6C= zk#LyBWo+hoAl*IJhOef$laO^>_;kXo8Srw3xJvcH+u;$_rCn_rbID-?U=eUe#5SW0^Ph%75 z0$)7lfJ~Z&$B!Qu=`h@a6pyK_t-y~iB?PHF|BD!8_Bk9`=>_aJ!f@iFA~=yTEJih3 zjUQvPEF+L9*NG#6`V#`zic`T`DExIId2CKF9}(dT%$VAA(MkW%jPtpiQIDk8f`V?Q@sZ5tY7KX)#VZm@R zTfxiw;<43FZLMpAB=-q zo7>#@8}*I6f^d`~FA8Cw2+=R{W)m4$XvoS0AF|f7we74eFCvW6&kiE9O-z^LDBXJv zmVGFqxFAaduSf<-B!!_tFYMjGBw-|~UAjSgKO*O`$7R31qt7z}!yTH3ci2%zgJkGl zey-U5s(ebnkceb0aG0z;4Xii2p=U2SB3wVzF;x$ZFnUio6gQD|CuZA`DyJ>SHtLl8 zUQyI92+;*0m$Go&CmBw$&J^C{Sho}Zw%vx3^=SKU8uF;1O2?&c_qGQu6OY-wl$(vL4;5M;VRYy2nd4ev)I+H=8-XkmP~D3~T5vNofWHCg_@7S2IQ2greS49* zF15rN7F*%ll~Ii}vdPCT%tMzGw1L;Ufb3t!TTv+A{>Vulg)-l+e*~>>G8&Plrr=O) z3lBlQGGX9%Cq#sx=hF-|3yPd!jS9Sw4w1a8&hV2md?$oKepv1KD%)8d9ZBOzecA)$ zQ41sED!#B*npx77Ox@HuBnG%u0n`O#ECw8m*5YRXh*-6XQv+t0A^}1v5QPuJasuSS z97uv#1MB~<5@tYTtq?9wAp&5UBg=*i_3;13AK$KsL80Z6;Gz(w>oU!y~3CuC>3`~J7 zumiiWv}cNuE3n48DfaA&>33n09X8GmONqO_kt^5@Y%qlF;0%`5jyUh0Uu83Vq(G7dz%mz8 zizFZAwiZbrwU@MvOKXNV81{iP7^k0t`p+fzEZv?;^HDWrx<<$Jei;lMC-FiS2%3^ z%TfZLa7=T5)Jd|+q;!yC@KF&R$pAl@=Nw1a4lgxjxcEe0`X(vb!6Q+T3Gx3-4pk~} zuO)_Bl&UrS5iF24tH&|6pvL(cA%|;U5Jl_F>Y?Ce;tnalsJP?ohy=1i1q{+)7H89u zbg(--AThmv_2_E=5;bvqB95}yQDj9nK1iL}GbU7L;wtD2(a?+dE3eqT$ZmE-d^~x5 zJq&(|7Ufek3ROS6B<|x|nk`GSaTUH~wYw0k?NlD^%Qrx_>_Fj9H?sNa|1W=Q{|o&2 B$nF3D diff --git a/Karto/assignment3/measure.py b/Karto/assignment3/measure.py index fc759eb..e5821cf 100755 --- a/Karto/assignment3/measure.py +++ b/Karto/assignment3/measure.py @@ -2,7 +2,6 @@ from decimal import Decimal as Dec from deg import Deg - def fmt(deg): if deg > 180: deg -= 360 @@ -10,14 +9,14 @@ def fmt(deg): deg += 360 return "%12.7f" % deg -def pr(deg): return fmt(deg - 90) -def rp(deg): return fmt(360 - deg) -def vp(deg): return fmt(180 + deg) +def pr(deg): return fmt(270 + deg) def pv(deg): return fmt(270 - deg) -def rs(deg): return fmt(deg) -def sv(deg): return fmt(90 + deg) +def vp(deg): return fmt(180 + deg) def vs(deg): return fmt(180 - deg) +def sv(deg): return fmt(90 + deg) def sr(deg): return fmt(90 - deg) +def rs(deg): return fmt(deg) +def rp(deg): return fmt(360 - deg) # Sklypu pradiniu tasku (1 ir 15) koordinates: X1 = Dec('16639.290')