From 1e820366027f4acdc15f57c47cb1b86e8c376e3f Mon Sep 17 00:00:00 2001
From: tomasz <tomlec2@st.amu.edu.pl>
Date: Fri, 15 May 2020 13:20:04 +0200
Subject: [PATCH] zmiana bledu

---
 .idea/workspace.xml                           | 321 +++++++++---------
 AStar.py                                      |   4 +-
 Mapa/__pycache__/generate.cpython-37.pyc      | Bin 3030 -> 3030 bytes
 Mapa/generate.py                              |   9 +-
 __pycache__/program.cpython-37.pyc            | Bin 4400 -> 4496 bytes
 genetyczny/Data.py                            |   4 +-
 genetyczny/__pycache__/Data.cpython-37.pyc    | Bin 0 -> 402 bytes
 genetyczny/__pycache__/metody.cpython-37.pyc  | Bin 347 -> 0 bytes
 .../__pycache__/randomBox.cpython-37.pyc      | Bin 0 -> 683 bytes
 genetyczny/metody.py                          |  11 -
 genetyczny/randomBox.py                       |  26 ++
 main.py                                       |   2 +-
 program.py                                    |   9 +-
 13 files changed, 202 insertions(+), 184 deletions(-)
 create mode 100644 genetyczny/__pycache__/Data.cpython-37.pyc
 delete mode 100644 genetyczny/__pycache__/metody.cpython-37.pyc
 create mode 100644 genetyczny/__pycache__/randomBox.cpython-37.pyc
 delete mode 100644 genetyczny/metody.py
 create mode 100644 genetyczny/randomBox.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 208808e..6d0694e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8264ee8d-5217-4cb6-b982-78f67fabc82e" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/genetyczny/Data.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/genetyczny/metody.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/genetyczny/randomBox.py" 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$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/opis/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/box.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/box.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/boxOnTheFloor.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/boxOnTheFloor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/environment.md" beforeDir="false" afterPath="$PROJECT_DIR$/opis/environment.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/floor.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/floor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generate.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/generate.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Mapa/generate.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/generate.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/genetyczny/Data.py" beforeDir="false" afterPath="$PROJECT_DIR$/genetyczny/Data.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/genetyczny/metody.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/neurons.py" beforeDir="false" afterPath="$PROJECT_DIR$/neurons.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/program.py" beforeDir="false" afterPath="$PROJECT_DIR$/program.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/route-planning.md" beforeDir="false" afterPath="$PROJECT_DIR$/opis/route-planning.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shelf.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/shelf.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unboxOnTheFloor.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/unboxOnTheFloor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wall.py" beforeDir="false" afterPath="$PROJECT_DIR$/Mapa/wall.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wheel.py" beforeDir="false" afterPath="$PROJECT_DIR$/wheel.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/whereDecision.py" beforeDir="false" afterPath="$PROJECT_DIR$/whereDecision.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -32,8 +22,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/program.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="54">
-              <caret line="55" selection-start-line="55" selection-end-line="55" />
+            <state relative-caret-position="17">
+              <caret line="94" column="98" selection-start-line="94" selection-start-column="98" selection-end-line="94" selection-end-column="98" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -42,88 +32,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/wheel.py">
+        <entry file="file://$PROJECT_DIR$/genetyczny/randomBox.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="527">
-              <caret line="37" selection-start-line="37" selection-end-line="37" />
-              <folding>
-                <element signature="e#0#13#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Mapa/shelf.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-            </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="308">
-              <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
-              <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$/neurons.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="35" column="9" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
-              <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$/AStar.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-83">
-              <caret line="48" selection-start-line="48" selection-end-line="48" />
-              <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$/Mapa/floor.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="9" selection-start-line="9" selection-end-line="9" />
-            </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="427">
-              <caret line="62" selection-start-line="62" selection-end-line="62" />
-              <folding>
-                <element signature="e#0#19#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/genetyczny/metody.py">
-          <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 relative-caret-position="85">
+              <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -131,11 +43,53 @@
           </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="563">
+              <caret line="41" selection-start-line="41" selection-end-line="41" />
+              <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="170">
+              <caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
+              <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$/Mapa/generate.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="331">
+              <caret line="176" column="31" lean-forward="true" selection-start-line="176" selection-start-column="31" selection-end-line="176" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/genetyczny/Data.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
+            <state relative-caret-position="68">
+              <caret line="4" selection-start-line="4" selection-end-line="4" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Mapa/shelf.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="527">
+              <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -165,6 +119,9 @@
       <find>10</find>
       <find>regalsik</find>
       <find>#</find>
