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

porządkowanie funkcji zmiany nazw metod

Browse Source
This commit is contained in:
tomasz 2020-05-19 13:59:22 +02:00
parent e184f519eb
commit 7635791b1b
36 changed files with 342 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

315
.idea/workspace.xml
View File

@ -2,7 +2,21 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8264ee8d-5217-4cb6-b982-78f67fabc82e" name="Default Changelist" comment=""> <list default="true" id="8264ee8d-5217-4cb6-b982-78f67fabc82e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/genetyczny/eee.py" beforeDir="false" afterPath="$PROJECT_DIR$/genetyczny/eee.py" afterDir="false" /> <change afterPath="$PROJECT_DIR$/opis/LechT.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mapa/box.py" beforeDir="false" afterPath="$PROJECT_DIR$/box.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mapa/boxOnTheFloor.py" beforeDir="false" afterPath="$PROJECT_DIR$/boxOnTheFloor.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mapa/floor.py" beforeDir="false" afterPath="$PROJECT_DIR$/floor.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mapa/generate.py" beforeDir="false" afterPath="$PROJECT_DIR$/generate.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mapa/shelf.py" beforeDir="false" afterPath="$PROJECT_DIR$/shelf.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mapa/unboxOnTheFloor.py" beforeDir="false" afterPath="$PROJECT_DIR$/unboxOnTheFloor.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mapa/wall.py" beforeDir="false" afterPath="$PROJECT_DIR$/wall.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/genetyczny/Data.py" beforeDir="false" afterPath="$PROJECT_DIR$/Data.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/genetyczny/Gene.py" beforeDir="false" afterPath="$PROJECT_DIR$/Gene.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/genetyczny/eee.py" beforeDir="false" afterPath="$PROJECT_DIR$/funkcje.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/genetyczny/funkcje.py" beforeDir="false" afterPath="$PROJECT_DIR$/genetyczne.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/program.py" beforeDir="false" afterPath="$PROJECT_DIR$/program.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wheel.py" beforeDir="false" afterPath="$PROJECT_DIR$/wheel.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -10,6 +24,26 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="DockManager">
<window id="129">
<content type="file-editors">
<state>
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/opis/LechT.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>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="FavoritesManager"> <component name="FavoritesManager">
<favorites_list name="AI" /> <favorites_list name="AI" />
</component> </component>
@ -18,8 +52,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/program.py"> <entry file="file://$PROJECT_DIR$/program.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="740"> <state relative-caret-position="238">
<caret line="94" column="47" lean-forward="true" selection-start-line="94" selection-start-column="47" selection-end-line="94" selection-end-column="47" /> <caret line="14" selection-start-line="14" selection-end-line="14" />
<folding> <folding>
<element signature="e#0#13#0" expanded="true" /> <element signature="e#0#13#0" expanded="true" />
</folding> </folding>
@ -28,19 +62,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/genetyczny/Gene.py"> <entry file="file://$PROJECT_DIR$/Gene.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119"> <state relative-caret-position="136">
<caret line="7" column="36" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="36" /> <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$/AStarState.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> </state>
</provider> </provider>
</entry> </entry>
@ -48,8 +73,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.py"> <entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229"> <state relative-caret-position="578">
<caret line="41" selection-start-line="41" selection-end-line="41" /> <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
<folding> <folding>
<element signature="e#0#21#0" expanded="true" /> <element signature="e#0#21#0" expanded="true" />
</folding> </folding>
@ -60,8 +85,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/AStar.py"> <entry file="file://$PROJECT_DIR$/AStar.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117"> <state relative-caret-position="578">
<caret line="19" column="31" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="31" /> <caret line="35" selection-start-line="35" selection-end-line="35" />
<folding> <folding>
<element signature="e#0#12#0" expanded="true" /> <element signature="e#0#12#0" expanded="true" />
</folding> </folding>
@ -70,19 +95,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/genetyczny/Data.py"> <entry file="file://$PROJECT_DIR$/funkcje.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="1037">
<caret lean-forward="true" /> <caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/genetyczny/funkcje.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="519">
<caret line="217" column="33" selection-start-line="217" selection-start-column="33" selection-end-line="217" selection-end-column="33" />
<folding> <folding>
<element signature="e#0#48#0" expanded="true" /> <element signature="e#0#48#0" expanded="true" />
</folding> </folding>
@ -90,18 +106,48 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/genetyczny/eee.py"> <entry file="file://$PROJECT_DIR$/shelf.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="791"> <state relative-caret-position="34">
<caret line="158" lean-forward="true" selection-start-line="158" selection-end-line="158" /> <caret line="2" column="11" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="11" />
</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="-595">
<caret line="1" column="21" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
<folding> <folding>
<element signature="e#0#32#0" expanded="true" /> <element signature="e#0#21#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/opis/environment.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor>
<caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Data.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>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@ -113,8 +159,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>astarstate</find>
<find>grid</find>
<find>whereDecision</find> <find>whereDecision</find>
<find>genMa</find> <find>genMa</find>
<find>mapfor</find> <find>mapfor</find>
@ -127,7 +171,6 @@
<find>doW</find> <find>doW</find>
<find>self</find> <find>self</find>
<find>gen</find> <find>gen</find>
<find>data.gen</find>
<find>data.geny</find> <find>data.geny</find>
<find>crosso</find> <find>crosso</find>
<find>fitness</find> <find>fitness</find>
@ -143,13 +186,16 @@
<find>genpo</find> <find>genpo</find>
<find>random</find> <find>random</find>
<find>wybierz</find> <find>wybierz</find>
<find>update</find>
<find>za</find>
<find>data.gen</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$" value="randomBox" /> <entry key="$PROJECT_DIR$" value="orginalne-master" />
</map> </map>
</option> </option>
</component> </component>
@ -170,18 +216,21 @@
<option value="$PROJECT_DIR$/genetyczny/Gene1.py" /> <option value="$PROJECT_DIR$/genetyczny/Gene1.py" />
<option value="$PROJECT_DIR$/main.py" /> <option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/genetyczny/genetyczny.py" /> <option value="$PROJECT_DIR$/genetyczny/genetyczny.py" />
<option value="$PROJECT_DIR$/genetyczny/Data.py" />
<option value="$PROJECT_DIR$/Mapa/generate.py" /> <option value="$PROJECT_DIR$/Mapa/generate.py" />
<option value="$PROJECT_DIR$/genetyczny/Gene.py" /> <option value="$PROJECT_DIR$/genetyczny/Gene.py" />
<option value="$PROJECT_DIR$/genetyczny/funkcje.py" /> <option value="$PROJECT_DIR$/genetyczny/funkcje.py" />
<option value="$PROJECT_DIR$/program.py" /> <option value="$PROJECT_DIR$/genetyczny/Data.py" />
<option value="$PROJECT_DIR$/genetyczny/eee.py" /> <option value="$PROJECT_DIR$/genetyczny/eee.py" />
<option value="$PROJECT_DIR$/genetyczny/genetyczne.py" />
<option value="$PROJECT_DIR$/program.py" />
<option value="$PROJECT_DIR$/genetyczne.py" />
<option value="$PROJECT_DIR$/opis/environment.md" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2203" /> <option name="x" value="1912" />
<option name="y" value="-9" /> <option name="y" value="-8" />
<option name="width" value="606" /> <option name="width" value="606" />
<option name="height" value="838" /> <option name="height" value="838" />
</component> </component>
@ -202,12 +251,7 @@
<path> <path>
<item name="AI" type="b2602c69:ProjectViewProjectNode" /> <item name="AI" type="b2602c69:ProjectViewProjectNode" />
<item name="AI" type="462c0819:PsiDirectoryNode" /> <item name="AI" type="462c0819:PsiDirectoryNode" />
<item name="genetyczny" type="462c0819:PsiDirectoryNode" /> <item name="opis" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="AI" type="b2602c69:ProjectViewProjectNode" />
<item name="AI" type="462c0819:PsiDirectoryNode" />
<item name="Mapa" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
@ -220,6 +264,7 @@
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\zwyklak\Desktop\AI" />
<recent name="C:\Users\zwyklak\Desktop\AI\genetyczny" /> <recent name="C:\Users\zwyklak\Desktop\AI\genetyczny" />
<recent name="C:\Users\zwyklak\Desktop\AI\opis" /> <recent name="C:\Users\zwyklak\Desktop\AI\opis" />
<recent name="C:\Users\zwyklak\Desktop\AI\Mapa" /> <recent name="C:\Users\zwyklak\Desktop\AI\Mapa" />
@ -238,7 +283,7 @@
</option> </option>
</component> </component>
<component name="RunManager" selected="Python.main"> <component name="RunManager" selected="Python.main">
<configuration name="eee" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="AStar" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="AI" /> <module name="AI" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
@ -246,11 +291,11 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
</envs> </envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/genetyczny" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/genetyczny/eee.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/AStar.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
@ -259,7 +304,7 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="funkcje" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="generate" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="AI" /> <module name="AI" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
@ -267,11 +312,11 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
</envs> </envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/genetyczny" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/genetyczny/funkcje.py" /> <option name="SCRIPT_NAME" value="C:\Users\zwyklak\Desktop\AI\generate.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
@ -280,7 +325,7 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="genetyczny" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="julian" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="AI" /> <module name="AI" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
@ -288,11 +333,11 @@
<env name="PYTHONUNBUFFERED" value="1" /> <env name="PYTHONUNBUFFERED" value="1" />
</envs> </envs>
<option name="SDK_HOME" value="" /> <option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/genetyczny" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="C:\Users\zwyklak\Desktop\AI\genetyczny\eee.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/julian.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
@ -322,7 +367,7 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="program" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="neurons" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="AI" /> <module name="AI" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
@ -334,7 +379,7 @@
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/program.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/neurons.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
@ -346,10 +391,10 @@
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Python.main" /> <item itemvalue="Python.main" />
<item itemvalue="Python.eee" /> <item itemvalue="Python.neurons" />
<item itemvalue="Python.genetyczny" /> <item itemvalue="Python.julian" />
<item itemvalue="Python.program" /> <item itemvalue="Python.generate" />
<item itemvalue="Python.funkcje" /> <item itemvalue="Python.AStar" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -382,15 +427,15 @@
<frame x="1912" y="-8" width="1216" height="1576" extended-state="6" /> <frame x="1912" y="-8" width="1216" height="1576" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4995206" visible="true" weight="0.2733564" /> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4995206" visible="true" weight="0.2733564" />
<window_info id="Structure" order="1" sideWeight="0.5004794" side_tool="true" weight="0.3382353" /> <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 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="Message" order="0" />
<window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.32640332" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32640332" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932885" weight="0.21136521" /> <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932885" visible="true" weight="0.103257105" />
<window_info anchor="bottom" id="Cvs" order="3" weight="0.25" /> <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" 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.4144144" /> <window_info anchor="bottom" x="1942" y="641" width="1156" height="277" id="Debug" order="5" sideWeight="0.49932885" weight="0.41359773" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32848233" /> <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="Version Control" order="7" weight="0.32848233" />
<window_info anchor="bottom" id="Terminal" order="8" weight="0.32848233" /> <window_info anchor="bottom" id="Terminal" order="8" weight="0.32848233" />
@ -428,9 +473,9 @@
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/genetyczny/eee.py</url> <url>file://$PROJECT_DIR$/program.py</url>
<line>31</line> <line>162</line>
<option name="timeStamp" value="229" /> <option name="timeStamp" value="230" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<default-breakpoints> <default-breakpoints>
@ -454,14 +499,6 @@
</watches-manager> </watches-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/opis/environment.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="-612" />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/sc.png"> <entry file="file://$PROJECT_DIR$/images/sc.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
@ -475,7 +512,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/julian.py" /> <entry file="file://$PROJECT_DIR$/julian.py" />
<entry file="file://$PROJECT_DIR$/dodatkoweMetody.py" /> <entry file="file://$PROJECT_DIR$/dodatkoweMetody.py" />
<entry file="file://$PROJECT_DIR$/Mapa/unboxOnTheFloor.py"> <entry file="file://$PROJECT_DIR$/unboxOnTheFloor.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136"> <state relative-caret-position="136">
<caret line="8" selection-start-line="8" selection-end-line="8" /> <caret line="8" selection-start-line="8" selection-end-line="8" />
@ -483,7 +520,7 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/genetyczny/__init__.py" /> <entry file="file://$PROJECT_DIR$/genetyczny/__init__.py" />
<entry file="file://$PROJECT_DIR$/Mapa/boxOnTheFloor.py"> <entry file="file://$PROJECT_DIR$/boxOnTheFloor.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/images/wop.png"> <entry file="file://$PROJECT_DIR$/images/wop.png">
@ -508,7 +545,7 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Mapa/floor.py"> <entry file="file://$PROJECT_DIR$/floor.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="153">
<caret line="9" selection-start-line="9" selection-end-line="9" /> <caret line="9" selection-start-line="9" selection-end-line="9" />
@ -552,34 +589,20 @@
<entry file="file://$PROJECT_DIR$/Evencik.py"> <entry file="file://$PROJECT_DIR$/Evencik.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Mapa/generate.py"> <entry file="file://$PROJECT_DIR$/generate.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1383"> <state relative-caret-position="1383">
<caret line="179" lean-forward="true" selection-start-line="179" selection-end-line="179" /> <caret line="179" lean-forward="true" selection-start-line="179" selection-end-line="179" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Mapa/shelf.py"> <entry file="file://$PROJECT_DIR$/wall.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1124">
<caret line="72" selection-start-line="72" selection-end-line="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Mapa/wall.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="187">
<caret line="11" selection-start-line="11" selection-end-line="11" /> <caret line="11" selection-start-line="11" selection-end-line="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Mapa/box.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/AStarState.py"> <entry file="file://$PROJECT_DIR$/AStarState.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="153">
@ -601,69 +624,101 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/box.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py"> <entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229"> <state relative-caret-position="578">
<caret line="41" selection-start-line="41" selection-end-line="41" /> <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
<folding> <folding>
<element signature="e#0#21#0" expanded="true" /> <element signature="e#0#21#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/genetyczny/Gene.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="36" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/genetyczny/Data.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret lean-forward="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/AStar.py"> <entry file="file://$PROJECT_DIR$/AStar.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117"> <state relative-caret-position="578">
<caret line="19" column="31" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="31" /> <caret line="35" selection-start-line="35" selection-end-line="35" />
<folding> <folding>
<element signature="e#0#12#0" expanded="true" /> <element signature="e#0#12#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/program.py"> <entry file="file://$PROJECT_DIR$/Gene.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="740"> <state relative-caret-position="136">
<caret line="94" column="47" lean-forward="true" selection-start-line="94" selection-start-column="47" selection-end-line="94" selection-end-column="47" /> <caret line="8" selection-start-line="8" selection-end-line="8" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/genetyczny/funkcje.py"> <entry file="file://$PROJECT_DIR$/shelf.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="519"> <state relative-caret-position="34">
<caret line="217" column="33" selection-start-line="217" selection-start-column="33" selection-end-line="217" selection-end-column="33" /> <caret line="2" column="11" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/funkcje.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1037">
<caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
<folding> <folding>
<element signature="e#0#48#0" expanded="true" /> <element signature="e#0#48#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/genetyczny/eee.py"> <entry file="file://$PROJECT_DIR$/Data.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="791"> <state relative-caret-position="289">
<caret line="158" lean-forward="true" selection-start-line="158" selection-end-line="158" /> <caret line="17" column="27" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/program.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" selection-start-line="14" selection-end-line="14" />
<folding> <folding>
<element signature="e#0#32#0" expanded="true" /> <element signature="e#0#13#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/genetyczne.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-595">
<caret line="1" column="21" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
<folding>
<element signature="e#0#21#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/opis/environment.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor>
<caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/opis/LechT.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>
</component> </component>
</project> </project>

