From 4952132ccc430a8df648baee7f83335a142837b5 Mon Sep 17 00:00:00 2001
From: tomasz <tomlec2@st.amu.edu.pl>
Date: Tue, 9 Jun 2020 17:57:00 +0200
Subject: [PATCH] files update

---
 .gitignore                            |   1 +
 .idea/misc.xml                        |   3 +
 .idea/workspace.xml                   | 414 +++++++++++++++-----------
 AStar.py                              |   2 +-
 __pycache__/AStar.cpython-37.pyc      | Bin 2637 -> 2637 bytes
 __pycache__/funkcje.cpython-37.pyc    | Bin 4648 -> 4635 bytes
 __pycache__/genetyczne.cpython-37.pyc | Bin 4288 -> 4376 bytes
 __pycache__/program.cpython-37.pyc    | Bin 5033 -> 5021 bytes
 funkcje.py                            |  28 +-
 genetyczne.py                         |   4 +-
 main.py                               |   2 +-
 program.py                            |   3 +-
 12 files changed, 266 insertions(+), 191 deletions(-)

diff --git a/.gitignore b/.gitignore
index bee8a64..322d18e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 __pycache__
+yolov3.weights
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a2e120d..8fda991 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+  <component name="PyPackaging">
+    <option name="earlyReleasesAsUpgrades" value="true" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a3c438b..b74c797 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8264ee8d-5217-4cb6-b982-78f67fabc82e" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/AStar.py" beforeDir="false" afterPath="$PROJECT_DIR$/AStar.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/funkcje.py" beforeDir="false" afterPath="$PROJECT_DIR$/funkcje.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/genetyczne.py" beforeDir="false" afterPath="$PROJECT_DIR$/genetyczne.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
@@ -23,60 +26,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/funkcje.py">
+        <entry file="file://$PROJECT_DIR$/wheel.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1547">
-              <caret line="91" column="9" selection-start-line="91" selection-start-column="9" selection-end-line="91" selection-end-column="9" />
-              <folding>
-                <element signature="e#0#43#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shelf.py">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/genetyczne.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="16" column="7" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/main.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="625">
-              <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
-              <folding>
-                <element signature="e#0#21#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AStar.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="741">
-              <caret line="81" column="31" selection-start-line="81" selection-start-column="31" selection-end-line="81" selection-end-column="31" />
-              <folding>
-                <element signature="e#0#12#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/program.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="452">
-              <caret line="96" column="52" lean-forward="true" selection-start-line="96" selection-start-column="52" selection-end-line="96" selection-end-column="52" />
+            <state relative-caret-position="624">
+              <caret line="58" column="55" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="55" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -85,10 +38,76 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Data.py">
+        <entry file="file://$PROJECT_DIR$/unboxOnTheFloor.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="17" column="27" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
+            <state relative-caret-position="136">
+              <caret line="8" selection-start-line="8" selection-end-line="8" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/genetyczne.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="561">
+              <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+              <folding>
+                <element signature="e#0#21#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/whereDecision.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="17">
+              <caret line="1" column="15" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="15" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/funkcje.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="224">
+              <caret line="165" column="4" selection-start-line="165" selection-start-column="4" selection-end-line="165" selection-end-column="4" />
+              <folding>
+                <element signature="e#0#43#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/program.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="309">
+              <caret line="104" column="20" selection-start-line="104" selection-start-column="20" selection-end-line="104" selection-end-column="20" />
+              <folding>
+                <element signature="e#0#13#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="34">
+              <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/main.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="602">
+              <caret line="49" selection-start-line="49" selection-end-line="49" />
+              <folding>
+                <element signature="e#0#21#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -104,9 +123,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>self</find>
-      <find>gen</find>
-      <find>data.geny</find>
       <find>crosso</find>
       <find>fitness</find>
       <find>wybierzUnbox</find>
@@ -131,9 +147,12 @@
       <find>podajDwaChromosomy</find>
       <find>generuj</find>
       <find>populacjaF</find>
-      <find>rys</find>
-      <find>data</find>
       <find>populacjaFitness</find>