+      <find>put</find>
+      <find>random</find>
+      <find>randomB</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -183,23 +140,24 @@
         <option value="$PROJECT_DIR$/julian.py" />
         <option value="$PROJECT_DIR$/whereDecision.py" />
         <option value="$PROJECT_DIR$/dodatkoweMetody.py" />
-        <option value="$PROJECT_DIR$/Mapa/generate.py" />
         <option value="$PROJECT_DIR$/wheel.py" />
         <option value="$PROJECT_DIR$/Data.py" />
-        <option value="$PROJECT_DIR$/genetyczny/Data.py" />
-        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/neurons.py" />
+        <option value="$PROJECT_DIR$/genetyczny/Data.py" />
+        <option value="$PROJECT_DIR$/genetyczny/metody.py" />
+        <option value="$PROJECT_DIR$/genetyczny/randomBox.py" />
+        <option value="$PROJECT_DIR$/Mapa/generate.py" />
+        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/AStar.py" />
         <option value="$PROJECT_DIR$/program.py" />
-        <option value="$PROJECT_DIR$/genetyczny/metody.py" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="2150" />
-    <option name="y" value="142" />
-    <option name="width" value="1296" />
-    <option name="height" value="840" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="65" />
+    <option name="y" value="-33" />
+    <option name="width" value="1620" />
+    <option name="height" value="1050" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -207,6 +165,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -228,7 +187,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -392,16 +350,16 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="2150" y="142" width="1296" height="840" extended-state="1" />
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.32119742" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27449664" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3279003" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932885" weight="0.22243528" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.65912306" />
+      <window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.32719547" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932885" weight="0.22237961" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3753541" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" />
@@ -438,10 +396,27 @@
     </layout-to-restore>
   </component>
   <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/AStar.py</url>
+          <line>17</line>
+          <option name="timeStamp" value="41" />
+        </line-breakpoint>
+      </breakpoints>
+      <default-breakpoints>
+        <breakpoint type="python-exception">
+          <properties notifyOnTerminate="true" exception="BaseException">
+            <option name="notifyOnTerminate" value="true" />
+          </properties>
+        </breakpoint>
+      </default-breakpoints>
+    </breakpoint-manager>
     <watches-manager>
       <configuration name="PythonConfigurationType">
         <watch expression="all" />
         <watch expression="startNode" />
+        <watch expression="self.map" />
       </configuration>
     </watches-manager>
   </component>
@@ -488,29 +463,15 @@
     <entry file="file://$PROJECT_DIR$/Mapa/boxOnTheFloor.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/Mapa/generate.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2992">
-          <caret line="176" column="8" selection-start-line="176" selection-start-column="8" selection-end-line="176" selection-end-column="8" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/images/wop.png">
+      <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/Mapa/box.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/images/wo.png">
+      <provider selected="true" editor-type-id="images" />
     </entry>
     <entry file="file://$PROJECT_DIR$/neurons.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
+        <state relative-caret-position="369">
           <caret line="35" column="9" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
           <folding>
             <element signature="e#0#12#0" expanded="true" />
@@ -518,29 +479,33 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AStarState.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AStar.py">
+    <entry file="file://$PROJECT_DIR$/whereDecision.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-83">
-          <caret line="48" selection-start-line="48" selection-end-line="48" />
+        <state relative-caret-position="556">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
           <folding>
-            <element signature="e#0#12#0" expanded="true" />
+            <element signature="e#0#19#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/images/wop.png">
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/random.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="174">
+          <caret line="356" selection-start-line="356" selection-end-line="356" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/images/krp.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/images/wo.png">
+    <entry file="file://$PROJECT_DIR$/images/nip.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
     <entry file="file://$PROJECT_DIR$/wheel.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="37" selection-start-line="37" selection-end-line="37" />
+        <state relative-caret-position="459">
+          <caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
           </folding>
@@ -549,35 +514,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Mapa/shelf.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+        <state relative-caret-position="527">
+          <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/genetyczny/Data.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
+        <state relative-caret-position="68">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/genetyczny/metody.py">
+    <entry file="file://$PROJECT_DIR$/Mapa/generate.py">
       <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" />