1
genetyczny/Data.py → Data.py
View File

@ -16,7 +16,6 @@ class Data:
self.doWykresu = [] self.doWykresu = []
def genMap(self, mapa): def genMap(self, mapa):
tmpMap =[]
tmpMap = mapa.copy() tmpMap = mapa.copy()
for regal in self.zajeteRegaly: for regal in self.zajeteRegaly:
tmpMap[regal[0]][regal[1]] = 2 tmpMap[regal[0]][regal[1]] = 2

0
genetyczny/Gene.py → Gene.py
View File

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
genetyczny/__pycache__/Gene.cpython-37.pyc → __pycache__/Gene.cpython-37.pyc
View File

Binary file not shown.

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

Binary file not shown.

BIN
Mapa/__pycache__/boxOnTheFloor.cpython-37.pyc → __pycache__/boxOnTheFloor.cpython-37.pyc
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Mapa/__pycache__/shelf.cpython-37.pyc → __pycache__/shelf.cpython-37.pyc
View File

Binary file not shown.

BIN
Mapa/__pycache__/unboxOnTheFloor.cpython-37.pyc → __pycache__/unboxOnTheFloor.cpython-37.pyc
View File

Binary file not shown.

BIN
Mapa/__pycache__/wall.cpython-37.pyc → __pycache__/wall.cpython-37.pyc
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