+      <find>data</find>
+      <find>print</find>
+      <find>graphviz</find>
+      <find>key</find>
+      <find>rys</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -154,10 +173,8 @@
         <option value="$PROJECT_DIR$/dodatkoweMetody.py" />
         <option value="$PROJECT_DIR$/wheel.py" />
         <option value="$PROJECT_DIR$/Data.py" />
-        <option value="$PROJECT_DIR$/neurons.py" />
         <option value="$PROJECT_DIR$/genetyczny/metody.py" />
         <option value="$PROJECT_DIR$/genetyczny/randomBox.py" />
-        <option value="$PROJECT_DIR$/AStar.py" />
         <option value="$PROJECT_DIR$/genetyczny/Gene1.py" />
         <option value="$PROJECT_DIR$/genetyczny/genetyczny.py" />
         <option value="$PROJECT_DIR$/Mapa/generate.py" />
@@ -168,18 +185,21 @@
         <option value="$PROJECT_DIR$/genetyczny/genetyczne.py" />
         <option value="$PROJECT_DIR$/opis/environment.md" />
         <option value="$PROJECT_DIR$/LechT.md" />
-        <option value="$PROJECT_DIR$/funkcje.py" />
-        <option value="$PROJECT_DIR$/program.py" />
-        <option value="$PROJECT_DIR$/genetyczne.py" />
+        <option value="$PROJECT_DIR$/AStar.py" />
+        <option value="$PROJECT_DIR$/neurons.py" />
         <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/funkcje.py" />
+        <option value="$PROJECT_DIR$/genetyczne.py" />
+        <option value="$PROJECT_DIR$/program.py" />
+        <option value="$PROJECT_DIR$/.gitignore" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="2493" />
+    <option name="x" value="1912" />
     <option name="y" value="-8" />
-    <option name="width" value="1078" />
-    <option name="height" value="838" />
+    <option name="width" value="1616" />
+    <option name="height" value="1176" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectReloadState">
@@ -190,6 +210,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -201,11 +222,10 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+    <property name="settings.editor.selected.configurable" value="editing.templates" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -337,8 +357,8 @@
     <recent_temporary>
       <list>
         <item itemvalue="Python.main" />
-        <item itemvalue="Python.genetyczne" />
         <item itemvalue="Python.funkcje" />
+        <item itemvalue="Python.genetyczne" />
         <item itemvalue="Python.neurons" />
         <item itemvalue="Python.julian" />
       </list>
@@ -370,18 +390,18 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="1616" height="1176" extended-state="6" />
+    <frame x="1912" y="-8" width="1616" height="1176" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4995206" visible="true" weight="0.2114396" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4995206" visible="true" weight="0.20758355" />
       <window_info id="Structure" order="1" sideWeight="0.5004794" side_tool="true" weight="0.3382353" />
       <window_info id="Favorites" order="2" sideWeight="0.5011338" side_tool="true" weight="0.27768165" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32598275" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49932885" visible="true" weight="0.21093" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932885" visible="true" weight="0.21093" />
       <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
-      <window_info anchor="bottom" x="1942" y="641" width="1156" height="277" id="Debug" order="5" sideWeight="0.49932885" weight="0.4122723" />
+      <window_info anchor="bottom" x="1942" y="641" width="1156" height="277" id="Debug" order="5" sideWeight="0.49932885" weight="0.27900288" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32848233" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32848233" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.32848233" />
@@ -418,10 +438,25 @@
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/program.py</url>
+          <line>90</line>
+          <option name="timeStamp" value="14" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/funkcje.py</url>
+          <line>233</line>
+          <option name="timeStamp" value="16" />
+        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/genetyczne.py</url>
-          <line>26</line>
-          <option name="timeStamp" value="10" />
+          <line>33</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/program.py</url>
+          <line>104</line>
+          <option name="timeStamp" value="19" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
@@ -450,13 +485,6 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/julian.py" />
     <entry file="file://$PROJECT_DIR$/dodatkoweMetody.py" />