-          <folding>
-            <element signature="e#0#28#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="331">
+          <caret line="176" column="31" lean-forward="true" selection-start-line="176" selection-start-column="31" selection-end-line="176" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/whereDecision.py">
+    <entry file="file://$PROJECT_DIR$/AStarState.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </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="427">
-          <caret line="62" selection-start-line="62" selection-end-line="62" />
-          <folding>
-            <element signature="e#0#19#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="172">
+          <caret line="311" selection-start-line="311" selection-end-line="311" />
         </state>
       </provider>
     </entry>
@@ -588,10 +550,43 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Mapa/box.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/genetyczny/randomBox.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="563">
+          <caret line="41" selection-start-line="41" selection-end-line="41" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AStar.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
+          <folding>
+            <element signature="e#0#12#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="54">
-          <caret line="55" selection-start-line="55" selection-end-line="55" />
+        <state relative-caret-position="17">
+          <caret line="94" column="98" selection-start-line="94" selection-start-column="98" selection-end-line="94" selection-end-column="98" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
           </folding>
diff --git a/AStar.py b/AStar.py
index d9a4cf2..169af59 100644
--- a/AStar.py
+++ b/AStar.py
@@ -2,7 +2,7 @@ import numpy
 from AStarState import AStarState
 
 class AStar:
-    def returnPath(self, currentNode, grid):
+    def returnPath(self, currentNode, grid, flaga):
         path = []
         noRows, noColumns = numpy.shape(grid)
         result = [[-1 for i in range(noColumns)] for j in range(noRows)]
@@ -17,7 +17,7 @@ class AStar:
             startValue+=1
         return result
 ######################################################### w current jest koszt do przebycia
-    def search(self, start, end, grid, cost): #start to kordy wózka, end miejsce podjęcia paczki
+    def search(self, start, end, grid, cost, flaga): #start to kordy wózka, end miejsce podjęcia paczki
         noRows, noColumns = numpy.shape(grid)
         startNode = AStarState(None, tuple(start))
         endNode = AStarState(None, tuple(end))
diff --git a/Mapa/__pycache__/generate.cpython-37.pyc b/Mapa/__pycache__/generate.cpython-37.pyc
index 8b8dd789b26347da039d33faa64320d2bb7fd9db..8d190dcbc6cc0dec32a870a983b971f3f40cfbbb 100644
GIT binary patch
delta 34
ncmca6eodU$iI<m)0SGFx_r*Qh$Scdu&LqMJglv-yxt9U}lhX&*

delta 34
mcmca6eodU$iI<m)0SIoTY>hj;kyn<RomGSp1ScDEF9iUZCkPJ!

diff --git a/Mapa/generate.py b/Mapa/generate.py
index 268f25e..3dcfbbc 100644
--- a/Mapa/generate.py
+++ b/Mapa/generate.py
@@ -169,12 +169,13 @@ class Generate:
         all[0][2] = 2
         all[1][2] = 2
 #zmiana miejsca zrzutu paczki, unboxOnTheFloor
-        #all[1][4] = 2
-        #all[0][4] = 23
-        #all[1][5] = 1
         all[wysokosc-2][szerokosc-3] = 2
         all[wysokosc-1][szerokosc-3] = 23
         all[wysokosc-2][szerokosc-4] = 1
+        """ Drugi wyjazd
+        all[wysokosc-2][2] = 2
+        all[wysokosc-1][2] = 23
+        all[wysokosc-2][3] = 1
+        """
         return all
 