0
Mapa/box.py → box.py
View File

0
Mapa/boxOnTheFloor.py → boxOnTheFloor.py
View File

0
Mapa/floor.py → floor.py
View File

139
genetyczny/eee.py → funkcje.py
View File

@ -1,35 +1,10 @@
from genetyczny.funkcje import * from unboxOnTheFloor import UnboxOnTheFloor
from box import Box
from AStar import AStar
import random
from easygui import * from easygui import *
from genetyczny.Data import Data
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import numpy as np
import matplotlib.animation as animation
def start(data, wheel):
ileGeneracji = 500
ileWPopulacji = 16
fragment = 0.5
mutacja = 0.05
unbox = 1
data.kordyWozka = (wheel.ns, wheel.we)
data.jakLiczycKoszt = unbox
randomPopulation = genRandomPopulation(data, ileWPopulacji)
for i in range(ileGeneracji):
if i == 0:
best2 = dwieNajlepsze(randomPopulation, data)
else:
x = genPopulacje(data,best2[0], best2[1], ileWPopulacji, fragment, mutacja)
best2 = dwieNajlepsze(x, data)
del x
data.histZmian.append(data.best[1])
rysujWykres(data, ileGeneracji, 0, 2000)
@ -105,6 +80,7 @@ def zbierzBox(gen,data, moves, kordStartowy):
continue continue
break break
def rysujWykres(data, x, yStart, yEnd): def rysujWykres(data, x, yStart, yEnd):
plt.axis([0, x,yStart, yEnd]) plt.axis([0, x,yStart, yEnd])
@ -118,6 +94,108 @@ def rysujWykres(data, x, yStart, yEnd):
plt.show() plt.show()
def znajdzUnbox(data,mapa):
unboxy = []
iterator = 0
ostatniWiersz = len(mapa) -1
for x in mapa[ostatniWiersz]:
if (isinstance(x, UnboxOnTheFloor)):
unboxy.append((ostatniWiersz, iterator))
iterator += 1
data.unbox = unboxy
def policzCost(mapaBoxy, poczatek, koniec):
astar = AStar()
koszt = astar.search(poczatek, koniec, mapaBoxy, 1, 0)
return koszt
def wybierzUnbox(gen, jakLiczycKoszt): #funkcja ustawiajaca jaki unbox
if(jakLiczycKoszt == 0):
x = random.choice([gen.unbox1, gen.unbox2])
if(x == gen.unbox1):
y = 0
else:
y= 1
return (x,y)
elif(jakLiczycKoszt == 1):
return (gen.unbox1,0)
elif(jakLiczycKoszt == 2):
return (gen.unbox2,1)
elif(jakLiczycKoszt == 3):
x = min(gen.unbox1,gen.unbox2)
if(x == gen.unbox1):
y = 0
else:
y = 1
return (x,y)
def randomBox(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)
"""
for t in tupleList:
listaRegalow.append((t[0],t[1]))
data.zajeteRegaly = listaRegalow
"""
return mapa
def znajdzBox(mapa, regals):
zajeteRegaly = []
for (x,y,z) in regals:
shelf = mapa[x][y]
tmp = shelf.occupied
if(tmp == True):
zajeteRegaly.append((x,y))
return zajeteRegaly
#wybiera z populacji dwa najlepsze chromosomy
def updateMap(data, map, mapForAstar, regals):
data.mapa = map
znajdzUnbox(data, map)
data.zajeteRegaly = znajdzBox(map, regals)
data.astarMap = data.genMap(mapForAstar)
def mutate(wspMutacji, chrom): #w zaleznosci od tego jak wiele mutwac wybierz pary i zamien miejscami
ileWChrom = len(chrom)
ileZmian = round(ileWChrom * wspMutacji)
for i in range(ileZmian):
pom = None
pierw = random.randint(0,ileWChrom - 1)
drug = random.randint(0,ileWChrom - 1)
pom = chrom[pierw]
chrom[pierw] = chrom[drug]
chrom[drug] = pom
return chrom
def okno(): def okno():
good = True good = True
fieldValues = multenterbox("Wprowadź warunki początkowe", "Start algorytmu genetycznego", ["Ile chrom. w generacji", "Wielkosc dziedziczonego fragmentu (x>0 and x<1)", "Wartosc mutacji (x>0 and x<1)", "Unbox: (0or 1 or 2 or 2)", "Ile generacji"]) fieldValues = multenterbox("Wprowadź warunki początkowe", "Start algorytmu genetycznego", ["Ile chrom. w generacji", "Wielkosc dziedziczonego fragmentu (x>0 and x<1)", "Wartosc mutacji (x>0 and x<1)", "Unbox: (0or 1 or 2 or 2)", "Ile generacji"])
@ -154,6 +232,3 @@ def okno():
good = False good = False
if(good == True): if(good == True):
return [fieldValues[0], fieldValues[1], fieldValues[2],fieldValues[3]] return [fieldValues[0], fieldValues[1], fieldValues[2],fieldValues[3]]

