From 7cabeb6cbef7a7b4460275602785095f894de8c8 Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Wed, 19 May 2021 15:04:17 +0200
Subject: [PATCH] =?UTF-8?q?czytanie/odczytywanie=20drzewa=20z/do=20pliku?=
 =?UTF-8?q?=20za=20pomoc=C4=85=20pickle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                          |  32 +++++++++++--------
 __pycache__/definitions.cpython-37.pyc       | Bin 3703 -> 3703 bytes
 __pycache__/tractor.cpython-37.pyc           | Bin 8835 -> 8835 bytes
 __pycache__/treelearn.cpython-37.pyc         | Bin 1206 -> 1404 bytes
 resources/{mydecisiontree.png => mytree.png} | Bin
 resources/tree.pkl                           | Bin 0 -> 2643 bytes
 treelearn.py                                 |  29 ++++++++++-------
 7 files changed, 35 insertions(+), 26 deletions(-)
 rename resources/{mydecisiontree.png => mytree.png} (100%)
 create mode 100644 resources/tree.pkl

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 588758d..fd9d236 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="56453584-72bd-49f4-a39c-fccf91ab20c6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/py.py" beforeDir="false" afterPath="$PROJECT_DIR$/py.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/mydecisiontree.png" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/treelearn.py" beforeDir="false" afterPath="$PROJECT_DIR$/treelearn.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -133,6 +133,10 @@
       <workItem from="1621110850717" duration="377000" />
       <workItem from="1621111315400" duration="72000" />
       <workItem from="1621171225695" duration="880000" />
+      <workItem from="1621195639702" duration="147000" />
+      <workItem from="1621247003154" duration="155000" />
+      <workItem from="1621259807468" duration="619000" />
+      <workItem from="1621428139271" duration="1235000" />
     </task>
     <servers />
   </component>
@@ -144,26 +148,26 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state x="628" y="343" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1080@0.0.1920.1080" timestamp="1621109431051" />
-    <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1617994393023">
+    <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1621429221570">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617994393023" />
-    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1621172112876">
+    <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1621429221570" />
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1621429389327">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1621172112876" />
-    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1621172112876">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389327" />
+    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1621429389327">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1621172112876" />
-    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1621172112876">
+    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389327" />
+    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1621429389326">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1621172112876" />
-    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1621172112876">
+    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389326" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1621429389327">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1621172112876" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389327" />
     <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1619289752045">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -180,10 +184,10 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state width="1879" height="364" key="GridCell.Tab.1.right/0.0.1920.1080@0.0.1920.1080" timestamp="1619289752045" />
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1621171227060">
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1621428140628">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1621171227060" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1621428140628" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -197,6 +201,6 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1621172058000" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1621429250145" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/definitions.cpython-37.pyc b/__pycache__/definitions.cpython-37.pyc
index 7d238cd99e3e22d470d60455d3961828c1d2527e..12d2ce0b7f8ff6a6b6aa27a9a875c6da6b80f04f 100644
GIT binary patch
delta 29
jcmew^^IeA5iI<m)0SGp6FHQKqk#_+bqtWJdY$w?Pg5C)s

delta 29
jcmew^^IeA5iI<m)0SF@H7bg7J$h&}z@y_OTY$w?Pf=UU4

diff --git a/__pycache__/tractor.cpython-37.pyc b/__pycache__/tractor.cpython-37.pyc
index 9fff24ee02ae403cf564c19a5a914e21f628b156..d816ea1dcc2b6c0e02eb42d1229c68e40a61ebbf 100644
GIT binary patch
delta 20
ZcmZp6ZFc2$;^pOH0D@G7g&VmmlmIS11bzSj

delta 20
acmZp6ZFc2$;^pOH0D?ox3pR3BC;<R4)&$)E

