From f62df29ed2bf14e488a203e6fa78f1549bee952a Mon Sep 17 00:00:00 2001 From: danii Date: Wed, 13 Mar 2024 09:51:59 +0100 Subject: [PATCH] Complete Code from the last lesson --- HNC/Exercises/Ship_Battle/ShipField.py | 67 ++++++++++++++---- HNC/Exercises/Ship_Battle/ShipField_test.py | 49 +++++++++++-- .../__pycache__/ShipField.cpython-311.pyc | Bin 8100 -> 10074 bytes ...hipField_test.cpython-311-pytest-8.1.1.pyc | Bin 9601 -> 12098 bytes HNC/Exercises/Ship_Battle/main.py | 7 +- HNC/Exercises/Ship_Battle/test.py | 10 --- 6 files changed, 104 insertions(+), 29 deletions(-) delete mode 100644 HNC/Exercises/Ship_Battle/test.py diff --git a/HNC/Exercises/Ship_Battle/ShipField.py b/HNC/Exercises/Ship_Battle/ShipField.py index a917394..a87c565 100644 --- a/HNC/Exercises/Ship_Battle/ShipField.py +++ b/HNC/Exercises/Ship_Battle/ShipField.py @@ -15,15 +15,31 @@ class ShipField: ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '] + self.ships = [4, 3, 3, 2, 2, 2, 1, 1, 1, 1] self.field_size = 10 self.field_mode = 0 self.ship_size = 4 self.ship_direction = 0 + + def __getitem__(self, item): + if item is None: + return None + + if type(item) is not int and item.isnumeric(): + item = int(item) + + if type(item) is int and 0 <= item < len(self.field): + return self.field[item] + + return None + def action(self, row, col): + self.clear_marker() + if self.field_mode == 0: - if self.check_possible(row, col): + if self.ship_size in self.ships and self.check_possible(row, col): self.set_ship(row, col) elif self.field_mode == 1: @@ -37,16 +53,29 @@ class ShipField: if self.check_possible(row, col): if self.ship_direction == 0: for r in range(row, row + self.ship_size): - self.field[r * self.field_size + col] = "p" + 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: for c in range(col, col + self.ship_size): - self.field[row * self.field_size + c] = "p" + if self.ship_size in self.ships: + self.field[row * self.field_size + c] = "p" + else: + self.field[row * self.field_size + c] = "r" + + + else: + self.field[row * self.field_size + col] = "+" def clear_marker(self): for i in range(0, len(self.field)): - if self.field[i] == "p": + if self.field[i] == "p" or self.field[i] == "r": self.field[i] = "" + + if "+" in self.field[i]: + self.field[i] = self.field[i].replace("+", "") def set_ship(self, row, col): if row < 0 or row > self.field_size: @@ -67,6 +96,9 @@ class ShipField: index = row * self.field_size + c self.field[index] = "1" + if self.ship_size in self.ships: + self.ships.remove(self.ship_size) + def shoot(self, row, col): if row < 0 or row > self.field_size - 1: return ShootResult.UNDEFINED @@ -109,12 +141,24 @@ class ShipField: return True def set_ship_size(self, value): - if 1 <= value <= 4: - self.ship_size = value + if value is None: + return + + if type(value) is str and value.isnumeric(): + value = int(value) + + if type(value) is int and 1 <= value <= 4: + self.ship_size = value def set_ship_direction(self, value): - if 0 <= value <= 1: - self.ship_direction = value + if value is None: + return + + if type(value) is str and value.isnumeric(): + value = int(value) + + if type(value) is int and 0 <= value <= 1: + self.ship_direction = value def toggle_ship_direction(self): if self.field_mode == 0: @@ -134,10 +178,7 @@ class ShipField: blocked_string = "" ship_string = "" for c in range(0, self.field_size): - blocked_string += str(self.check_blocked(self, r, c))[0] + ", " + blocked_string += str(self.check_blocked(r, c))[0] + ", " ship_string += self.field[r * self.field_size + c] + ', ' print(blocked_string[:-2] + ' ' + ship_string[:-2]) - print("********************************************************************") - - - \ No newline at end of file + print("********************************************************************") \ No newline at end of file diff --git a/HNC/Exercises/Ship_Battle/ShipField_test.py b/HNC/Exercises/Ship_Battle/ShipField_test.py index 95b0cf4..bc5ceb7 100644 --- a/HNC/Exercises/Ship_Battle/ShipField_test.py +++ b/HNC/Exercises/Ship_Battle/ShipField_test.py @@ -54,7 +54,11 @@ class TestShipField(TestCase): self.assertEqual(ship_field.field_mode, 0) # Проверяем, что field_mode принял желаемое значение def test_action(self): - self.fail() + ship_field = ShipField() + self.assertEqual(ship_field.action, 0) + + ship_field.action() + self.assertEqual(ship_field.action, 1) def test_target(self): self.fail() @@ -114,10 +118,10 @@ class TestShipField(TestCase): new_field_string = str.join(' ', ship_field.field) self.assertEqual(new_field_string, old_field_string) - def test_set_ship(self): + def test_set_ship_size4_vertical_direction(self): ship_field = ShipField() ship_field.set_ship_size(4) - ship_field.set_ship_direction(0) + ship_field.set_ship_direction(0) #vertikal ship_field.set_ship(6, 3) @@ -126,6 +130,29 @@ class TestShipField(TestCase): self.assertEqual(ship_field.field[83].strip(), '1') self.assertEqual(ship_field.field[93].strip(), '1') + def test_set_ship_size4_horizontal_direction(self): + ship_field = ShipField() + ship_field.set_ship_size(4) + ship_field.set_ship_direction(1) + + ship_field.set_ship(6, 3) + + self.assertEqual(ship_field.field[63].strip(), '1') + self.assertEqual(ship_field.field[64].strip(), '1') + self.assertEqual(ship_field.field[65].strip(), '1') + self.assertEqual(ship_field.field[66].strip(), '1') + + def test_set_ship_size4_vertical_direction_outofrange(self): + ship_field = ShipField() + ship_field.set_ship_size(4) + ship_field.set_ship_direction(0) + old_field_string = str.join(' ', ship_field.field) + + ship_field.set_ship(7, 3) + + new_field_string = str.join(' ', ship_field.field) + self.assertEqual(new_field_string, old_field_string) + def test_check_possible(self): self.fail() @@ -133,8 +160,22 @@ class TestShipField(TestCase): self.fail() def test_set_ship_direction(self): - self.fail() + ship_field = ShipField() + ship_field.set_ship_direction(1) + self.assertEqual(ship_field.ship_direction, 1) + + ship_field.set_ship_direction(0) + self.assertEqual(ship_field.ship_direction, 0) + def test_toggle_ship_direction(self): ship_field = ShipField() + ship_field.toggle_ship_direction() + + self.assertEqual(ship_field.ship_direction, 1) + + ship_field.toggle_ship_direction() + + self.assertEqual(ship_field.ship_direction, 0) + diff --git a/HNC/Exercises/Ship_Battle/__pycache__/ShipField.cpython-311.pyc b/HNC/Exercises/Ship_Battle/__pycache__/ShipField.cpython-311.pyc index aaba9ded41a2fb8002c36c00123e3fc8f453413b..b442d41a1aba8da0842f467645086a618a5a8d47 100644 GIT binary patch literal 10074 zcmeG?TWlNGl`|xVqQs{}JuFeODC%WevSmkBocOI+wq+Gol1fQi!!4n3Xq%QyId`Zu z;Zm)EZ5M1Ipmbrt4B#x-)J^Ed1@zGme-wp3`#D1lDq;Wu2HJiY{bAvL6#m%kId{m* z8BtQ)-C%#Z*Q3MxIQMb!f{`~pPnxBqHT@~3(v3^<~8Ts_2uQ{H)GPuQZib>p+9`3@ccc< z+~Z;#^yDsEME*zIWh;(+*(O>63Zf05T@(N|h<1Puu>oMC=m6LxHUe~tO#oe@6QEmk z0rZG&fL_r9&?kCfMLw-@?t1*z`FLzej8-SdHQ>^%@K;&LHQ3~*e42}38%hvNW|kySEgsrUOD$+ zj6~y7OuB;X6M17HnOus|JY}VWw?5Jwkw`odPevlC7R1r(t95pmNtyw0n=4xy+o$<5 zSA!YbT2r~5Yd<2ljl+khtaqw<3A|i(NZ36 zf{oqd()?|U2)veL9Lqu7XHfcr)g%r5S9sE&=JSRcoIy{Y!Os`f0!O?_#_9EAuJSKE zBS*$WKFvohA6gdan#i6cN`y*Eb2pd_F|T`(Vh~@#!gC3?5iiYy{H~-q5Y`}TEVBeR z6&5sG@}pZZ%^FW6wZ^!VSh*R4+t#d0u>^4=hK01kk7kP}V>c!26AY3ztZ_yn*J4Sm zhWl+Z-Y=`hX{CP$aGNVRy_pjwe@FJnU!2~o?I*|9j(svGJA?4$=Rg16r{7ZsC)B|S zC~o@Ov&lQJ-+etZRYUd5&Tjbf&3RGoI{{yj!r#oTxBj;4VdPOnFY9dpVWzvsa-!<* zmtFl&z5Yy+big{IhC8aG4K5ED^~rqCJO?MsXhq}~DQ%E5P|K(U@@$?DIC3z}<=LGX z$4~QVi&;sMF2H44VRu}f-Xz{8{+U)~sjO-bjD~Dhm+EJ(jrP#0(*~6};RekWU5YJ` z$jt?^2$H}DW07VA9srsrdOa3hjNDq5r1*PFG0h>xk`WXwD2hP8hpjsKSjqDDHEVQv zNy3u}R%yt-K&4O0S0f+2W(csP{{#S(<8W;_I*X1@#Szds{i)Ntb~?9EboR>5-jdh9 z_Je%ugD%-S0^hoApl0+-MMIfT=5O7zG1ogm93m_ zRPPC}Z09^JYmq!(boa^bzLLxLvzedHWTo6$#T8UtLAm-tH%|yK>WK<354ZR{1mpk$ z=YK;~8uVsF1!J;Qe|_ZlMxtY6IiEz0Qc2JY%$FOCyi!naCci1}yT@0-gsI^`o)Hj` za=U1O8YYg?h>IGCrWA~vw&18I;BRdRjiHysJpq`EWkg$reBU*#-jc?-cVGSKRWP|~ zIFR3M^>`ZQ)!TMl{cgA?s!T|K!OS!4y1pMfA;bowj|yUqzoqenvfK-PB-}{);0SeQ z3t_GWfF_WI#I;zB`>22>UTAtKP&Oljh>N^K_G1S=D&ctnyD^4KE)WpUMuyXC4g;Pf zf?#_YhTHIlir!FuykJ$lqpEkb%(>muJjh(tKUC-|`bT8{$Yu{kD2R^|%Dxjy&q=lC zWSO(Ip`J&W<4b|w`=<)?k1orBqwtlcF65@}&*a}P9C>tF89w%SP8mLy-<_{8J)>n7c%sT{!l>boxcxYkkFZ`o4Y8`K>=mYG^Z(J_BNqI8TFB&FjO z#WgO|PZt|Zi@?z%nNqQ_2Wsz`>=ThUSr!I8W7hw5tbBD9iH`{oqZJ@lG=$W=BZjrY zgiYwF7)L?oMqkEQSFZp# z$CT#%YV-awCp4a>ATx=|Czb14Tg_XG-hSEJpHDtWt@k}xeQYfbAD4%Zmx7_J?QT=< z@E!M4Z%bCZdn4a`_a-31R|*b1Xeu0j;NA#M6oV7%(Z{bS!BcARRJF%H%FgOkyC|9# zUD5C$^kLDkb|)3{G>>4B+8%`3y=icx85WAu?Xi$-YqY%d8g-@f zRcjQ?Cr(dH!2PU3zyj8@-5S}L(9V<^a8IAHyo2>-I9;<0s9AAgTUD_ft{8GuQBXyq zYY@sY$Sk@gXD6|n%OAwT_AQ!36XFRm_910AauCoZlvPxv=#BvChqBSZtD1msA@Yo_ zQkWf1aKi#=iYo@(b+FM z`;qm2nD;B*0pPhG6ulF&ccSEL&)PTJx^m-rYhHYiP=ZI4wh6UuqRd&``zXlrr9GXv z24&AkA*$>-oE1s~!<6GD6knh0>-*ZK34q*KR`wiN=eL^%jo4G59WKkxVfet-T$|Z& z^%Pw_&@G|34ydjJa`gjy)3pz<>cs$xRH`^~RB@zhV!&f2N|6$MMHsk@PHs(*gBwv3 z5FTo8!SH%|$^N^E4krH7)|$fD-ZlCRCjFv1HN+At%BY!QfI6G_^GT5Sf7A7yOlQgU*>aht~Mc?9{pQ z7iZ5+>3U3%k_4TpbC=$l|Blu$HF;_B!nrBXcj%NG%)O&flu*ndV^aT|3_vO6t?4-G zk6lH)KL9|F+{BZG1*Lne*ght=k8S$*s{VblYv0SD)Nv^ia&|>^^=vo?ip~MWIixy= z3ZbHNRCbP*g8kGkT2Wj*beaL#HBbVl>qf3k_4IDIhl=hY#l25;?<<@wy2oVq7^q2e zmm%3T^q1-q>p21`0MGLIyE;c0lm}B;7vWBsBHKn~Q7R&@ngTB`qpkv|BDbe#@RhbW z`;ryJwPlW5>lUq)T4B+8Vjhrro%L#KyLG;d$_k*Lw8J|2^cHi>yiQzkSkUSD{JgGP z1YND5CsNZbnp=+zytlL*U5tt30JLs#M@R_jQhRDNYK|tXV2@1zG<>wJ>@V0Jd5Ydw zW$&w-oqKaq{%m33(LrV4HKp@)wexk5_|1b9WGBJf*a#db1`ZS!*8NIgLJfdc;M)dE zy#u+G+)CLB`KKL$Y!U?X*EUsj{qU|+d0R6p^%RT}g;MY3xD(QMJ!(o&t(a|U{)I<}H-h1mZC8l^u1(0vFg_x7Fd zgGsXRiw326pV|zjh|max2_Q46+bhi<9|hv=`^5#NZB%UokJ{!21OQ;L_*-*4c$o0% zt~E8GXj!iXxX!P?EgzbOuSntJ*5CE&IlUHOsXJ)&uHROMPpRFfHv;F2f%8gWS`AER zr%D}x9Qk=Fo63uY=%-nZC#vY01>^GZ;ns2mne!U*;q=n=vvj z{N(uB@lU`O?tw2q`1#nUV@haT4UI!_v$Z29+?lyMlQ~z9+LvF+kL3Y9Keo;zto|$Y zgh18KX5b%MoO^LxXw)Utzw~vJAY4G@n#mO84cCmZIdTqw>2_P#C9+4hRCi5W)VF?& zBcuWRAKY_jI5VZXdS&|6Uo{ifuo}E}%GvKi1_RnPU!0j!Jw}zmY8%n_jj*whYk=dn z)|3zatzk&x zCD+*<*;TMeR>8_J+aGx0HA}m$*PCF6T9VX?)z1X1Qk=gofgs*um6`>=Xn5ijt!Npg zK)0`2sO@2^4o5v=c8S|rB8I-!wYQQe;VTI|WB5-SKep7Y7LkT{($=l@)GmWrYEQ~w zJKZskCECra*Od+P6460SSw@4;{_D#xzf3jhu@;1>sr_F=0$Yd1ey9aB1#^)z2+$VN zgj)n&fm0dw8}88vwvlqPY9Md28No1 z)-uOHmqX|)a}2b%3CGGD0|)H_#J(BuwF+<*42-&kFuaOX!CtS>R^}K8HQ+=Hv^a!* zoTvg?9Rire473VZWWZy?H8bFH2=Bt}Zx8izz}?S6_#edyJqq$I%;En6pl9^LaYDb2 oQ{>xFhf+cME&y-@dA`K;%jU0aPg;1KbLXGG>1}`C1%*!k-#LfgtN;K2 delta 2473 zcmbtVZERCj7{2FzbY0i3-MWqLyI<=lLtNP)2pc$U=RhbUfSf9V3cHuSz=-ci61}wv6@Afn<)QGW=O1o7{VWX-_x%#l|SCw``q)M z`=0ka=l!Y{yt1eAs>x&!;40scjW*ZJRwl`@*|(3&hXt>B_IF3aAbh$k3=0wR5lIO{ zsL8L0$h^c`FTtE#oD*P`67)tM5c|T1H@j%?rJE<^b(SCs>nzD7OA&~`+Q%ygx#u-9 zPU~PVuU<2THHD(vXahncfJUfB z!YUjCormtjNnJ8Thoi{}%i)pOct3`COK!#iU)B2p`>SGyRA%xspRui-)cOgy6mX8L zJpJsP{Jvq{H=n$c&bYQOS~ISmjIDRc*2}IM-G}~7x9iiI&ssCC9gDuAZnjD=+LtO? zvm$H)#yJ{ue)6}gi%5>s(~-YK+|{aV?m+X6G{KK8J(sY@((Wd(q# zz7?}|dScEoJvlG^Xm%}`T`P9yjC{#3=bJU%&ng8)pbPmXE|P`o<}@LVtfOjcx)9_7 zD~Ev1 z>1K|`CUT1HZoCaAY-y^G?F2iQp;Mju zAzF@f2=~mjd{Qf~hvH|W#l&VOnmcwTKuvuT0Gg%QG833ePo>|5XYLSU;a+igAg3#5 z;Lb{drFAL|`3z)V`hR3;ZH^>%E&3EPDHI*+Y2DVV;>=cn$8+;^%*e|Y*AoAg=vf@~ ztjhkXlkXwsdL-Y-jAqf9`Hol1zOdJ_kL?a}j(ua_2Vt-{Ua{q=@z%O_1$)cUMc!mz zI<_=g!A6)z1qOIw9$-n_rR<@jlgzSC=Qc9PPC305(1lX+C-CvQ#6GC1W1l;Zl0!^( zJx|_agRTzZVJTN=qa7CWl+q+9BHE228r76>8XHS`^DW%T6t}~|i+xRQv+eG7-9^w= zH5PWi*iy6j+D%8s<6rjpGtR)WGjKDs>>T*MJL5c_ymv(1$Ppa800Sj{l2Lq{TsofqEO@Lh;VZX2qTris05M zj;yegBSLkBf{lL-Hb@Gz+aegM6lhUJ@UU&3Ct5_M9okj_^rEsE#XRWQ1W3?%Tb`sBrUt17QOek^lez diff --git a/HNC/Exercises/Ship_Battle/__pycache__/ShipField_test.cpython-311-pytest-8.1.1.pyc b/HNC/Exercises/Ship_Battle/__pycache__/ShipField_test.cpython-311-pytest-8.1.1.pyc index 5c6578ba3925325309807c4db9417907f93a9164..f41d633a4c63b386e345671809aaaa7d602705fb 100644 GIT binary patch delta 2402 zcma)-eQZ-z6u{qYU%R`nZnS+}`wCsVF>DJPAC3*iWOQu695g7ys0ek^ZYz#<+!hiS z$S|3Sgnt+p!vZ8DnkWs4VrnqP#038``cJzwL8=%u(MV##j2h!t;yJfnSy>^peZSs! z?|J8*uY2C>{huE&yjNXaA;D*?X)a{4O&QJ*&(zFXGCq}#)=o+Y_dPr&V8xEo_?W62DfvjekQ-{Q0E{|E#)} z->z(18I<-&%!yjGc`Y!`>IV ztX! zW`x~h1ONf!=M5`K7q=Rg=3L@G8NQ$*06He~>ow~h@coaPcGAt8Ylm~<$@gKjX&Jgl z)_BV9d&}0~oGun;;W79diALj0C#HIL?H+g`p%qpz6W?t#6EhDP*OPvJ(Re9u#hCIj zzo0R4)jY6X+$XKZSU=29WWKs0-RU~{2lX?WPtx;*~?cc-n_A6 zib~oat*(5pzo&OwpMSB!8T2{-VF0uh2KyW{-N4LhLSf`>wJZlFYVT>ufnHAiP~^f z3Ao#Zqs=(#L+nB92PE>zFz}O(hCUHA5knEVqIw45?233O77xTiaE*k=0WHu!ONte&W`4XCR&RmP zT_2(w=bl9@GS6Mgypbpik4Gc%A_LpdKv!#^)Z!bc`#A(Q2pjS9BZ`avD>uX8eL@@8 zOFV0;*9W!7$sry0nJw}O&2hqg%Pe(4IjDOV0)G{QFFr(CEU!PIJuY1?SjJH4Q0g$q zt}PXy`o#$hM32U!Lu@cI92)P!P&JjxHT18*7&rr;# zxVBEb4PvoZ0YyC-T5r=VZMr;|rtS=Nr>MKA`L4SLeY!0}+fuYm#N%;=K^}h00{b1r zz)1W{xmNStyl-{lwQ`aA^Z!lgXP0=z1VK3OUsj1nhlfW)x$}G9IdSkqAoqZqJq>*m zS7ACf3|Qc%u-rXM-D&F0P;ZKQ?<{;7EpqblL>IW|_b6E!2t)=C^N$)F6AGGUM>r6T zh!u!ch*m@=0y_ljMeIc23zO|b96-E`cm*+p2m=yOPdLWo!Njpc=;4YrK$K7BzI=P5 zuSTa^Jtq}l;O85|jtX7poK%3dT=&$RRDk8|a!0dX*FGl|U@XVm#mE^^#`~9#cw{t1 uya9wghw-*x@$Oa=DABihtqUT(wY2^`T(r-@BJ@-H7o;mY+axrLH zHyTS+a4ntv8k@AHOe-Xvde%o;6fjaCsN3ZN!L zDL}>rkB8cn&7uxM?5w@a$v$bL$|K!8slfeN)$m^7l_hOE;YwWZAmySa#FJ3mBWkGt z4{Bjg4AsVhJnW6(9i%bV1uN1dlqOm2^rd(rO{f(%$OHhzuw_##dv12}z%%7Fs8x%o z&kwp~Zq)aow*j$T`bYCy9j`#30()WU_$T=nOAqO1wTEZ6PpYhg6?Vh+ENK&qcZx=} zR`dySlE&xZF)K+)irvc!{?YKcNLs_orDfk<}VMP^4mzYZQKsjg4I z2%))wGS=-od-nQX{nG!1J{E`c_X~3Sg^AOy!8E{AS z!RAg)tWMl7!JFE_7ZR;(xT)q^Iqp4zs6', lambda e, x=r, y=c: left_button_click(buttons, x, y)) @@ -28,11 +27,15 @@ def colorize(field, buttons): if field.field[i] == "1": bg = 'pink' if field.field[i] == "\\": - bg = 'red' + bg = 'grey' if field.field[i] == "0": bg = 'black' if field.field[i] == "p": bg = 'blue' + if field.field[i] == "r": + bg = 'red' + if "+" in field.field[i]: + bg = 'orange' buttons[i].configure(bg=bg) diff --git a/HNC/Exercises/Ship_Battle/test.py b/HNC/Exercises/Ship_Battle/test.py deleted file mode 100644 index 71554bf..0000000 --- a/HNC/Exercises/Ship_Battle/test.py +++ /dev/null @@ -1,10 +0,0 @@ -from ShipField import ShipField - -my_field = ShipField() - -my_field.set_ship_size(1) - -if my_field.ship_size == 1: - print("OK") -else: - print("ERROR") \ No newline at end of file