0
Mapa/generate.py → generate.py
View File

142
genetyczny/funkcje.py → genetyczne.py
View File

@ -1,10 +1,31 @@
from Mapa.unboxOnTheFloor import UnboxOnTheFloor from funkcje import *
from genetyczny.Gene import Gene from Gene import Gene
from Mapa.box import Box
from AStar import AStar
import random
import numpy
def start(data, wheel):
ileGeneracji = 20
ileWPopulacji = 16
fragment = 0.5
mutacja = 0.05
unbox = 3
data.kordyWozka = (wheel.ns, wheel.we)
data.jakLiczycKoszt = unbox
randomPopulation = genRandomPopulation(data, ileWPopulacji)
for i in range(ileGeneracji):
if i == 0:
best2 = dwieNajlepsze(randomPopulation, data)
else:
x = genPopulacje(data,best2[0], best2[1], ileWPopulacji, fragment, mutacja)
best2 = dwieNajlepsze(x, data)
del x
data.histZmian.append(data.best[1])
rysujWykres(data, ileGeneracji, 0, 2000)
@ -21,23 +42,7 @@ def generateGeny(data):
geny.append(g) geny.append(g)
return geny return geny
def znajdzUnbox(data,mapa):
unboxy = []
iterator = 0
ostatniWiersz = len(mapa) -1
for x in mapa[ostatniWiersz]:
if (isinstance(x, UnboxOnTheFloor)):
unboxy.append((ostatniWiersz, iterator))
iterator += 1
data.unbox = unboxy
def policzCost(mapaBoxy, poczatek, koniec):
astar = AStar()
koszt = astar.search(poczatek, koniec, mapaBoxy, 1, 0)
return koszt
def genRandomChromosome(data): def genRandomChromosome(data):
chromosome = generateGeny(data) chromosome = generateGeny(data)
@ -82,63 +87,7 @@ def fitness(chromosome, data):
return koszt return koszt
def wybierzUnbox(gen, jakLiczycKoszt): #funkcja ustawiajaca jaki unbox
if(jakLiczycKoszt == 0):
x = random.choice([gen.unbox1, gen.unbox2])
if(x == gen.unbox1):
y = 0
else:
y= 1
return (x,y)
elif(jakLiczycKoszt == 1):
return (gen.unbox1,0)
elif(jakLiczycKoszt == 2):
return (gen.unbox2,1)
elif(jakLiczycKoszt == 3):
x = min(gen.unbox1,gen.unbox2)
if(x == gen.unbox1):
y = 0
else:
y = 1
return (x,y)
def randomBox(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)
"""
for t in tupleList:
listaRegalow.append((t[0],t[1]))
data.zajeteRegaly = listaRegalow
"""
return mapa
def znajdzBox(mapa, regals):
zajeteRegaly = []
for (x,y,z) in regals:
shelf = mapa[x][y]
tmp = shelf.occupied
if(tmp == True):
zajeteRegaly.append((x,y))
return zajeteRegaly
#wybiera z populacji dwa najlepsze chromosomy
def dwieNajlepsze(populacja, data): def dwieNajlepsze(populacja, data):
tmpPopulacja = populacja[:] tmpPopulacja = populacja[:]
chromFitness = [] chromFitness = []
@ -167,18 +116,6 @@ def dwieNajlepsze(populacja, data):
return (pierwsza, druga) return (pierwsza, druga)
def genPopulacje(data,pierwszy, drugi, ileWPopulacji, fragmentLiczba, wspMutacji):
ileWChrom = len(pierwszy)
fragment = round(fragmentLiczba*ileWChrom)
if(fragment == 1):
fragment +=1
nowaPopulacja = []
for i in range(ileWPopulacji):
nowaPopulacja.append(crossover(data,pierwszy,drugi,fragment, wspMutacji))
return nowaPopulacja
def crossover(data,pierwszy, drugi, fragmentLiczba, wspMutacji): def crossover(data,pierwszy, drugi, fragmentLiczba, wspMutacji):
ileWChrom = len(pierwszy) ileWChrom = len(pierwszy)
tmp = random.randint(0, ileWChrom-fragmentLiczba) tmp = random.randint(0, ileWChrom-fragmentLiczba)
@ -220,21 +157,14 @@ def crossover(data,pierwszy, drugi, fragmentLiczba, wspMutacji):
return nowyChrom return nowyChrom
def updateMap(data, map, mapForAstar, regals): def genPopulacje(data,pierwszy, drugi, ileWPopulacji, fragmentLiczba, wspMutacji):
data.mapa = map ileWChrom = len(pierwszy)
fragment = round(fragmentLiczba*ileWChrom)
if(fragment == 1):
fragment +=1
nowaPopulacja = []
znajdzUnbox(data, map) for i in range(ileWPopulacji):
data.zajeteRegaly = znajdzBox(map, regals) nowaPopulacja.append(crossover(data,pierwszy,drugi,fragment, wspMutacji))
data.astarMap = data.genMap(mapForAstar)
def mutate(wspMutacji, chrom): #w zaleznosci od tego jak wiele mutwac wybierz pary i zamien miejscami return nowaPopulacja
ileWChrom = len(chrom)
ileZmian = round(ileWChrom * wspMutacji)
for i in range(ileZmian):
pom = None
pierw = random.randint(0,ileWChrom - 1)
drug = random.randint(0,ileWChrom - 1)
pom = chrom[pierw]
chrom[pierw] = chrom[drug]
chrom[drug] = pom
return chrom

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

