From b4baf2236dff8c19ed8fcd83f3159f7717bbe3cd Mon Sep 17 00:00:00 2001
From: Paulina J <paulina.j1998@interia.pl>
Date: Mon, 3 Jun 2019 13:37:21 +0200
Subject: [PATCH] p

---
 Cucumber.py                         |   1 +
 Plant.py                            |   6 +++++-
 SZI_PROJEKT_GR1_TRAKTOR             |   1 +
 Tomato.py                           |   1 +
 __pycache__/Cucumber.cpython-37.pyc | Bin 0 -> 607 bytes
 __pycache__/Graph.cpython-37.pyc    | Bin 0 -> 1122 bytes
 __pycache__/Plant.cpython-37.pyc    | Bin 0 -> 3543 bytes
 __pycache__/Tomato.cpython-37.pyc   | Bin 0 -> 613 bytes
 __pycache__/Trac.cpython-37.pyc     | Bin 0 -> 1475 bytes
 __pycache__/Tree.cpython-37.pyc     | Bin 0 -> 1799 bytes
 tractor.py                          |  14 +++++++++++---
 11 files changed, 19 insertions(+), 4 deletions(-)
 create mode 160000 SZI_PROJEKT_GR1_TRAKTOR
 create mode 100644 __pycache__/Cucumber.cpython-37.pyc
 create mode 100644 __pycache__/Graph.cpython-37.pyc
 create mode 100644 __pycache__/Plant.cpython-37.pyc
 create mode 100644 __pycache__/Tomato.cpython-37.pyc
 create mode 100644 __pycache__/Trac.cpython-37.pyc
 create mode 100644 __pycache__/Tree.cpython-37.pyc

diff --git a/Cucumber.py b/Cucumber.py
index c888810..5845c7d 100644
--- a/Cucumber.py
+++ b/Cucumber.py
@@ -1,6 +1,7 @@
 from Plant import Plant
 
 class Cucumber(Plant):
+    name = "Cucumber"
     is_alive = True
     ttl = 10000
     hydration = 40
diff --git a/Plant.py b/Plant.py
index 1038963..ad2e548 100644
--- a/Plant.py
+++ b/Plant.py
@@ -40,9 +40,13 @@ class Plant():
         def ready(self):
             pass
 
+        @property
+        def name(self):
+            pass
+
     def get_stats(self):
         return {"ttl": self.ttl, "is_alive": self.is_alive, "hydration": self.hydration, "soil_level": self.soil_level,
-                "ready": self.ready }
+                "ready": self.ready, "name": self.name }
         #np. touple'a z info czy żyje, ile ma wody i nawozu
 
 
diff --git a/SZI_PROJEKT_GR1_TRAKTOR b/SZI_PROJEKT_GR1_TRAKTOR
new file mode 160000
index 0000000..6a36cc2
--- /dev/null
+++ b/SZI_PROJEKT_GR1_TRAKTOR
@@ -0,0 +1 @@
+Subproject commit 6a36cc2dd0d2e35e707e94dc01d522b9566b806c
diff --git a/Tomato.py b/Tomato.py
index 6306f8b..2c65511 100644
--- a/Tomato.py
+++ b/Tomato.py
@@ -1,6 +1,7 @@
 from Plant import Plant
 
 class Tomato(Plant):
+    name = "Tomato"
     is_alive = True
     ttl = 12000
     hydration = 41