-    <entry file="file://$PROJECT_DIR$/unboxOnTheFloor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/genetyczny/__init__.py" />
     <entry file="file://$PROJECT_DIR$/boxOnTheFloor.py">
       <provider selected="true" editor-type-id="text-editor" />
@@ -494,27 +522,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/wall.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/codecs.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="310" column="64" lean-forward="true" selection-start-line="310" selection-start-column="10" selection-end-line="310" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/helpers/pydev/pydevd.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="1740" selection-start-line="1740" selection-end-line="1740" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/box.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
@@ -553,14 +560,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WGoracy.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/LechT.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -588,33 +587,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/generate.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3094">
-          <caret line="182" selection-start-line="182" selection-end-line="182" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/neurons.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
-          <folding>
-            <element signature="e#0#12#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Evencik.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/whereDecision.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="15" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Data.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -622,12 +597,116 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/AStar.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1377">
+          <caret line="81" column="33" selection-start-line="81" selection-start-column="33" selection-end-line="81" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#12#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/shelf.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/generate.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2203">
+          <caret line="182" selection-start-line="182" selection-end-line="182" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/WGoracy.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor />
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/neurons.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="428">
+          <caret line="42" column="18" lean-forward="true" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#12#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/wall.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_HOME_DIR$/helpers/pydev/_pydev_imps/_pydev_execfile.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/site-packages/matplotlib/axes/_axes.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="4379" selection-start-line="4379" selection-end-line="4379" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/site-packages/matplotlib/cbook/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="1649" selection-start-line="1649" selection-end-line="1649" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/codecs.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="309" selection-start-line="309" selection-end-line="309" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="602">
+          <caret line="49" selection-start-line="49" selection-end-line="49" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_HOME_DIR$/helpers/pydev/pydevd.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="1134" column="22" lean-forward="true" selection-start-line="1134" selection-start-column="22" selection-end-line="1134" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/whereDecision.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="15" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/funkcje.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="165" column="4" selection-start-line="165" selection-start-column="4" selection-end-line="165" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#43#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/wheel.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="684">
+        <state relative-caret-position="624">
           <caret line="58" column="55" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="55" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
@@ -635,52 +714,39 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AStar.py">
+    <entry file="file://$PROJECT_DIR$/unboxOnTheFloor.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="741">
-          <caret line="81" column="31" selection-start-line="81" selection-start-column="31" selection-end-line="81" selection-end-column="31" />
-          <folding>
-            <element signature="e#0#12#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/funkcje.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1547">
-          <caret line="91" column="9" selection-start-line="91" selection-start-column="9" selection-end-line="91" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#43#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/program.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="452">
-          <caret line="96" column="52" lean-forward="true" selection-start-line="96" selection-start-column="52" selection-end-line="96" selection-end-column="52" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="136">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/genetyczne.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="16" column="7" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="625">
-          <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
+        <state relative-caret-position="561">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
           <folding>
             <element signature="e#0#21#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/program.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="309">
+          <caret line="104" column="20" selection-start-line="104" selection-start-column="20" selection-end-line="104" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/AStar.py b/AStar.py
index d0ecf9c..6b13cd4 100644
--- a/AStar.py
+++ b/AStar.py
@@ -79,7 +79,7 @@ class AStar:
                 else:
                     child.g = current.g + cost
                 child.h = (((child.position[0]-endNode.position[0]) ** 2) + ((child.position[1]-endNode.position[1]) ** 2))
-                child.f = child.g + child.h
+                child.f = child  .g + child.h
 
                 if len([i for i in toVisit if child==i and child.g>i.g])>0:
                     continue
diff --git a/__pycache__/AStar.cpython-37.pyc b/__pycache__/AStar.cpython-37.pyc
index 0e29d9d4d73de82de3df498b4e5ab2be135ecf3a..e733c82eb5ef36761a9c714cc432ae8a7ca3606a 100644
GIT binary patch
delta 22
ccmX>ra#n=biI<m)0SM-<yBGIlBd-G&07qvAsQ>@~

delta 22
ccmX>ra#n=biI<m)0SM-F-i~{;k=KC>07e%EegFUf

diff --git a/__pycache__/funkcje.cpython-37.pyc b/__pycache__/funkcje.cpython-37.pyc
index d134230812a9514ca47a89216973e7245236db12..c88b048cd4a6f37e4fa20053ceb22cd8b24987b8 100644
GIT binary patch
delta 1233
zcmZWoOK%)S5T2fyo$Z~OecE~91g(-d&X73C!2yMkNO>q6g0TpJ2umPMrU!e+v)ikh
zUhG}j_y9*ZSbd2E5^#w)L_&as_yPF|NQl0`DVO{PB&uc)M4MjiS3T8TkN&Fa$J5`O
zZrrTbeGAv)Z~y*e{`f)TD0_6Ubo(Pqc)8#A*L`M*s^DK*>w%~VA7v;45u&V%x@e$m
zh^A<vY>Kw%plpdbF^{q>4vE7kJK~5qigHf4?_1HagWoUkh#B{Gtm2=at-5SMuT-A0
z6Z&88v-4F<B&t9Yh4FhuZ&0XskfdOv0ve>Pj0O+oPUJyHe^-62YuFAf&|wM3=|(Ua
z#F?0UK=(e>&#TASDP7^$I^-J|LS%zW`?|i*FP)pQ_J=a>C6imSPzhctJOqn*tixbY
z|HOX_N;jPBYkF8)ezT2R)5zkjchGE{+?B;d!AVlG@oZ}0_V{5hg=ub?{;L+TW$pM+
z&X(`?%6G#V^1Vbr4+e)^Im3~P0_f^L{VV4T>lv0!V>tN8*(f!L2SWC5%AL>kwP1-|
z)@cA4Ig2=S$>&A#8BXFXRq4HSBhJUAH#kpvHZhfAGtECWj_MCzaz14joj=0M1$niY
zYqwa4BypnYs=g7f?RQZRrwFbRyn$f6jdZXY4<W>l$b}B+oPIo94-oE1xPjG%GP#$c
zj)o#uDH=aUqk`ziqS!u0h3mMdQk9Dug-(BM)>j=?)gQMOR_J>&x1Pt{?HH6Sl5T&b
z;w0-qjZQi*o|N4cgRh^ome{NMkJjR$nFev?)<FKE8}0Y@-$wI<I*Jz6iJIjW{)^WU
zl%<%mcdg9%g3)h}(SFZXZdTc4yS8A$7S7i$vy}V2_k)FlX5oOi?;0izgUB{sKZdOo
zOeK-Igs5uVyjLhw!TN5b(A>u$rY7Wr@fM`T2%98VrdlMiQfTBBn{qpHN|yhx?kuqZ
zjEhk=_3#g6KBcxZ?f84BiRMkSWMyq|e>1(4O9|6)T%jo~+jBZjXY^O?vwLf#Bp%=d
zLD>O|v|A>)Oi(riRSk$hpdc@#RnlD!GJmTt#VAj&6U9XrA;fxz*kzog%kT0!ukv~R
L3UBa`U*O??dDRkp

delta 1234
zcmZWo&u<$=6rQ)gy<Y!J)0z}erKU}mkN{FuM4KYf1Ob8+L4it<Kx{l)*N(kwW@a1P
za>$`vkhny1L`aRea6m#8Qg7wd1AoIFdO`dTh!gLv5mfH3_ItB$-uu3p_h!Cd{%N^-
zy;AWRK7ZYR^2P6GkE<>C?s#Q;$KmcbY}e-=FQF}SpO?`FJm3|y6<*~vv{hc`4YW1h
z<O^u){1jhA+u*198MIAq-DF|w`0>VrzjrKH((l@jkDf=hwnduwIRAcIXys=Jirohe
zQ<xf4vtykAu+e2@a8Txy^{jiqjTXCSY_rc_JhaF&wVq>#_S8BA%(OAjJ~4oOwR($~
zoD&9&GhBmtLjbZ1haE8%y16;*tK5o4U76b=N;<Kq;&fi(>8<g;h-H?$vK=WEi`<fT
z(u2?u4GMtKt~0)=BB6Gz@!JW{p_{{4ED?7BXDO;I#xm>8m_9*=3=o*nG?u`3!GgLe
zF6xSN_hs6CXwS6$uIwgKMM*mr2Kq$>A-A(+FCCG*{>6D|Q=F%ndAUgv_4wpdii~hx
z))5%$SP(!JeEb4Ktmy^!T9XuuQiO(}CWt`qxv#FxG5W)_-)&E}QmGOQl9a{3fhLG`
z{m6Y-E@)iJ_w?7^`X(vn)n2s!0j7=H@27I2W^27bL38xM!FaD5i`j}Z{ihegC0#51
zyjs-5De56MDDf2nDugf*ux*(N%Occ&l-^hu%jAMyp_7}q`FWiZww9-Z>*?rQ{f@r^
zS9R)(BccmE5fbZVq6j8YFIMr#aVP4J|6g?uliZef;{NU2RD<C&<g=<H`Hx5<>HJ{L
zjXKuc0gp=c7JB|W=~Qgm!<PQCd}X;1U&G%bNL<5F?sVd0CmM<}{)84b{I~My*Jy#y
zC}%?+sTgA);H>lzusMd0%3}LhJBZBJsgRS!-F|fL0MBYF+vjeJs56KYl?iIwWZ~(#
zL8hX1uZz9>q1J+uepp+975$`kVR5c;R=S_0k94d4k+Xv=;e!6Kai)F+hedy8Cu&3A
zZLF#n$VqoyTqG#=x=y1@1Xl^DK4P1I$e!9|p<3J|Z*!3HtRKHgw^tHffV&K^z8(a&
R_nue5*Y!?$OJ3Cr{sDf;2C@JE

diff --git a/__pycache__/genetyczne.cpython-37.pyc b/__pycache__/genetyczne.cpython-37.pyc
index 483b4f9a906940108c777936c0479ef4ddc25a28..6bcc9a21a4e296e0e7998a0fe867c1e5b01a401e 100644
GIT binary patch
delta 1467
zcmZuxOK%iM5T2g*z72?n*Ep;lA9jQRzrw?@<zSqE2(l6d<Y)*%gJ-;~y*sn6ot3dQ
zBOm+=lIB465G7J_;KGFiQgY$QDYqaoLJHTtao`7}s&|1kqOJK{-St&>^;gyVbmYNk
zeleFzOE}uU{`cdX!JqPvc7Mj1%VNcqW7Sn+%~fOF)nX%J>k@u!O^&47a%3PXp&Ch%
zx+llxJv-DQWsfaMx0d5nlydbA8Lo$VWJVJD)0=Z4Mnq{>A0#vo)kur<Jw47KE7N5~
z()zCXTMGXP%I}Oxn{z9YYkntLshxJZgri#XE_=QQ&gy!#G+(OvVcB(j@8--c>#cv~
zo1oFEeMp$-5!S$|)IC4M;I&%d^ui~5Ubo%~G1A%Zo$7g8{+-}n|EbeGN9P&J))_#k
z;D_VYLZ$r+jfV>z1?RvJIt0sBhCg8u|3cnoL;Np!cJw%|N~X$se{!Dba+>9t$+Ak3
zr4<<F$CNfR_+#bl;xXhVx=3U)QEHywn@qt0^jI1kB7$1+{B8JzOa=+7zz~{UIL=S1
zXIPovRGX$jAtsdhb9JtmA&S^Ovk`#1eS<FR(2jguyO8PMp`p#NDgLMS^|v_+qLX2Y
z_EN?1a0Kln)##PMfk7hlZ9vm3!bSX=CW3^Q&$ELJvizdnX4CwoKELn8G2<MY<v$qz
zEQ*{{Ny_tEb!>ysgA&HW2m$pnoFEt{5H}hnYYf3M;56BXc+D&yo*;9Qpf4}}&^*iL
z`7879U2%-wz1lp{W(YnbIEav>++byU1H5Jn1)Qd365h^+^~T%wbKo2?wbi>2)ZsjF
zE)d6TR6W>g?l}ENlQ)mhz^_@9criW9@{iA_U$YV=XfdERvgAZQJ&~}@{!o4;JG&zC
z&BLci0t+EA!0}yt9w162M0qELxK^T5ucLk^DdxRk)B<n{!8(9iy~xI6qI^YKK11+v
z>2`89yUPE~{UN05$h3hW@<}uZTD}XPQ?STpmMqaVSBaMGc8ySxBoqAuUy}6|!DWJ@
z2zJg7ww(9+io~cUw&`v;mxRtk1!9Y$(!+uRHwq)HfJGhTi-oN_LMW{()HNcAj7T!L
zgn-o)XD-kJ9c-KUlVjJbjxXBSRvJOw)<g+y)rHo+w?#oqd}v_g`z17&t*mXVwfv3M
nbx)KJhKW!npywjq00=Qei&6c76ajGu+M=({-7E3?1LOY#%n>z^

delta 1396
zcmZux&u<$=6rS1NYp*vBB#0Q&HYFe&XiG|(sv%WHfELseQB_sYN>DA?O|cX2y3e~x
zjn;}P^9KaY1#)T;XAZP~0EZ&=gb>F)aIe$@|3D?)d#+kX!mIi8?aue+&3x~Te?0#C
zoWEA9RRsQiyZ6u6)y5D0uX~U1Efa+n$r&+}1D(0X+{h$;*O{Bl4dxbWOy+hW+Zqmi
zODn_;qp%Up%qm1-47GuCJIL%pAIgu#SL*|}a3gJ7gCcVZrw}+_xwRK%E{ZD=rbNVK
zg;AJ=HM9m*lvPKvLbNM)k+(fk+>=t=iZ(=6!$>{SB5P<!5s7P}X|F#v@IW9D9y4gf
zbcEJlwh&Ff)LThbnp-<*n3Y<h=Cpn-s6xM&w>SFR5ckx9)|aztN?(~jf?-1Q<g>@|
zrKMG*FCFRW4O!7&(c!4->Ic$PRbzRrf$GxAlW)@7i>1C3C(m9^!^=3+G+~+q#?3hC
z!!e=~N_i7zk&fVq8XBkMg1T??9237b9avB&&DBPYB)oieJB6r!opOY<qWa!ER~=vB
zk+~$7)Kl~F)d>os%&<gj8Jr$oMP9nyw43jQo9z%@Bf;1L^y(vgh@<Bq2x;JvUy|Uf
zpR5CUMlIRr4`nRuvvO5Eu>V}+J-ekFCwV7^FpJ?h#={!~9>E;JNdi96Jh8VBnl`*g
zd|Ewp-kv^9^nHS{eJSZK%M0qx#EiP?{=CPjtkLl<kaU^gEWs2)=|<_OoH?3!hCY+|
zftPi<UpzniIZ~RN-$L4f71De_8mHTeVYl~PIG&zn>j+&Oy@pUwnU(eX`;~ts_R1Y^
z>X0LMy_F5#pbu|S;5!JV4Pg>t?*Z3^op^qJK1XSF@{CM7K`}2}qPoK=gytj~v{)O=
zbIo3-&x-{A@7Le8KweQN{9o8BuxJ6B_fwjX=1BzSDVTS&N{n0O3dy`ttFUe45jPE7
zBK9f4X9P0{K`lvl!xx6~#;6E^6YYi{v9Yt9fh$S(2`1Hzi8(ommE0dy(HxodIZd*b
z?1E1auymY{dXbX`PHQI)I;}9_z76zl+6hdqS71btAG%BwbP?eX96f3ZK^GT$*^qU7
zkgNT=@g+&tn_ggV<;nJDI|ll*fTIKp1ax`$MgY6S%|@L7WED&j&=O<KGCHezQh)b9
DMcWo<

diff --git a/__pycache__/program.cpython-37.pyc b/__pycache__/program.cpython-37.pyc
index c549a5b72cf03763be8be76677c0023849d43e9d..b45487794ffdfc612af29056e36ffc13d94c53ae 100644
GIT binary patch
delta 1362
zcmaJ>&ubGw6rP#gO*WhCrrp-0(L?Fa*j8=vR&1fP;*Sba5UG^5P?@%pVA_leMwumG
zyo!Oriy&+cf*wWa%|AfFi=YQRs0Xk88+>o`t7)_e?<M=aH{X2ozG2^HUuEq@+qMXN
zt_MFi|GcxmMn@9xWI`-KJeV{HsT!qWkK|~;YUDCJZMe!X$Lvu_b0*-iJQJVPZ!=Z)
zl9J@&5Ivl5`b?vww1P;km$M8k-B|FMWI2};Sn?A4a(!X$-(kL1aKheG*pVT==A|S<
z1R^c9icU%K@hU+i7^o3S3U?X;GI>^|f_d@NP)tBLTvI>Hkz~3;IfJ4hh5_wSc5H|;
zH66=d)uj$1OjuUn<Q6G$Zzvd+dX45rxRuuc|8fM0cOi*7qUK|na+_-(xvI3dAIcmJ
z#*ooBVDIrDE8#adTO&2*N4yEZCLyLc<C=G_LMqsmz%g-cj(F!Q#E;5oZ~@TPkaih%
z@8VEw4&R#Lo062V!H<QF{k|nl8Oso9!35(~TAGnD7=d18BESl_2S~jt<J?Yz4`C(5
zLymMX4aAg^dL1}eab3o|Gq@>?6V~SmtU0W+rAek7Zgzz35VuK_7M<2bXN8h9aj_}3
zA*(3~D;8pK955dwIo%v}Nt~54q@_y}PurBBt#JxCC006RC680Cz`2U+tAvLGmJu`q
z7$V%xkU4^8G{zq}Y5*_W_}JC{ZyR(m`X3vxa*_>N@mH4(x)9PV*Uxp#RV;O$x6=ls
ztJ|Q9gZ9kA+tIWED<|0ya(K7HtAWF6*<c8>P1#`sR)7+2N7LC(8-NmQfUFFA(3+rY
zI^Qa63#z8<Zz}36GjU1XbUuzH#0<Qh#5|<$+U|B?Es@_7{Fb*RyuF8y*0lTE_r$VV
zOfC$*ffhphX@XkJft-rC)TI`6nZr^v@&0vEQF@?edp{dDp!0)@yPFaGCuY@9Z=ZVN
ey7aDk;XWU{g5WqNd_#&XCL5E3>6%*V+xZLe20!@#

delta 1361
zcmaJ>&ubGw7@co+H`#1<H%<B@i6U){ZE9<4@lZjE6ct1*SnyCOw6ribuz{4Ui{voN
z9&)fA#NeDf2pjOA;zh-ac=o0@>&=rFul)z~o86?b#x~1LnD@SY^X7Y#JTJd0TURX0
zAozLL{;~1!t@SNgvT&v2xQgTcoJL4XYfO5?fsnSzHC(Na2u+^|rZ_k{;;AZizj_8I
zP8x@a!@^-VRUlrbNqovF1FUiCwl~nJ%5vINfHYpqwUc8|MCJ7*U*U=~$Ou-yL?-JD
zMf31B_0^gk)sD!DBJtG=UY;uw!cpL=+^)X6N@{mIwu)8S0yp8EKwg@%85Q64Ql`)Z
zX{V*RlZa+TDm4xuW>V!q;~H+Q<6ABxcSwVI<KbzpwZSPdqpBdj_ZO1xL(C2`>WncJ
zAB`nglIaz-0xb1d@q7B7)NeuETP5h>OgJHT3H$^uCc`qv?{KP3+SE^aXAzsmF~fi<
z-nk}eYPd3G$C$E6yjkq9&h>B((Sv?fu;WarP{b^TPh0a-G4IQqvd*xd<|%Fz2~T4$
z%@#D~d0=2))E0GLNQzkn64TsdRvsgXm<W$V3gLMa1|TtyBDB8A4ezAf6nl*CR|&qe
zAFJj2)%N8sdD2x2n9?Vgjw~teLf37_R@ahb(h|e-;59%?cE3h!Np|eOmg4UA6eDXU
z3*u8s>X0v%`B!oU&sE=CB@E<Qc~VMauae9vl0_oJ=(Im6`ECGA{w(^d4`K*9Im9uj
z?$i-6Nana0l={!U7*zMc5iv+6K5ihdhHT;C7^GYrgX(_lH7&Xw-54ZuTnv%Me`3&F
zv!}Sw$svwGQYeYnqnqsE7*G;pz*&GbnsfpGtbPrNX=^XBrtVa0J5TMK;<o)cYq|4C
zxtDQTQ`uJSo*2s%;g-0RSt`9jkiZa_U{D+95t;xUC>?+t7?7hjExdo05da^=Z1#(`
gjMbmS@9YLFi;dhgY>7v?CvaU92T#EbadB|_4+6_Upa1{>

diff --git a/funkcje.py b/funkcje.py
index aa3d960..00c638b 100644
--- a/funkcje.py
+++ b/funkcje.py
@@ -4,7 +4,7 @@ from AStar import AStar
 import random
 from easygui import *
 import matplotlib.pyplot as plt
-
+from Data import Data
 
 
 
@@ -81,17 +81,6 @@ def zbierzBox(gen,data, moves, kordStartowy):
         break
 
 
-def rysujWykres(data, x, yStart, yEnd):
-
-    plt.axis([0, x,yStart, yEnd])
-
-    for i in range(0, len(data.doWykresu) - 1):
-        y = data.doWykresu[i]
-        x = i
-        plt.scatter(x, y)
-        #plt.pause(0.0001)
-
-    plt.show()
 
 
 def znajdzUnbox(data,mapa):
@@ -230,3 +219,18 @@ def okno():
     except:
         return 0
 
+
+
+def rysujWykres(data):
+    x = list(range(len(data.doWykresu)))
+    y = data.doWykresu
+    plt.scatter(x, y, marker= "o", color = "r")
+    plt.show()
+"""
+data = Data()
+data.doWykresu = [1,2,3]
+x = list(range(1, len(data.doWykresu)+ 1))
+y = data.doWykresu
+rysujWykres(data,x)
+print(x)
+"""
\ No newline at end of file
diff --git a/genetyczne.py b/genetyczne.py
index 29b5b31..212fb8b 100644
--- a/genetyczne.py
+++ b/genetyczne.py
@@ -9,7 +9,7 @@ def start(data, wheel, dane):
     mutacja = float(dane[2])
     unbox = int(dane[3])
     """
-    ileGeneracji = 1000
+    ileGeneracji = 200
     ileWPopulacji = 16
     fragment = 0.5
     mutacja = 0.05
@@ -31,7 +31,7 @@ def start(data, wheel, dane):
             data.histZmian.append(data.best[1])
 
 
-    rysujWykres(data, ileGeneracji, 0, 2000)
+    #rysujWykres(data)
 
 
 
diff --git a/main.py b/main.py
index 203a490..c93d38d 100644
--- a/main.py
+++ b/main.py
@@ -5,6 +5,7 @@ import os;
 def main():
 
     good = False
+
     while (True):
 
         good = True
@@ -35,7 +36,6 @@ def main():
         if good:
             window = MainWindow(int(fieldValues[0]), int(fieldValues[1]), int(fieldValues[2]), int(fieldValues[3]), int(fieldValues[4]), int(fieldValues[5]));
             break
-
         """
         szerokosc = 15#min 6
         wysokosc = 10     #min 7
diff --git a/program.py b/program.py
index 2d0b9b0..88dde36 100644
--- a/program.py
+++ b/program.py
@@ -102,8 +102,9 @@ class MainWindow:
                             kordStartowy = self.data.unbox[gen.unboxWczesniejszegoGenu]
 
                         zbierzBox(gen,self.data, self.moves, kordStartowy)
+                    self.data.__init__()
                 elif(event.key== pygame.K_r):
-                    self.map = randomBox(self.map, self.regals, 20)
+                    self.map = randomBox(self.map, self.regals, 2)
                     updateMap(self.data, self.map, self.mapForAStar, self.regals)
                 elif len(self.moves)==0:
                     self.wheel.move(event, self.map)