s444399/AI
1
0
Fork 2
Code Issues Pull Requests Releases Wiki Activity

zmiana bledu

Browse Source
This commit is contained in:
tomasz 2020-05-15 13:20:04 +02:00
parent 97b64f4f02
commit 1e82036602
13 changed files with 202 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

321
.idea/workspace.xml
View File

@ -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>

4
AStar.py
View File

@ -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))

BIN
Mapa/__pycache__/generate.cpython-37.pyc
View File

Binary file not shown.

9
Mapa/generate.py
View File

@ -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)

BIN
__pycache__/program.cpython-37.pyc
View File

Binary file not shown.

4
genetyczny/Data.py
View File

@ -2,5 +2,7 @@
class Data:
def __init__(self):
pass
self.zajeteRegaly = []

BIN
genetyczny/__pycache__/Data.cpython-37.pyc Normal file
View File

Binary file not shown.

BIN
genetyczny/__pycache__/metody.cpython-37.pyc
View File

Binary file not shown.

BIN
genetyczny/__pycache__/randomBox.cpython-37.pyc Normal file
View File

Binary file not shown.

11
genetyczny/metody.py
View File

@ -1,11 +0,0 @@
from Mapa.shelf import Shelf
from wheel import Wheel
def RandomBox(shelfs_, mapa_):
shelfs = shelfs_
mapa = mapa_
return mapa

26
genetyczny/randomBox.py Normal file
View File

@ -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

2
main.py
View File

@ -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

9
program.py
View File

@ -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()