diff --git a/__pycache__/Cucumber.cpython-37.pyc b/__pycache__/Cucumber.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6efc6d2d05a0b4e05b67fa25829cdf6f9113ecb8
GIT binary patch
literal 607
zcmZuu%TC)s6uo|d6A~b7+9kW<O|9+`DK8<41X0LpRB1HjPGQt>?D`RrHT(qp0l&g0
z%oeGVKcE{{+_6cs>9Own%<=g8px^HT;o1NDedqwZ*kS>nlCNaNHaP@zG$g>lffGO%
zy?a1U!kxz)^e-U_YGOg;m|&#Ew7jy_0;Jq3?NTCvP5^VsJam|kE(_3OD`czavk(K;
zp}dPLY>i@%Vjox8I)?O?jtLK|t19^+^NHI01W@mg<n`l&MLoR!+2GHxcBx&jkvoqz
zOvw3EB$9K}<vdBT(l+mL{<{+Ted60_LRD~~)l3?%EVb#}%rO_GN~fk<q)KxwXHv5P
z%6|ji%;}o4A-q?KxaIAEnPyvQR;onkw$m~Oma!DkMEkIyE!z#(1i2JAe}a6IzNc}o
zNAXRX$T$;~R#Op=DxIk^zGSD?_-K6b?f7iMPsU&PWW0YixfpNn{7N$=qIj{s&)Gcp
pNY7gFkzDBb|9u+PdF1AHrA@KCN1F|3V8Y#Yv3vGs7na*|-vBB<p&<YO

literal 0
HcmV?d00001

diff --git a/__pycache__/Graph.cpython-37.pyc b/__pycache__/Graph.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bc6b8af2833e3f273a0d6fa90cceb5ddd0f01596
GIT binary patch
literal 1122
zcmZ8gOK;Oa5Z;HKI8oZ5Do`SE;E1J)2u>U#)KWnNmC`DSgk*shlXV(5jvdyH1d%zl
zKcqeKm-fo3XE<?UW?e^V)|#2!dF;%5vwpL)Qzx(<=)a#nb3%UOp<Hk#hd}8bupW^_
z(kq}#<`Kz;#N}hquNQ;eAy9e%EFd10#AA|5c11icxwJr9(v}sFwya7AWJT8Cp1QVs
z%3n;!6e4k<#OscMQmii|IT26*IMcpMwH+riNMU28K{WYAlm$-zjylt19&{G|G74kA
zbGD2YVb&RX?~%mW;Pk`Wlac5RUWn1)=wx&{c=~LXEJEMynDoyVKeQu67>Ah<m_9{D
z=xVnxm!`2%g9Rm$DRUP#Ik_M?Z39MaES2?dK?x-*^m3U(Ks5`cDYsxYs%mi%o=?9f
zD#c@&wppZI+r}7<3nkJqP#OWt0p}T0PjWyTvh&AKh2(8AfhmE_0^6(7wtwGdgKbpU
ziWrPGapta4w{LW20F}O`eN~0Dw>T$Fhnjvg&A8lj=-G=Tj5A%6p$f)Xn8e%tHrJMy
z#?`?_5I{m5+A4{y9u^2}d9QK6p(7a_zQZOb*U(+gZrD!_l3dVPMIE3lr*h45enTmV
zTN%&!IlY7~C#>-3lAPbgd@&k85GM&SbR9$Q#qe(ND0u<MJJ(W8sKd-#b6-l$(;x#a
zj!RqkY8CdWopP$%&@>=Olt%pT?r>?)I(@`ihOhPtTsB?%ZWSMI?9T%sbX|yfB9{^F
z8$x_r`cYv~6)dlY%oN(f9b&k_@C_;)EmDfJaj3)Ls~au+e@1RZm<!BHcDhC0*BJW;
Gi2Mg_yx|rA

literal 0
HcmV?d00001

diff --git a/__pycache__/Plant.cpython-37.pyc b/__pycache__/Plant.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c32abea6b1d77af93a157f03041e14a3b78931f6
GIT binary patch
literal 3543
zcmbtX&2QX96rb@|yqnF}CT-dV(oiZj7HU=;5FkZSTGUn$X&WWsvZ^$4cT8*I{b1~b
zZWK=Kfj@!+9Ql`g<-{3r;l%HacfH=kO$2M}y?OS$@$WZpX5Ne+&&^dCu5IV<7hhHw
z`-2`vmkDDR64#-gG07x<2YG9>m^2QVXSVS^zYJKrkoX8HU@b0L%aB|e?^w%}rnFF6
z(v}WNTh2%qr6Vh{igHHI${I>n&dGU{6}cc6QC8)WtfQQj%fMSn?fuB_CT$J`x@r(2
z`4uGo87cui0({GV;;=O+Yy-9ihHb*u;IJ*&ngDDYwk84Ffvt(ao`J2&z;<D4La-~a
zm*tAas=~e@Z)$s1GEiM@<|K(M$sv)nptJ*T{?0s}T5%A4rzmt<{qv~ty4MLBeg7m1
zyMAN;B<hDr<FNHLiP%4Q{>_uUBk}CuQ*m_gXz%Fx!N%rsuOIqeLq}$-KS<p$7Jd|-
z1{9f?KFy4?^{iTi-7pbb+flFWNAb?q$n{#Xnw`fLeRE7#QFl@^Nun7TBdpuySn!$(
zrt*3qm7j#Y?rZ_<ZaG-)I~8O#?uC(vg3};cC}3`sV~(At0$q|p&R*yaFBh;Mlw)6N
zGZlqe$A2TT?wm%e1@wF6=tcLbfa|?}5_bG31J|8jE5L7-!(VPR6^SM4&Ugr-)97x2
z!+QqcQk$tLtd6=grlEuJae>IgtAlZ&<y3TR75H-Spa8yB4zB&Cg0i}PC-|g*bf+AN
z+>k%rzUuV@l?=REmYZxeRSqdiNy;UKeT^yF<`iWPMZ1QYBQ;NoR`$h|=46SIl4pDq
zit(Ct`97-^xlMGN!1b=Q4&$7CPr@Mv#DrK7Tk>BV>=j1Sb27@B{Frx6@7ntE#9Vn5
zBqC1yByNC(-g_8d<Yx;R?Ywq^Ic0dwyftJVS0z83;J?O>E%kWR3zSa&W(H3#YIo>>
zAWhwF^zJ}fcxOXshjf~rk@7cM_fz|o3W6@Z*;h9J>=|kWMd}QKDC+%)M;Zo2xyY-i
zah%3usYiM|$a)G;0N=A|Rdw$NotM4nGkC>|P>eg=;&t4M+%gcT#X_L8Yg=!p@T4-2
z)IB_$vtQXc|BZ99cy1Y)HQe$&Gp)&>ja3o{0{dZ#T;EpokgwLXo;y$i)_V_nPgp7M
zUYw^^61I<bQ5REx8L#3#t7fdJ>MFh#%}V|Sx*}+FadJ8~)VjnB6*#(Kgv{oj^wFn)
z*U_Y?52>gRU|%4kZsXk($dJoCaj9oq@;=capfrZ}(eRvQoIcMvffvVY+K^Z~!qBXY
z=2Oqi7PlV!YgncAusaNR9^<_t$r?Yqm65#cI6;-pI(lJj7N`=z6*dt>rta$?W^@rm
zI{f9FbuPMwv$}&8`;cKIS16LJ<48_Sm<f*gl>Cq3950@0s1?GQPtR}1Oy_w?ICIAd
zs{c2fY6EZ-PU1|<NuN{n?x^#^RWp>%5|q}8aUBkRK0|Z1O|O=^LeNGdL|PT1(~~C=
z*)<`4IPs&bMlIokivEz)Em9wnqNSkd)S!n_eMA<47nTgI0)2i~qaOtQo8@x%q3gJ_
bt_^L|t?QdeW8_!%fz;j3sO^x)Ul8^${S>H@

literal 0
HcmV?d00001

diff --git a/__pycache__/Tomato.cpython-37.pyc b/__pycache__/Tomato.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6b12bece37edeae2f4acca8ac460ed43d032b523
GIT binary patch
literal 613
zcmZuu%}(4f5T5)k*|6IRdMHPZ<U+)K1uYUn1qoJ5P8O17bzHD;HX+Hb*fYFD`v!d?
zB%hFwD&+yVaOyZ=*$WfR=lS{k#U39HhY^rH`Y)Fw2jJNzOY<rCMqX_bAfTfm0|pKp
z1G?xv0D2PcJ?5Z)0ddd}3u4CvV=bojPn#``lslyn1rlfnFqhmzhxzET06o?tUqhdT
z7_dI}ScGeA9YZ#tb%=fT2_yQ;y6L5PCh9y@PrCq3OoCUxTKji!_2;*>=AhZ3a^qS+
z3-*p@@n;iqJ{6hd+(evbInK0=2b|x|gnsMzb~T}@xX@}YjaS#&^sg6KidyAU6IHp=
zT+6xCYy;(cgSUM;u51Z!Stjmyw_&c?W?s}P6S}K(j19|JiD;sIUD8(NmTQ7i3S9h!
za+B`U!s}sjoo6yB#7wKHNX9c=s5-e|Kdkfd<ox95H08&WJ)Ta!pQh)N?VX#vP$Evc
uG42+N(jztN)fPeM_#b{P>nwIlJJmK>ouZ4rP{V|yZmj$E$t%kpxc>nVOrrDv

literal 0
HcmV?d00001

diff --git a/__pycache__/Trac.cpython-37.pyc b/__pycache__/Trac.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c95f66d51b2d8a1d221d3f270b59180966ef4eda
GIT binary patch
literal 1475
zcma)6OK;jh5Z+xIFfI_%SDL<*W86bfdqz>3HcHz_Bm$&LsOrjLNlOBl+7LB}oSHw=
zzqHq$a&AwYI^WtRB#Nr8H8VRqyZg<~!`sE8%V?DKpHI(i#(qIbheeYuqUbKMU8b1g
z7eqfqiz(4yp4F!H`4BYQB8uJ;>#!DAtR)mz;)1m-WhtAatuiW0GNW?JA(>Tq<&w;)
zJE}m^QAJfEnO946e_7kj&~LZl2L>ci-VjA)VpB0?l1({rLZcJB<_WzdaZ1Wz5Oqi0
zU@%_@gOQH~&(e0(=^be&UC~au`6ml=bn|Sh@-^spDnozV>kj<N!MHc<jw+4TdyqV+
z?|<0YYs%gFOWCZy-fQmH*Va#hVb}L60N)s%X-CTLpgWQhE=Lqw#(0)bipHMW+8paN
zAm?v;Maq;NQ>;%!SVF9gW|8((*@>1R?S;xVn9331^-fLmhUTZ5*Jk{)<~uXKIpbB2
zhlm^rIANX_Glx{|e(8*4bk;u%dRfw=5;4YIZl@$BOUC7^eQh|30XcUXb!1WzJ42~R
za7B!pA^T16LPX$c5|GizT+JuT26EAQ4HWM&Rj@{rDOY?oiB}bxNHkH6U9oDHw2fUN
z#^e+ryu>Ly`BtaWdbmd$lH`>Z-Ae7(5(og}7Oq9g;*v}tZ;yWgaZPVq0ot_?EL#5$
z>mRu`SZTN)--?x5=UBK7WZpHRNnDt#?3~(;N|b_qPHlM170Po1;eSMpd1P91ux%_h
zS>D02a%EXJ78LOzRgJ)@<V-2nR}$TncD5EG6XAWZ0vO6o^N*BB#4E0F%T$`?-!(tG
znN_<VoOYhkR`WMQh2txyBqn)Na@bY#Ty*ci?{}osu9W>ijeD3Er2IDad$A?V19%w>
zKgjR_*h4U+F?<4sf5`$v$Azd8kZCoCJGSFG7IDk5j17$g`@%VMjcHe>8auOz9lwd#
EUoD&+=l}o!

literal 0
HcmV?d00001

diff --git a/__pycache__/Tree.cpython-37.pyc b/__pycache__/Tree.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fc10743ac2d4e6cc0ef49e2ab04ac70ae28a3916
GIT binary patch
literal 1799
zcmai#%TnA%6oy;Z5i<kEfPrzq9^(s)i5cTKc48)k#CAc9gI#!1<tV9Ai8%txXfBa7
zlyMC!`~Z0b*rY1kJdU<m&B~jsvdZ~I3tZ(?BGvi&?>>E6ebn93w}XRu!Pju|*U#@q
zh4>Sd?9y1Qutj$nBuEKFQ?V5VS`AcNO-s$zRt0IKzZ0Y%s<!Uwhr%{UeIY7FpCd&@
zN%T1Myp0BG*`=~rVT;BXp0E`XJfcGCJ7H_2akQQc)H&>7;6_mclfji^yTSI5E&788
zK?ojC#*QJiNja%48lb$?1uD{@)I)TRhNV7FBQz@Y7+s)osV8WXN>WeKMfybQDJsyk
z)R$<QE=ygeD^!qrhOW{zsju@mH>94WDVmeoqzc_+J<s$1lx~qJ^#WDXT+m*i+q5X#
zhiEpPKibQ3{?K>mGrBALWVxU{%LO{i1v<+GdWt?zbAd)KV{)8(bf3PE`U*#U`7iAy
zp2a2EZqgi0NNvyqs_Ym$GY1;4M|RKC5@&j1HOlVHi!$?~%=}#PIC?COlw)yV^o%35
zr}gw>HPu>=H%v(|=SyNo<#H*l)lybU;#fa0dnPHn>aS{8i*@?ykhd?7VjK%av|h7s
zKK0o><;d(QuXAkHq&VhYt*7i=O1*E`JHVbiTS0mk*jr1zzkMA0asOEFnRqq{-q_0<
zp~Bm@-mfwHHsAnt;3aSe*Z{r<ZUJ8dkAUmIJzxpI0qS1{mVpsq9he39REz#3@C0}a
zlz?-<55NR)8@LEmfD6D?pbRVmQ@{!^1n7VTAe;Vu;78yo@Ds2GtO5^!o4^841ZDsn
z=KeKc9KiYR<J-{3iGN$%^jz96$L(^X8&`@UJjwVYui;02yLI|`@V9+0Otfu3PI8^l
zBfk+RMkn-Jv7K9U!#yvGlM%nw2t7CQoLBo4x-rKm=bP@Ev#Jy91<Amf_bei6`$6FC
zc|lS{1gdH0{E336l1uc+3$|^e6S(|bs}nd;?8cF8ZF_Fq4ZSEa19!^{qC|-krSrQ8
z@uL1-slIAAy=uqp27b$}KJNw{Kd!#8zk@l?H=jLuyk2)!Hy54y<~Qs0XPf1@-FC-!
zD^;Yw(AiH0n(nUW;1fH|14dg6p%nl7R{zJ((ZkxBW@$xzPR%QplIMF&+K4iuy&XM$
z`wOSf-{6n7<v1<3={Zi4cbsOMx&d_2aenE#!HFlt)=snk0NCjv7TsWru+Y|ITCbQ%
zF4_$|H*B4(f1%Ol)o5S^qa+`7w>n|F;YCr}J5lN%42m}#V&ufCoy=t!n>E5;ugF<h
J>d;HG_76iVum=DD

literal 0
HcmV?d00001

diff --git a/tractor.py b/tractor.py
index 003937f..a1eda3e 100644
--- a/tractor.py
+++ b/tractor.py
@@ -214,9 +214,17 @@ class Tractor(TreeClass):
         parsed_data = data.decode().split()
         time.sleep(self.sleep_time)
         writer.close()
-        return {"ttl": int(parsed_data[0]), "is_alive": int(parsed_data[1]), "hydration": int(parsed_data[2]), "soil_level": int(parsed_data[3]),
-         "ready": int(parsed_data[4])}
-
+        ttl = int(parsed_data[0])
+        if parsed_data[1]=="True":
+                is_alive = True
+        else: 
+                is_alive = False
+        hydration = int(parsed_data[2])
+        soil_level = int(parsed_data[3])
+        ready = int(parsed_data[4])
+       # return {"ttl": int(parsed_data[0]), "is_alive": ((parsed_data[1]=="True")?True:False), "hydration": int(parsed_data[2]), "soil_level": int(parsed_data[3]), "ready": int(parsed_data[4])}
+        return ({"ttl": ttl,"is_alive": is_alive,"hydration": hydration,"soil_level": soil_level,"ready": ready})	
+	
     async def service(self):
         plant_location = await self.look_at_plants(self.current_location)
         for i in plant_location: