From 4d85cdfac266c69905128a063c8b449cd2181861 Mon Sep 17 00:00:00 2001 From: ehermakov Date: Sat, 23 Mar 2024 17:53:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0?= =?UTF-8?q?=D1=8E=20=D0=BA=D0=BE=D0=B4=20=D1=81=20=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D1=8B=D0=BC=20=D0=B4=D0=B7=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShipCraft/Переделка/ShipField.py | 38 +++++++++--------- .../ShipCraft/Переделка/ShipModeDirection.py | 11 +++-- .../__pycache__/ShipField.cpython-311.pyc | Bin 10200 -> 11135 bytes .../__pycache__/ShipModeDirection.cpython-311.pyc | Bin 0 -> 923 bytes .../__pycache__/test_ShipField.cpython-311.pyc | Bin 15504 -> 15685 bytes .../ShipCraft/Переделка/test_ShipField.py | 3 +- 6 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipModeDirection.cpython-311.pyc diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipField.py b/HNS/Excercises/ShipCraft/Переделка/ShipField.py index 7acded4..a1a9e22 100644 --- a/HNS/Excercises/ShipCraft/Переделка/ShipField.py +++ b/HNS/Excercises/ShipCraft/Переделка/ShipField.py @@ -1,5 +1,5 @@ from ShootResult import ShootResult -from ShipModeDirection import ShipMode, ShipDirection +from ShipModeDirection import ShipDirection, ShipMode class ShipField: @@ -18,9 +18,9 @@ class ShipField: self.ships = [4, 3, 3, 2, 2, 2, 1, 1, 1, 1] self.field_size = 10 - self.field_mode = 0 + self.field_mode = ShipMode.PUT.value self.ship_size = 4 - self.ship_direction = 0 + self.ship_direction = ShipDirection.VERTICAL.value def __getitem__(self, item): if item is None: @@ -37,26 +37,26 @@ class ShipField: def action(self, row, col): self.clear_marker() - if self.field_mode == 0: + if self.field_mode == ShipMode.PUT.value: if self.ship_size in self.ships and self.check_possible(row, col): self.set_ship(row, col) - elif self.field_mode == 1: + elif self.field_mode == ShipMode.SHOOT.value: self.shoot(row, col) def target(self, row, col): self.clear_marker() - if self.field_mode == 0: + if self.field_mode == ShipMode.PUT.value: if self.check_possible(row, col): - if self.ship_direction == 0: + if self.ship_direction == ShipDirection.VERTICAL.value: for r in range(row, row + self.ship_size): if self.ship_size in self.ships: self.field[r * self.field_size + col] = "p" else: self.field[r * self.field_size + col] = "r" - if self.ship_direction == 1: + if self.ship_direction == ShipDirection.HORIZONTAL.value: for c in range(col, col + self.ship_size): if self.ship_size in self.ships: self.field[row * self.field_size + c] = "p" @@ -79,13 +79,13 @@ class ShipField: if col < 0 or col > self.field_size: return index = row * self.field_size + col - if self.ship_direction == 0: + if self.ship_direction == ShipDirection.VERTICAL.value: if self.field_size - row < self.ship_size: return for r in range(row, row + self.ship_size): index = r * self.field_size + col self.field[index] = "1" - if self.ship_direction == 1: + if self.ship_direction == ShipDirection.HORIZONTAL.value: if self.field_size - col < self.ship_size: return for c in range(col, col + self.ship_size): @@ -114,7 +114,7 @@ class ShipField: def check_possible(self, row, col): # Функция должна возвращать True, если можно поставить сюда корабль, # в противном случае - False - if self.ship_direction == 0: + if self.ship_direction == ShipDirection.VERTICAL.value: # Здесь мы знаем, что корабль помещается на поле. if self.field_size - row >= self.ship_size: # Теперь нужно проверить, не заблокировано ли какое-то из полей, @@ -123,7 +123,7 @@ class ShipField: return False return True - if self.ship_direction == 1: + if self.ship_direction == ShipDirection.HORIZONTAL.value: if self.field_size - col >= self.ship_size: for c in range(col, col + self.ship_size): if not self.check_blocked(row, c): @@ -160,20 +160,20 @@ class ShipField: if type(value) is str and value.isnumeric(): value = int(value) - if type(value) is int and 0 <= value <= 1: + if type(value) is int and ShipDirection.VERTICAL.value <= value <= ShipDirection.HORIZONTAL.value: self.ship_direction = value def toggle_ship_direction(self): - if self.ship_direction == 0: - self.ship_direction = 1 + if self.ship_direction == ShipDirection.VERTICAL.value: + self.ship_direction = ShipDirection.HORIZONTAL.value else: - self.ship_direction = 0 + self.ship_direction = ShipDirection.VERTICAL.value def toggle_field_mode(self): - if self.field_mode == 0: - self.field_mode = 1 + if self.field_mode == ShipMode.PUT.value: + self.field_mode = ShipMode.SHOOT.value else: - self.field_mode = 0 + self.field_mode = ShipMode.PUT.value def print_field(self): print(self.ships) diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py b/HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py index 3d8e08e..4f8302d 100644 --- a/HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py +++ b/HNS/Excercises/ShipCraft/Переделка/ShipModeDirection.py @@ -2,10 +2,13 @@ from enum import Enum class ShipMode(Enum): - PUT = "PUT" - SHOOT = "SHOOT" + PUT = 0 + SHOOT = 1 class ShipDirection(Enum): - VERTICAL = "VERTICAL" - HORIZONTAL = "HORIZONTAL" + VERTICAL = 0 + HORIZONTAL = 1 + + +print(ShipDirection.VERTICAL.value) diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc index 46d96c68812246803fb1cff96d60297a46fdf8be..619f7d91ca549425edd5b1b0219264f31336e564 100644 GIT binary patch literal 11135 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 Dbk&(i delta 3542 zcmb_e|8G=95Z}G`-hJtPY3Uc*-j&|<+EO0}luG!bU`qvBEmF`nMG$h7dk?6+_R78k z%;iXlQB$=M$i@^yBGm*1(L}?q2LA#~sYsefjQEo_{?eZ`Au%|!@9td>#Te4PySbg2 z-I?9}%*^h?fw?__&;9-q0?ohaPyLV3g+NW$YT%}bMl_lvBjf;~#6h}==6H)}(q|4r zuEWo22dF0Z5mlK-R;8x5?|3SeenmGJ*zJ zV9nX9Y7c0Hxj?!UWPEANJh7GWrP#z1duJ}#|B{^JlUf=7-`>@dc?^tsj1}g=9!46& z@Dya8V$WMd=7m;_bAv*4n#$23J*k;>BN6QXY34f+Ml-5TKbQp=SD*l(V zh1T$9*QB!=L=e?fu#>MToeUUr9$V~pbAdx^6 zMzCsrVp*+YvxDDqZ4TIHWWrV*u+^5@n~P7#*7v79e5$rp+HywXYuur#<(dP=VTBMa zD*@-`)4uAel^XW{si}d}EF8Ti=gxQl3?B-%N*!lpG~D^9VTy+HZZc4)vT_F4t?-+C zoU4}7f_pKa-}N<&D;bEQgp_dLT+J$U0#K8VnUsmJen4ZYhc&XZW{)c6l{w9tJvS^^K0wcKW<(dm$_aeN|?7XRtaXxG>Yj^s(e%LeD1+ z9kMe9$29Qo%0hHIzgPAl6#+pv^7ogWj@Wp2!?D9at7T~hk{l!szOB5f!aiJ(QTU)d z67dYlT~S#FIU5GXzOkmU zc;p%%Ep2j8!p{Y3`1z8uHUYA1Wvxlu1j4FYfF?k-&=e;p& z-w>EG0UtUPs9L$o8iCK07ZNp}>AOH~^z$o~d)?Cwv);xTZzCV8+QQqbnidN_0#Hkq z-=sC7thT`czi5S6$V-L=7Hnhs z-{T^zKs|sOd#g6K-_b`V>olpa*iXI`6#KD*J|dP^jih{NHUce)-|>Uw8i;LSd@oDD?%qw^D~gMWWh;%Wp}*wHoS*I zi2}6WhY|qo({+6`A)tj6BGv_hAT!M2uKs-Hiq(i9d=BKQ^HE4w;S>x%Q%>l~r15AF zcJkj=)X{giQvVA${k2}9TZB__B`d5JXG#!0EQE%FNbs_{mb+7xQ-jHqx?Li8b0kJD z@RuWR3S*S6Wf2&yT87w8oL(@5^^tV}Da`MSZg5^gNtS;Q-NiqNgzBR$6Fcts!ZYFv zw~?=Y#=By=b-I<|z0D(Z`F>3G$Hbrq@0&R2t%jMcLFFlySc{|(dOLd+Sd1d$5Re6lQaVQ( TXNtcIPJTERfEg zx^$@!T@a#)080@h{D!sU!n&3!qA@Zw6o{R*FNmaLcK6$v{bpuoA8#znL_(}@zv-cv zzk-p8K2s)HUsY}mC2-8dE`;%wL=;@P<)BC?nfdu?~9N=|0u?1{)z8N5>8fbGwMa{ zZg8#ln8C$L(1a3R5|A9Xk$E;LjS5y$fyS)N^*^rFg369JmUqkGCB@yc9OTUdoDq=b z?^V{DtEH8-)U4LmSM7SOxw6Izz{?8eK%371LQa-_Za%4w7S1QPp-qFpzgEnp8WrDy z!QY#n9M)64$J#-}7Nq{L)rske?SAENOyB$_gUB77-etYVBu=mP(@j|~OSjnQd% t5q*c%AAc!R!HeK|61L0Wxd@&!%0$>m^u!+;mxsoc0a_lSWuA3;$Umbm>(c-L literal 0 HcmV?d00001 diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc index fe37947debee1d056e5d949b560273ea29c56246..6ba6211d429b4d6c446433cbebaea59655bf3ce8 100644 GIT binary patch delta 2323 zcma)8Urd`-6#s7N*M6n6(3a8;WVE0_R|ciXfQ^A5h2aLs1|(xH9qZSPjZR_&C(S1+PS>0@GuErOX1z8{0PmAN?v|-%91f9?) z$l^IcHbmK#JVCgQ|LHbvl#TlYpESp}mict5W#44%L{E%IBgt6exGK?bAR$LTyL>5+ znNscgFLi!1YA*kWjq9jqAdnGwA%O!yp#_hJmq3+q$l#=zpWtkr13vK1#&{(VwDBixn>E|}gh&6>}fU)TOP>Fjp#8eHbJ z1X~bR)R(M&b34t}5oqo~pzvE}hQABjEb9z{&Y~9939l3#&3N$__M8={r?P<0m~n(? z8X;--l#!X7&QLY*s4^2zDs*`s?RY=6H?v)E*M3Q(T7bR9Q-Ma3Cs(+Qpp`&GP>nrZ z16_Tg9=-!dYe;@8ZeqjWb)IJK)V#Bm1s}>_8XfEj_4W^L497ZyShY)-sUv;l25tqY9Vo^jT$z#Wl@^<*T)Wb?(skDIWs6{%iV3g4oT$hWrX3{;?q89kX!K_m$fLcV6T^#(b$ME;xnZapa=)5 zU5O^c3YMU-oGnS5?pMvk$VX4+{`)GQxx?{1r=av*<K$qD7E0d%P=vvKeatC z^?UUUJK!^=?dMc@_z=OW6Z}OSkN6C$PVixp7$Km1R4r-44#yLbsi?eamzK}(*S4`Y zQ$N>wbm<&|692uO+CCI~*D_U3W7Np3Ift{Z(9mu!c&^?BBXu?GLpW8JMAkp*{;bv* zOUa}Hf&&B_R4Y-n5(4!>!^gO;9Kix!2@75kF4RAt$?#w6^O;v8djyXcdE9U)V1m{_ zqv3PnI<61C#O{>go93Zy0E>36YH&p z(O^IO3N8n;@59cfZe5sSE$6P5n`y2SVR;)t3jr0%Z26_=%egq-NOM{>U3XM)r@4WB z_kndAMv3;S)wYbWh_)%+8Q(=fQK3bNPs)vqep-5gK-*v?Q1D4xDUEzLt?xll=q#}I z)04H-8eu;|sO>%6_?I^SX%`8V6L<)oA@CE_6KF2)q+T~cFTnu87{Pvmg9KrM2?Ckm z7(pE28a`{(r`+MDEKtrW&tg43Bc$Hi-oy$t8Co9nN$~xSO}(lu`x|2AXN8u-oK(|9 qC#bhV{*Tl?osehZ(GITQ0@ZqD4hq{l+_#11g$I3LpuJO1`u_v+Lh9E5 delta 1729 zcmaKtUrgIo6vul@>HlBb6-vvB+CK>XR{j*~U}eBWSs4zx>Ha8_&_MfJ>DE!azY;T} zVVFHgqDDN?Co-cmPBIf``r^Y(e9&a^(YTl2i)dnEb$d2Zl6lT;$0$>O37_77=X=h* z_ngajufBWHaZQq}I{Ylbzmu6{NQAG@;EAj5mI%<~A^X)G$6s&SG`H+<+0_$eOVK+{I9s7v{xN~atUXQa9J zvoUZrtXHI9wI>9xI~!rE;ZC%h?D`2#LLZ?Xp_xWUCP&5&kMcP7c8K{rF?Jjly{F(K z&%TEQS75zqzV|;xEvJ&BhZEz;hh_V`aW;jr%hl~#e5?8?A4Nk~o%;=UBb&vpwK}!P zHN&|=Zh`M|M1k{X5OO_#a3HQiK9f3|Q;=wxTgdVO_+xJX)5h*U#O6v9ejmf^@wE=r zfxhke(kJa?U|KvTQ<}l#P{Ja9~Gst4cAY&gT|WnH*Qr#av-Q zGv6N*XRA5V^Gf=BYO$cIxw*Vjo5-ZmP*l`nO00r!gB@%MrsWy98@dKJLQz-+$cQ~{6#`d zjge^xO+#>_tJioPyXskBoguJxAE{wr1M%;#|r+Q zlU1$N9*MaFIE%?5s-AYJdElpBkFQb;Q#eo?BHZpBXE))o*yXCo*RiMdsqH-BNwT0k zDetG&5VfeJ%2Z+H1Bm;jOG&fqmMYmSDzN5UV5YB|-MactA7-g|uRiNP&C(qR5}ZMH^jRZPup+P*!ze}x?kaEYYW_o zzk+dO1|rKI9OZt(ql7R)CUg*D1o7HEMXgc7QNjtrX~G%8G+~A?OUM#(hz)!psohAR zf)k*B2I`ae@LtlD90y~}F4oX=Qm%)|!DhL#_5vAf+y7-Ayimw2<&|MxzzKS{)r;`? M;4tWi4jE|KKPOdgjsO4v diff --git a/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py b/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py index cac78aa..4ec861a 100644 --- a/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py +++ b/HNS/Excercises/ShipCraft/Переделка/test_ShipField.py @@ -1,6 +1,7 @@ from unittest import TestCase from ShipField import ShipField from ShootResult import ShootResult +from ShipModeDirection import ShipDirection, ShipMode class TestShipField(TestCase): @@ -118,7 +119,7 @@ class TestShipField(TestCase): # arrangement установка ship_field = ShipField() ship_field.set_ship_size(4) - ship_field.set_ship_direction(1) + ship_field.set_ship_direction(ShipDirection.HORIZONTAL.value) # action действие ship_field.set_ship(5, 3) # assertion проверка занятых