diff --git a/__pycache__/treelearn.cpython-37.pyc b/__pycache__/treelearn.cpython-37.pyc
index 1b2ee9cc279cce3aaf02769865754eb52174b1b0..e58c682c0bd1108ed76f44b49c1e3f92045f1c85 100644
GIT binary patch
delta 815
zcmZ8eyKdA#6rDSM+w09{vk8y9C_pF$8>%!QiXd7fpmRZRcD%tGzcikOB=RZ}p{0oY
z1KxrfiGl{c0V(Z#1s_1c9Y;hEk9_X&y=Ug!JO1YUcDuX2?-G12yw7jGn&;h{z|QaQ
zJb=Ur97Y&T+|&y^Ajq|(llp;=TxZ5d5_Fl#EQ|~1A0D0Bc*awF%U=kBOrW6*=D;5c
zt<i<iW=uwzHm6KKqjQ)MVKL(jfMh>}-8feYbFQkuEM_x@xy(B-X0(Ee-Xb%t0@lH(
z3-^r7NJSd2(kgvUPw_ad=~U#Jm5){wi0~)f3TLP&>weN^hFEBNm4P;9Wj2df)(grS
z)%|Aa|J=+HgJ!w1aEFa-Wlm6Kv7TzbBCp8S&f@cvK99<L%12STEqD|Si^C*vu5u^#
z-=w5`Uz*WTT#CAc*Se(d_v;H-!>c~N)MN)IUX~ZpomNzC-H<ddrCx;MEjRFfrCG$I
z!z7Y=l7~#{D9xlk$>U5K1&=d<f-qxY8Q44u+1{vp$2GN28^=QGY?>DJkd9XagDFEv
z*;v}+C=^p{SHh8m<N6ETfc5$(eYx$Z-+C8;KnHGvO9#*e8<&aSYtRE12Dscd$2aR|
zT49=~=2rb(TRmM@w1o|1(oe&~XpcpsxQz2m<x3rbzzT3>vegTEX();$7fHN7jMMNS
zl13Z&0PDfxKh@$`>2TUM@@1@Z)h_QT@D#vO{X)ODyQ#Q3|FV^9P1%proK2JH3813v
OBXn>!HKSTBAN&D(l+bGc

delta 597
zcmZ8eyKdA#6rHDEYda3wO?X5~wV-WMLJ@>`v<M-nFo<Aw9LI~jw#Ji4ps^@Ig+#G(
zOJSG%03YKH@fAoE+zA2+Jn}imqjT=P<N4`*b;J8X;30UP?GLZc_$IuJUu<sNoRh*W
zz1YJ@AVG^s>Bl~3Cin*w2f`9IaJcz+_}+r-19+Ry01EY3krnNkz=8~9z%9g0%tSKY
zVvRJuf?A@HaDb`e=cr|x^_C`@4y0wuUOAcx@Co-5ZMkxLPjjebX{(?7t?rrX7~N8S
zAN;%7+A8d~v<(plR5T!rG<%8`lSi>D)22F=%e4D}Uv|&Q-n~oZTahmFCa=~?rs+Yw
z&KBFFRVQnaG_fPoL>w)fvyoKI$m&F$jBHiqYf0g_BR$Sl_njPfkLmP!%!R2iGLfic
z<e5zBlbGgZ7TW-IQK>IT&bo8@WbT+Bb`=2ODGsp%%fdd6um|5$KnKg+j<MQe;E}w0
z$F4n`8F>LapvIs~-lRu=W;a`nF(bT#<sR^2D~`%UnZ8B-`XDcpEFJj;Nx%EX_M-q?
r(l%f&QBJxUpWodz(&T@)`md>TyR5`%k>0`JXd(a~<~H*?z@Wlk<+qG`

diff --git a/resources/mydecisiontree.png b/resources/mytree.png
similarity index 100%
rename from resources/mydecisiontree.png
rename to resources/mytree.png
diff --git a/resources/tree.pkl b/resources/tree.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..f12113cd83d46c58ff9a35daa728cfaab06d1fcb
GIT binary patch
literal 2643
zcmbVO%WoS+7+>e<x^3b%v<;9HmxR`(sc}P7LTT8Eous8(mg1JO<+WX}*PRu9eY>-T
zNJNA~oJQQZAn^wv@gHzNlmkMDUQiDRgm|7f_Kd`1zS*7lQB^X0hne{v^S$QhZ@u1c
z`)^hp%d2IW=QtVDu2{bB_=zRQc73;AyUe9|l(}Ws@e-gMeGg)5(3duLD2ifxE^|C?
z2K~kW=dZgp7Y2+tKl+V|%eWE-g{J8E42Hy|s`a*6avF@nux{+(rd79Q`c}13aePx;
zgSggbB)c>`%QEcHV#au+c*}9GQ)ZSu%Vs<UQy3)9a;+d^7vC^e*|AvQIX>*vjgd%(
zwq~tf;?iBZu=K22sa`dGW-$kL>&8B`<cYb}M!>6F<tf{qWBCq@v_kCdHVV@p4PA;}
znqiud)WeS14b!SLs0DjkZZNCbcAh4W3VXFdV`rxr#<(mYWc7eG0_L0W0PhEOJ9;(~
z_Sv<d+E~rlb<fFEg9>vk&$Ct&rsvr8n$NtzW(n9IS|w_wPzwh%Wdp|Zu_8RU2@e(E
z;j|Xh`Zi!9GAyyxhLeCvqmKu3=i%Vi%}scu0I9UrZ^XFl3>?yR{ro?i#G)w-9xZO=
z@f8K35fV%>m@Y<jY^VL$ebV-At73839j2*#9AhKFktU=IaMak%nf4bp;c?!gK`uow
zn{ccP+$c>Tq7yKq4buHolzp7?nllA>0&9+KK$fPq+Jc>6Fk94OoA6`-POiaRnhwi%
z;P^4^dQf9<N*fb#Lr6U(UC*QIrweczU5{<RGj!7E=jmOUI|XO3g$o6ER<`gRQ1!HE
zOvNcP)242v1Vo^~6G#swi^eeb5P=$U0#%H1eA7C&&kHz6(87{Hd`&=I{>EV0IKVxG
zxO7Tpmv)80*)=$qri7+6r3uf`MSh4k;XKXpL$V1P&GS0&HOljF0n2#406H&&-iv`3
zirRP+F485cYpEu@NSC>fbQ216g-fzcxD;sfyg5k*my27uG@l|8DMLH}5)PIY9U~vy
ze)rt1wV%{dOUO@GiG&9>7)kmO%&*tTwcr2x+Wq`vbw&u}vO*BE?eurVL>6C2%Sm|<
z`vQ@9A>NQW;;mcc<~JjkKK${PIvT2@HPdsv4u8sBwLM2X-!D&`CM}vF2p1%rhe#cM
zvlbCT<!5z1JVfgSf^!842R)MPYsk%#(?jnczWu`;^++fP*Y$kQ^~wH)7n1}>8xoGa
zd+8wgZ0h(Qzm0yWPPHr77kiG^nSZ?Jd#Uz#3L!XkkUIMu%9QmSA)jVHIrPyT6+dk)
zI?;1H*@y7%G?Dnhj}1~s-^e2QZu6@@zcqeQ<vWK~6GV<)nTPy+g!%yz?%%5&{*+|T
zd3NCFKj8EKzC-stc!|N4qJd-LhE)mpr~G9(cMY7oR}1ipn7jBX+k{uCzLm>vC!LGx
zzZmUzRqjVo)|Vq*aC}*a_(-qJbn((o?vbA3GL+0kJBjv*Xb-gt?{|2T`goUK@=`DF
zNx95N%BQ3IQZM~WUe+P)B`@_-F84Tr*BHEB42t3(nHl|EG;cT_{y&5_!~<kAvnMmN
IU<Sp^zk{v4YXATM

literal 0
HcmV?d00001

diff --git a/treelearn.py b/treelearn.py
index 54abb94..0168fc8 100644
--- a/treelearn.py
+++ b/treelearn.py
@@ -2,22 +2,27 @@ import matplotlib.image as pltimg
 import matplotlib.pyplot as plt
 import os
 import pandas
+import pickle
 import pydotplus
 from sklearn import tree
 from sklearn.tree import DecisionTreeClassifier
 def treelearn(): #zwraca utworzone drzewo decyzyjne
-    df = pandas.read_csv(os.path.join('resources', 'data.csv')) #czytanie danych do nauki drzewa z pliku .csv
-    features = ['amount of seeds', 'collected plants', 'fertilizer', 'fuel', 'water level']
-    x = df[features] #wczytanie atrybutów, z których ma się uczyć drzewo
-    y = df['back to station'] #podjęte decyzje
-    dtree = DecisionTreeClassifier() #tworzy obiekt drzewa
-    dtree = dtree.fit(x, y) #uczy drzewo
-    data = tree.export_graphviz(dtree, out_file=None, feature_names=features)
-    graph = pydotplus.graph_from_dot_data(data)
-    graph.write_png(os.path.join('resources', 'mydecisiontree.png'))
-    img = pltimg.imread(os.path.join('resources', 'mydecisiontree.png'))
-    imgplot = plt.imshow(img)
-    plt.show() #wyświetl drzewo decyzyjne
+    if os.path.exists("resources/tree.pkl"): #jeżeli drzewo jest zapisane w pliku to odczytaj
+        dtree = pickle.load(open(os.path.join('resources', "tree.pkl"), "rb"))
+    else: #w przeciwnym razie utwórz drzewo od początku i zapisz do pliku
+        df = pandas.read_csv(os.path.join('resources', 'data.csv')) #czytanie danych do nauki drzewa z pliku .csv
+        features = ['amount of seeds', 'collected plants', 'fertilizer', 'fuel', 'water level']
+        x = df[features] #wczytanie atrybutów, z których ma się uczyć drzewo
+        y = df['back to station'] #podjęte decyzje
+        dtree = DecisionTreeClassifier() #klasyfikuje drzewo
+        dtree = dtree.fit(x, y) #uczy drzewo
+        pickle.dump(dtree, open(os.path.join('resources', "tree.pkl"), "wb"))
+        data = tree.export_graphviz(dtree, out_file=None, feature_names=features)
+        graph = pydotplus.graph_from_dot_data(data)
+        graph.write_png(os.path.join('resources', 'mytree.png'))
+        img = pltimg.imread(os.path.join('resources', 'mytree.png'))
+        imgplot = plt.imshow(img)
+        plt.show() #wyświetl drzewo decyzyjne
     return dtree
 def make_decision(tree, amount_of_seeds, collected_plants, fertilizer, fuel, water_level): #zwraca decyzję o powrocie do stacji (0 : NIE, 1 : TAK)
     decision = tree.predict([[amount_of_seeds, collected_plants, fertilizer, fuel, water_level]]) #podejmij decyzję na podstawie aktualnych parametrów traktora o powrocie do stacji lub nie