From dceb5bd8d5ba80683c16b54da073fe5268e1759b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20=C5=81ukasik?= <wojtek.lukasik@yahoo.pl>
Date: Mon, 8 Jun 2020 18:21:02 +0200
Subject: [PATCH] costam

---
 .idea/misc.xml                           |   2 +-
 .idea/wozek.iml                          |   2 +-
 __pycache__/data.cpython-37.pyc          | Bin 2311 -> 2311 bytes
 __pycache__/decision_tree.cpython-37.pyc | Bin 4767 -> 4786 bytes
 data.py                                  |   2 +-
 decision_tree.py                         |  22 ++++++++++------------
 environment.yml                          | Bin 4280 -> 4282 bytes
 img/shelf.png                            | Bin 691 -> 849 bytes
 main.py                                  |   2 +-
 9 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8eab719..715ed69 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (AL-2020)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (AL-2020)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/wozek.iml b/.idea/wozek.iml
index 004f809..b1bd648 100644
--- a/.idea/wozek.iml
+++ b/.idea/wozek.iml
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.8 (AL-2020)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.7 (AL-2020)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/__pycache__/data.cpython-37.pyc b/__pycache__/data.cpython-37.pyc
index 196eabc65826b54364b04b6b53e72da128d0325d..6a5342b6eab0c12bcd9593d65d2afad5959ebe26 100644
GIT binary patch
delta 22
ccmZn{Y8T>l;^pOH0D=u-_u{s1<o(3~05}&09{>OV

delta 22
ccmZn{Y8T>l;^pOH0D_JahvRl^<o(3~06T{Uj{pDw

diff --git a/__pycache__/decision_tree.cpython-37.pyc b/__pycache__/decision_tree.cpython-37.pyc
index 5b41fddbf90b73b53fd4046cff5d588de6ac5353..ae6781a3d0e4b96a64a54856bce29e4caaf3ad9f 100644
GIT binary patch
delta 847
zcmZ8f&1(}u6rb6o>E>fM9~7#sl{pyOwNirCRx7o%R1_2;^dNqBldN^xO*VbIA>Cy|
z#aaqpJPabGhvHoj?WKq})00OJLeKsa9t7Vc+JZB@A8+38H}Adq*v)^+Yjc{GAUHn!
zYCoR-s6FpppTm_$Lb5?yv_f0TS|OzK<k3hg64Eeol6cfpB)dTeNh=yEVYGsFg7lF|
z(o$A)cS)!$5F^s~j)~X}UgL~c>kZ(Z&pd}!xd|rotR;snn=7mww6|Rh+m7or9oF>M
zOJLS~X4zKNs(CCZaR(Z#<R82!`Rw4cZ83Mnl-t1%oF+=ov!#k(@)Hb49Rk13U9-K#
zs*P^W_9pwQ=k0Cg)}4bL__|kNO*imeZ-tki9r2t6HPcwGG?v?&WgiJwZfUX#R;hM7
z39K>3fa1v@Bi^YGw5Up>G(r1t!l;PHdCZXHs91~7r*EU{MiB@-MWL|wExu3beep7R
zAvP*ihWL^kpat<GnWtmocXELiMKLu@$AzDIORFNQT~A*^p^fG$2r3oL)P&g4oY-ZV
z;EKrT{S?HAUd&EnVD(rClj4<LyEiUnG6#$x941N)ZdaaoU|AqH7`>oL@}h*igtHQc
zC3GuDFLng-ufP<-nkc6G>6GB<eNCo6?5P8<c`zZyG6VmbyOTLHG>zmInyVuaysBIz
zr=(~G4W`BG%;LjNcN0i<8yG_GP%Yc0>++}maTkUHsuW$5@LxwW7<+@}cK$LJiDCMb
z0yE-Pc9EVF@3W@|b|o(}5PUHmC(NR6P`E07W^Wpu2Pt3#j;~DKQ0KHDPXV$D%nDQQ
W7k2JUI;HlggL;qNtELmWn)m~E>&Kb^

delta 850
zcmZ`%O=uHQ5Z-zD={C)7Ht`SJw7f%NNi9mHe_E-vRP^GZ7W7ap-DEfRL9$!l+fXAL
zD)b`g?SVasBAx|*4!sFpJbLfJyPgHFok?m7g6}ck&YSsW-t5f#Sbkl$7A-4d;QIaU
z>stAP^|Wt$9#4@G8#~Ye4?67ecnnL%gHk6EL!3BkL=Z9Z?!b`INyaQrdhCQTYjoJ7
z!aXBqD@G;p<Qu;!0>MRdvn55;=0b6oH+@&Nq|d`T-w3zx6Zrv}r5ku*v(e_YjZpd9
z0rwkz(+?tEmtix*aYY+GSAN8|!dAoMRiBHX7E0;YB8+OdRSfXBsB?i7R~;w(>vC&I
z_eAiJN8wRIPpC+WYAX_9KqYm_ik}ui@4i+Que`vegZ=o)^k;L`N|}&^44ec9<hU;O
zi}V;eQGMROl)H_pN+K9g1Ud2PNB<tcs@@&AlpZJ6nEpO62ow6(Kp8G-C%Xc7w3i))
zDg7e53xO_KH}ca+Y@#TJV1k@R-=uzTg(H_K#TA0|5zydd5kcuWdpSQ#M>-t_&+1op
zke(vzw9e;F-6cY$Pg-P|Bq$S{BN!$4?;UgKZKEg~!GJ6?!DKcwamzU!=k_crd_T1*
zMG(muecc&M_mXMXDGk$$dWLcso`FK5z_Q?=$a($NS-(%=a)zK=(lBcKX072WCF<?t
zx++YXM7l=sPahW0_7X*PpEFJ=jp?&YF6g!VI-J*E@*{(9$WIvzoTH6fE}~umc~$?(
u->P)SG=Ub`YZ__YrqcgQ`U|;0u&9@<GkUvF%2{U09I{h(pP9?pX666_ueRR+

diff --git a/data.py b/data.py
index b8e059f..4c3a444 100644
--- a/data.py
+++ b/data.py
@@ -40,7 +40,7 @@ learning_data = [
     ['gold', 'rectangle', 40, 'medium', 'Twix'],
     ['gold', 'rectangle', 50, 'medium', 'Prince-polo'],
     ['brown', 'rectangle', 55, 'medium', 'Snickers'],
-     ['brown', 'rectangle', 45, 'medium', 'Lion'],
+    ['brown', 'rectangle', 45, 'medium', 'Lion'],
     ['white', 'rectangle', 40, 'medium', 'Kinder-bueno'],
     ['red', 'rectangle', 50, 'medium', 'Kit-kat'],
     ['blue', 'rectangle', 115, 'big', 'Wedel'],
diff --git a/decision_tree.py b/decision_tree.py
index 1f6c05b..48a1d3a 100644
--- a/decision_tree.py
+++ b/decision_tree.py
@@ -62,15 +62,14 @@ def partition(rows, question):
 
 
 def gini(rows):
-    """ Gini impurity is a measure of how often a randomly chosen element from
-    the set would be incorrectly labeled if it was randomly labeled according to
-    the distribution of labels in the subset. """
+    """ Gini impurity to miara tego jak często losowo wybrany element zbioru byłby źle skategoryzowany, gdyby
+    przypisać mu losową kategorię spośród wszystkich kategorii znajdujących się w danym zbiorze.  """
 
     counts = class_counts(rows)
-    impurity = 1
+    impurity = 0
     for lbl in counts:
         prob_of_lbl = counts[lbl] / float(len(rows))
-        impurity -= prob_of_lbl ** 2
+        impurity += prob_of_lbl * (1 - prob_of_lbl)
     return impurity
 
 
@@ -169,16 +168,15 @@ def print_leaf(counts):
 # print_tree(my_tree)
 #
 # testing_data = [
-#     ['gold', 'rectangle', 50, 'medium', 'Name'],
-#     ['brown', 'rectangle', 55, 'medium', 'Snickers'],
-#     ['white', 'rectangle', 120, 'big', 'Name']
+#     ['red', 'rectangle', 50, 'medium', 'Kit-kat'],
+#     ['blue', 'rectangle', 115, 'big', 'Wedel'],
+#     ['white', 'rectangle', 15, 'small', 'Krowka'],
 # ]
 #
-# test = ['white', 'rectangle', 120, 'big', 'Name']
+# test =  ['white', 'rectangle', 15, 'small', 'Krowka']
 #
-# # for row in testing_data:
-# #     print(print_leaf(classify(row, my_tree)))
+# for row in testing_data:
+#     print(print_leaf(classify(row, my_tree)))
 #
 # wynik = print_leaf(classify(test, my_tree))[0]
 # print(wynik)
-
diff --git a/environment.yml b/environment.yml
index 2d225c4ad7876347ad4ace80f8ef6ddb0b47ba0e..2d49dc683da9d324797e86b05a9a69e6764a5888 100644
GIT binary patch
delta 35
mcmdm?xJz+EgMhdTgB3#zLn1>S5GOO_1L+hX%Xsos0c8NGw+N{K

delta 33
ncmdm`xI=M6gMg?rgB3#zgCj#8Ln1>mLq3pBVMv@jT|gNCm){6g

diff --git a/img/shelf.png b/img/shelf.png
index 3e443f005dec7dc677eed63888428737ecdad3de..47b4aa4096ab229c00b8f32d67cecc2d862005a4 100644
GIT binary patch
literal 849
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSU~JBGb`J1#c2+1T%1_J8No8Qr
zI6rlww}wlg%&~go4vEMaDv@_s%`_AvvpPhU&J29KvEaR|@s&H)m-i}5d#A3}u`!F|
zmd@TLw#`ekf6~;Yq8lf!`@eH>TF~M-R&(R;Ti(BJdB5?2<FPGwPRVU}vqxCAJEL=E
z<l0{|wO(Z`n5=fUq<Heiix#QJkLxmSy;rhY=b!nj$=&NX8GS2GoUyEY$ojDHYK`B=
zzJePumnI)tekistCg4ZhOSi^&k>#~~tIli??&srfZ{1qLDXp5LXF084e?j!6O{(@Y
zGzx+~&PvkWob>Nb@Lq#08UDwo=xv^Acx+}07jLuZw38E-M~6j=OkeTF{nU@>n*URF
z@D%DMcO|#zi0yjs{`cVfyt^Us`HGq%jjPnpS7*1s(*1Gk%bxSj=YLx@b-C}@(EaZX
zBhS9>eUVpgeOs6)drq%=)<)jv(ii?rxGZ~jx>gEXux5qr#Qa%}$Ff(<)&BBr^ZAdm
zN0zSc)V^`Ixo=C#`RSGAzM1*;^FIDo{={3wQ?%-Y;{r}#tZ){1L>4nJ=qZ6P<Elq@
zCjkZ7OFVsD*`Kg-^Xmz%WjZ1Q6p}1)jVN)>&&^HED`9XhN=+<DO;IS%EXh!C_w)@2
zZ{!mP#;uK~i(^Pd+}m3Ra}OIZusEvqE;Z>~x^t7thR}wu3#T98QE2#;RsX2A*Rbxt
zywW_!zQ+}NKL!?``&c`-Q$WRSf`nrdOQ#?*V@CA<P3J!E@w@Z!UHNByZ4WF;kTvDq
zZMS&_QvLba_fmNw6^|b6JFGDe^Lz;CgWGzhLCk>p)(i#1Gzab(jJd?<J9Z+GQMtXB
vQz-e#hK7lUkHO6%j!}88A<o?{zsKHiw)xh|n$5s)WMJ@g^>bP0l+XkKt6y3N

literal 691
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFflVQFt%noI|q0=J1Z0v<)>xlq%tsQ
zOst(~>v7mY=4gDdx2v|Sj?$wE3wLEWh8zi86~V&2bnS&z%_o<}Us$4;Sy(6%!_8Nx
z6DAuor?j*{l;t45fV#W7tGMRJde4QfJ?zK-R+PUl{LUvJmAY(JtZ>7s(B2dst+Y+6
z7yTEt`=Zog$m4P5%Hx$sO=6B;x3#I++x<c3dvSfAooc$#0cD}{hIdy8<qMq82`fGK
z`-o!L6p=^8j|!XhJpP<0z4_4m9P4b>d6Gt#PF6k=*ckC5VP|vX#emM`ork+t1@4<r
z81Zn=(Ma9v5wGX{X>FXdZPFvFvx!GGv{(oUC@yXjI<-Q{X|-Edr^;LR*gwwO>>c%H
z#;6(;=`3Ipo%ELdfAjsjvwp7hRM!+>t<j(M)sX2&d1Kn$P5b(FS64Ds%x~0Q`*yua
z!%hE7uXA;4SXj0<cE8@H_MUON^??VI^&}_hR%UYjwE0lyc7F=%ul&Y&rpvcqv-6X0
zFe%+y!z?4iw3zi&TzO@Ad3yf;d6{3oGgt8xt#WF&-Uf^p&H|6fVg?31We{epSZZGe
z6l5>)^mS!_!phCBC$yI7hzw9jvcxr_#5q4VH#M(>!MP|ku_QG`p**uBL&4qCHz2%`
zPaLRdj;D)bNX4zU7YrF01Q=KjEbprkW7PTdQkm)7ZjR|6)~HD4cJ7$9JDmG{%E?Kp
h-qUpGM*S#Yn6J)!<fPWZHlRBhJYD@<);T3K0RSGI8DRhb

diff --git a/main.py b/main.py
index cb61a47..177f331 100644
--- a/main.py
+++ b/main.py
@@ -11,6 +11,7 @@ from board import create_board, draw_board
 from random import randint, choice
 from mcda import choseProducts
 
+
 # Inicjalizacja programu i utworzenie obiektu ekrany
 def run():
     pygame.init()
@@ -44,7 +45,6 @@ def run():
                     agent.turn_left()
                 elif event.key == pygame.K_UP:
                     agent.move_forward(board)
-                    print(agent.x, agent.y)
                 elif event.key == pygame.K_SPACE:
                     board[9][0].item = choice(data.learning_data)
                     print("Wybrano: " + board[9][0].item[-1])