-#x = Generate.generate(8, 9, 1, 1, 1, 1)
\ No newline at end of file
diff --git a/__pycache__/program.cpython-37.pyc b/__pycache__/program.cpython-37.pyc
index 8a2036ec253c46e786646df817b91a06a7d3a4fb..94f94bb6d339224141130fe34d14ae1e6236e80c 100644
GIT binary patch
delta 1465
zcmZux&u<$=6rR~#+q<^cb`m$XV>b!;(RfoD<<gV@<q+JUq9j&ZR}mwiGTy0UXLs$6
zH$Pe#axkDC9gPr&a&WGkDpleJ;y*w_T-Zy+4aB7<P6#n?3~4Cc)qeiwd+&RCGxOxf
zGyU1bnrTLnc&;CO_u*%S<3tw!c)YNAR6#bfbtmqc#Kgc2C*dYZQu3&ia!1IB<S}Q|
z9V26s$DOpBCTYpBbB>%7KGPX@GbAImgp+l1Bqw>&nQ$k_gybnF?-ob_qj!)!Vvl}`
z?AT~eA?Iy;3t3~wf2=5Ykz2SP(n?jo%D==-yulUa+oGT8p)R_U?c+nw&-oKw)HHjz
zhfAoBKOi4Rgnkor{#02|SNuFTR4elgvbvER>gqXUYr9Gxvwgq7um3L=ma%XA^Wcks
zFFKgyzo_H<2i3q+{AcyX(X(xI@273#Pm5?)Ru);d(bGg<=HZ`RG<f9%VbSGaX87BT
z3})@<2?k9=P2CP%K?=H~3$Jb)yINmi8@4Lky4;V^!?rq9MTTLkqUVt4OJU!O^|(Hm
z^XGlsyucr6`OCk8^pCR8!(wHgC>VKLr`CwDsw{OTugHJb@(U|x6zjPYe1k<>g?9VO
zy$yaTv=xJS`K>6xy2w8dJv=f64I&=hV=b@460kB4b||AIT5EI~EsyD-g@i^OmIAKX
z;v$0(t9o@Bs1Eg5NXSeBh(SWQ+HO<NW?``)hRCy9?po_G2-AJ)`5jS!RS$^fH)^|j
zpt-Gm%98vj{0Uy=e}ylH)56wypRYzHrxabw;sQ>KFLf5RIb6cy$`ckTYIux4id9Cz
z#l`_L0<3A4=QzH+ya>t^zyiP$z>ENr+$`U|b#3i-rBdE1mAAKs{m=7ie2!dz1cT99
ztL`-(&_HLjUUfQ+U1orP4qyTRPLst21mO;?vf56dcpah~P&NyZivlczEd##_u*RRp
zi|JLM5?%-Ps(>3$^5zPD4=M-R-G<{Z3qrDcXqR0AkXy(DD+nOkU8m8u)M5QAAioCi
zLV0k0!M{#Cd>4*r-O|`JWXVH_Hag{6ZLi&+_ORJuu|W0RHVMgHzgX^?Fn`6n$@2Oe
zPzIVGHV1(-$<OyUA_8OL>%b)GSih>5^aumhniRJ*lDc_B(sk-l|9<U(cYo=0V21kz
z7a85GwyR4YwGPW(WrwaitrnAaLG*tE@-9ePF893uX2Mj;YhrH$n+JfwXK>MC=ywGs
o1trNdZNT4^9C+F4%XSv%Z@Mje&!KN&VeY_*>NtM-zLYC}1NJgV?EnA(

delta 1325
zcmZuv&2Jk;6rb5$d)JQFcAQT;X_6*soTb$C(u9Z)K`}w9NUXLlfe{oL&or^KAMWht
zt1{$Z4m~=W100=-Gayw0R0+6O{R{TMxfSiD=L#`zP1R7<EC2R4zxOfky?x!epJ&q-
zO*4t)@3%+yuKzl5lpe?TkBV!DPKu;3qKF!{>7+?I;t4zBWJxySNqf-AkzB+F>>+1}
z3`HE<!(>>-rR))Bl#E82X^%PMWIW<&JMZL4KH?d>;7pJSj6Om%O9#J2bg-k4Ns6zk
z$jTl4vm{n9)#DBeJbEDR;3h5!Q~7<Si}&4NEEsR2rrE(ATt;2|1^HT+`W4W{Q>Cbu
zg1neit+9vT)z<T<ZR8Qvwv{gCZcq@PtJcW>ZSlzVqbR6nb+9CRlj4CojZcZk>gB_S
z8|dbP4YdEPje1kZ2qXEP?!TLQZ-yq0F=!fU8Z@?y6!fJba~L$at#uV%qH0?zQO$`C
zrfOf69to<-x?=Kfh2N3q(cbA`Ho(of4wfhLSi#8MZKJ|}j?jR@@1Jm-7mv04WraUI
zp`AGqydd@dC5DVuIgIW3B?~Y7z^hlJDzwp6ZkEI+vGsvPxfzdOKdeRZQ|$J+l%%2V
zvK{WZJ~!cH?rky7%B<e-8=lK`&|*?!w(#O(=O8$Y*IF&+QXY>EY?rx#A8M4>_J|fV
z>f52_c)N_J#UJr+@UnPEzYrgiuKuTDU!M}+>yvkX(Tf_+iN6M_Ik4~%fKdt73@?as
z>il^ql}`aI0K5)xS^~+eRjytA@Zz;<wX$BWY^-w)O!MN0)I2!@4hhcc-lp5Q#X^I#
z&6@2uwz&aLa{zgO1i*lVFz&M&uWyBl>l0;<@ma7~608I-0e=hNJuz!84le_Z;7wq!
zN%;8gb#n=S2AM<cM#Hvw5lm6_P%b|U5VcSMHX(s%H|$2sQv3NYfV>3oQhJE&iYMvY
zmtaJzmd2;SD;h$w;aBSQomPX<ezE;zp&B?X5{tTiIo$^`_&f1urn0&MX`uLiabP&%
z{Gz|CH00#phv6C6STV|m&Ox<K$*)w+UU{S687v9Ot<_q!(pTPo#jS3!RonA;G<9M;
zH}Hh`J6kw}6^drh-v>4i0E@`s>qSe*(~^<oCUaSEP`~9K@C=yX=2sOO8gDxu-Lcub
TSbF#~5)7Pr#S^J9Fev{5v+gI5

diff --git a/genetyczny/Data.py b/genetyczny/Data.py
index 68c3b0f..9c450dc 100644
--- a/genetyczny/Data.py
+++ b/genetyczny/Data.py
@@ -2,5 +2,7 @@
 
 
 class Data:
+
     def __init__(self):
-        pass
+        self.zajeteRegaly = []
+
diff --git a/genetyczny/__pycache__/Data.cpython-37.pyc b/genetyczny/__pycache__/Data.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..571bb4142b8d570857f580e44643c15d82cf3b21
GIT binary patch
literal 402
zcmYjM%}T>S5T4yc38lG+FVRaMKtyU=5HCd(FJW<5vTLYG)0*8P3Eu3>_zXUU*Ia!I
zPtI(qbYT9!nQvyArUM|Eet$jPk^kZ3AQ1%<Qg=q?1`HUnBmIyW82JFBD5v_rNQx$;
z?wpK;Oc=<d5k~GHi%dlLxR2-B>s%0kg*{KrNFAS1z&jxE5LPTkq91np#d>>h3thF8
z$Ie#IpU}jF{T<IP)T6VFQ{7uzR=QMk>q@`gsOwu**xLFw@9I`D<#^Nf3F5L|dc;$v
zV_pzl8oGzhf=(n@tydPYA0V#QW?OMQM10-qYTs#iLpb8doN$dl;^V^lM24Im3H}Jn
QkcJ2P<Z@4O6{e^He>SjGO#lD@

literal 0
HcmV?d00001

diff --git a/genetyczny/__pycache__/metody.cpython-37.pyc b/genetyczny/__pycache__/metody.cpython-37.pyc
deleted file mode 100644
index 2ecf1cf9ecf5470b3f637736a75d9c19f6d61039..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 347
zcmYLE!AiqG5Z%e{MlI=Ic*&)B77=Z|c(4bH6qdyjx~qlkCLtTCDeXyr#y=20C09@V
z1y9bThy!ot4a~eZGae2H4C8bE_4tPMo0`9fkX#|cDJH`VIOahC5RY8sx#GyV5${Y1
zBWEm)_c+N?=;Ul=-4l`d%38N1DGGrA!~_u%Ok1{#wy@)d;W|t|SSr*}pyjYo(q~n+
zQ1PKxg4&uS`t)-)IoA)t)<JL9ZSJyM-`J2hWu>og^|LK((=InftG#VX(~hdPJGsva
zQ~GiFD(L`{Vj!T7u})Lj4erok)Z5i`awpexe$A2hL;vmvMl#*;g)hyEvzPQ)FPcEY
Fe*unLOz;2z

diff --git a/genetyczny/__pycache__/randomBox.cpython-37.pyc b/genetyczny/__pycache__/randomBox.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..21e8d176db858771264cd88745e627b6f3f2c583
GIT binary patch
literal 683
zcmYjPJ8u**5cXr&`^a5{cuBbm(H%t^3J{7=NYWrd3IaOGS~xAY=5BM|$9a9ahrCrN
z`4N|r-@w11bW4@LK*e|?5M#|Z-*{%cW6z%S`!NEEfByJ1B?$d;&R+o^9fLN{0Wy?f
zi3-dycAQ93P)<8erC0de@3<!!XPKX|uZRbkcY%h%4OF8cw*JLT$S;nJW<p3H^rTv!
zPdpa~*#~v}6twvUU`Xp3-1<}0GL4LPh1(#*ZMZ%%p$X<ly$4I3)p$pYca7V~M25|o
zI$jJG1H*RIMAy);2{ZBxwc%ngLhC1nouQA96WYe@Ufa{&6>9s&H}L^7dk1Leo4%`A
zBqL;)L1SioxCT8}7<#&KFbph}qO?q<WmXlIO=eX-5tgNOEy_%}TUc5zHScZHOQFR(
zF-_%WxNp5I)hYLjv`)u7P;R>!bDB#izV*20f;`g8T8cM$qj?O`?tp4#qg)G>>bxqg
z-{o7JTYPEp+S1R}`a4qh;M>2Sp1w#vG(t7WcD0$ybe^1vX0EF`dG$J(ic;v!WLs{M
z+x}q+hxNur|2zg~G>-rf@vvJV=v^E;OJdw3cQC^bF(c{$<P1X_zlEL;8#iC&{u=AA
q+=vx*JnVwdUH2|3fW5A+YxO_4-z6UvRkoDkrF-Wl1n6P6Lh=XCLa8PI

literal 0
HcmV?d00001

diff --git a/genetyczny/metody.py b/genetyczny/metody.py
deleted file mode 100644
index 2187f56..0000000
--- a/genetyczny/metody.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from Mapa.shelf import Shelf
-from wheel import Wheel
-
-
-def RandomBox(shelfs_, mapa_):
-    shelfs = shelfs_
-    mapa = mapa_
-
-
-
-    return mapa
diff --git a/genetyczny/randomBox.py b/genetyczny/randomBox.py
new file mode 100644
index 0000000..c281046
--- /dev/null
+++ b/genetyczny/randomBox.py
@@ -0,0 +1,26 @@
+from Mapa.shelf import Shelf
+from wheel import Wheel
+from Mapa.box import Box
+import random
+
+def randomBox(data, mapa_, regals_, ile):
+
+    regals = regals_
+    mapa = mapa_
+    tupleList = []
+    ileRegalow = len(regals)
+    iteration = 0
+    while iteration < ileRegalow and iteration < ile:
+        regal = random.choice(regals)
+        if regal in tupleList:
+            continue
+        else:
+            tupleList.append(regal)
+            iteration+=1
+
+    for (i,j,x) in tupleList:
+        box = Box()
+        mapa[i][j].put(box)
+    data.zajeteRegaly = tupleList
+
+    return mapa
diff --git a/main.py b/main.py
index f83a8a3..6cf72fc 100644
--- a/main.py
+++ b/main.py
@@ -33,7 +33,7 @@ def main():
             good = False
             """
         if good:
-            szerokosc = 15 #min 6
+            szerokosc = 15#min 6
             wysokosc = 8     #min 7
             kruche = 1
             latwopalne = 1
diff --git a/program.py b/program.py
index 873e0fc..be8a90d 100644
--- a/program.py
+++ b/program.py
@@ -4,6 +4,7 @@ from Mapa.generate import  Generate
 from Mapa.floor import Floor
 from Mapa.wall import Wall
 from Mapa.shelf import Shelf
+from genetyczny.randomBox import *
 from wheel import Wheel
 from Mapa.boxOnTheFloor import BoxOnTheFloor
 from Mapa.box import Box
@@ -13,7 +14,7 @@ import easygui
 from neurons import Neurons
 from whereDecision import WhereDecision
 from Evencik import Evencik
-from genetyczny import metody
+from genetyczny.Data import Data
 
 class MainWindow:
     def __init__(self, szerokosc, wysokosc, kruche, latwopalne, radioaktywne, niebezpieczne):
@@ -32,7 +33,9 @@ class MainWindow:
         self.neurons = Neurons()
         self.whereDecision = WhereDecision()
         #create
-        self.wheel = Wheel(self.screen, self.cell);
+        self.wheel = Wheel(self.screen, self.cell)
+        ###
+        self.data = Data()
 
 #przekladanie wartosci liczbowych z tablicy na mapę obiektow
 
@@ -54,6 +57,8 @@ class MainWindow:
                     self.map[i][j] = Shelf(self.screen, self.cell, i, j, (self.map[i][j]-3)%4, (self.map[i][j]-3)//4)
                     self.mapForAStar[i][j] = 1
 
+        self.map = randomBox(self.data, self.map, self.regals, 10)
+        #################################################
 #loop
         while True:
             self.events()