0
opis/LechT.md Normal file
View File

21
program.py
View File

@ -1,21 +1,17 @@
import pygame import pygame
from os import sys from os import sys
from Mapa.generate import Generate from generate import Generate
from Mapa.floor import Floor from floor import Floor
from Mapa.wall import Wall from wall import Wall
from Mapa.shelf import Shelf from shelf import Shelf
from genetyczny.funkcje import *
from wheel import Wheel from wheel import Wheel
from Mapa.boxOnTheFloor import BoxOnTheFloor from boxOnTheFloor import BoxOnTheFloor
from Mapa.box import Box
from Mapa.unboxOnTheFloor import UnboxOnTheFloor
from AStar import AStar
import easygui import easygui
from neurons import Neurons from neurons import Neurons
from whereDecision import WhereDecision from whereDecision import WhereDecision
from Evencik import Evencik from Evencik import Evencik
from genetyczny.Data import Data from Data import Data
from genetyczny.eee import * from genetyczne import *
class MainWindow: class MainWindow:
def __init__(self, szerokosc, wysokosc, kruche, latwopalne, radioaktywne, niebezpieczne): def __init__(self, szerokosc, wysokosc, kruche, latwopalne, radioaktywne, niebezpieczne):
@ -61,7 +57,7 @@ class MainWindow:
self.map = randomBox(self.map, self.regals, 15) self.map = randomBox(self.map, self.regals, 15)
updateMap(self.data, self.map, self.mapForAStar, self.regals) updateMap(self.data, self.map, self.mapForAStar, self.regals)
generateGeny(self.data)
################################################# #################################################
@ -165,6 +161,7 @@ class MainWindow:
continue continue
break break
self.data.zajeteRegaly = znajdzBox(self.map, self.regals) self.data.zajeteRegaly = znajdzBox(self.map, self.regals)
def draw(self): def draw(self):
self.screen.fill((33,69,108)) self.screen.fill((33,69,108))
for i in range(len(self.map)): for i in range(len(self.map)):

0
Mapa/shelf.py → shelf.py
View File

0
Mapa/unboxOnTheFloor.py → unboxOnTheFloor.py
View File

0
Mapa/wall.py → wall.py
View File

8
wheel.py
View File

@ -1,8 +1,8 @@
import pygame import pygame
from Mapa.floor import Floor from floor import Floor
from Mapa.boxOnTheFloor import BoxOnTheFloor from boxOnTheFloor import BoxOnTheFloor
from Mapa.unboxOnTheFloor import UnboxOnTheFloor from unboxOnTheFloor import UnboxOnTheFloor
from Mapa.shelf import Shelf from shelf import Shelf
class Wheel: class Wheel:
def __init__(self, screen, cell): def __init__(self, screen, cell):