This commit is contained in:
Tomasz Adamczyk 2021-06-04 14:01:17 +02:00
parent e4dd3568a9
commit a474154917
57 changed files with 104 additions and 116 deletions

View File

@ -3,110 +3,58 @@
<component name="ChangeListManager">
<list default="true" id="56453584-72bd-49f4-a39c-fccf91ab20c6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cart.py" beforeDir="false" afterPath="$PROJECT_DIR$/cart.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/definitions.py" beforeDir="false" afterPath="$PROJECT_DIR$/definitions.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/neuralnetwork.py" beforeDir="false" afterPath="$PROJECT_DIR$/neuralnetwork.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/map.py" beforeDir="false" afterPath="$PROJECT_DIR$/map.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plant.py" beforeDir="false" afterPath="$PROJECT_DIR$/plant.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/py.py" beforeDir="false" afterPath="$PROJECT_DIR$/py.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/checkpoint.model" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_01_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_02_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_03_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_04_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_05_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_06_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_07_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_08_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_09_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_01.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_02.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_03.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_04.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_05.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_06.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_07.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_08.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_09.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/sliced/screen_10_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/screen.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_01.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_01.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_02.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_02.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_03.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_03.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_05.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_05.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_06.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_06.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_08.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_04_08.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_01.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_01.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_02.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_02.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_03.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_03.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_05.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_05.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_06.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_06.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_07.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_05_07.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_01.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_01.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_02.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_02.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_03.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_03.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_04.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_04.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_05.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_05.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_06.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_06.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_07.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_07.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_08.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_08.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_09.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_09.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_06_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_01.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_01.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_02.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_02.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_03.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_03.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_04.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_04.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_05.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_05.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_06.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_06.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_07.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_07.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_08.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_08.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_09.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_09.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_07_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_01.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_01.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_02.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_02.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_03.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_03.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_04.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_04.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_05.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_05.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_06.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_06.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_07.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_07.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_08.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_08.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_09.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_09.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_08_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_07.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_07.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_08.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_08.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_09.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_09.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resources/neural_network/tiles/tile_09_10.png" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -273,7 +221,7 @@
<workItem from="1622546872446" duration="905000" />
<workItem from="1622548476938" duration="57000" />
<workItem from="1622755977663" duration="282000" />
<workItem from="1622801431771" duration="2057000" />
<workItem from="1622801431771" duration="6572000" />
</task>
<servers />
</component>
@ -295,25 +243,25 @@
</state>
<state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622802726751" />
<state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1621429221570" />
<state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1622803709514">
<state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1622808063144">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622803709514" />
<state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622808063144" />
<state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389327" />
<state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1622803709514">
<state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1622808063144">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622803709514" />
<state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622808063144" />
<state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389327" />
<state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1622803709514">
<state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1622808063144">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622803709514" />
<state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622808063144" />
<state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389326" />
<state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1622803709514">
<state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1622808063144">
<screen x="0" y="0" width="1920" height="1080" />
</state>
<state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622803709514" />
<state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080/-1920.0.1920.1080@0.0.1920.1080" timestamp="1622808063144" />
<state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1621429389327" />
<state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1622538962724">
<screen x="0" y="0" width="1920" height="1080" />
@ -360,6 +308,6 @@
<SUITE FILE_PATH="coverage/SmartCart$copy.coverage" NAME="copy Coverage Results" MODIFIED="1622503170538" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/SmartCart$glue.coverage" NAME="glue Coverage Results" MODIFIED="1622501306368" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1622469837941" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/SmartCart$py.coverage" NAME="py Coverage Results" MODIFIED="1622803709507" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/SmartCart$py.coverage" NAME="py Coverage Results" MODIFIED="1622808023419" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
</project>

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -57,6 +57,11 @@ class Cart:
field = map1.get_fields()[x][y]
if x == 0 and y == 0:
self.station_restore(station1)
elif field.get_plant().get_name() == "flower_dandelion":
field.get_plant().set_name("none")
field.get_plant().set_state(0)
field.get_soil().set_water_level(False)
field.get_soil().set_state(False)
elif field.get_soil().get_state() is False:
field.get_soil().set_state(True)
elif field.get_soil().get_state() is True and field.get_soil().get_water_level() is False and self.get_water_level() > 0:
@ -102,24 +107,28 @@ class Cart:
field.get_soil().set_is_fertilized(True)
field.get_plant().set_state(field.get_plant().get_state() + definitions.WHEAT_GROW_TIME)
elif field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() == definitions.BEETROOTS_MAXIMUM_STATE and self.get_all_collected_plants() < definitions.CART_MAXIMUM_COLLECTED_PLANTS:
field.get_plant().set_name("none")
field.get_plant().set_state(0)
field.get_soil().set_is_fertilized(False)
field.get_soil().set_water_level(False)
field.get_soil().set_state(False)
self.set_collected_plants("beetroot", self.get_collected_plants("beetroot") + 1)
elif field.get_plant().get_name() == "carrot" and field.get_plant().get_state() == definitions.CARROTS_MAXIMUM_STATE and self.get_all_collected_plants() < definitions.CART_MAXIMUM_COLLECTED_PLANTS:
field.get_plant().set_name("none")
field.get_plant().set_state(0)
field.get_soil().set_is_fertilized(False)
field.get_soil().set_water_level(False)
field.get_soil().set_state(False)
self.set_collected_plants("carrot", self.get_collected_plants("carrot") + 1)
elif field.get_plant().get_name() == "potato" and field.get_plant().get_state() == definitions.POTATOES_MAXIMUM_STATE and self.get_all_collected_plants() < definitions.CART_MAXIMUM_COLLECTED_PLANTS:
field.get_plant().set_name("none")
field.get_plant().set_state(0)
field.get_soil().set_is_fertilized(False)
field.get_soil().set_water_level(False)
field.get_soil().set_state(False)
self.set_collected_plants("potato", self.get_collected_plants("potato") + 1)
elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() == definitions.WHEAT_MAXIMUM_STATE and self.get_all_collected_plants() < definitions.CART_MAXIMUM_COLLECTED_PLANTS:
field.get_plant().set_name("none")
field.get_plant().set_state(0)
field.get_soil().set_is_fertilized(False)
field.get_soil().set_water_level(False)

View File

@ -52,7 +52,12 @@ FARMLAND_DRY_COST = 3
FARMLAND_WET = pygame.image.load(os.path.join('resources/images', 'farmland_wet.png'))
FARMLAND_WET = pygame.transform.scale(FARMLAND_WET, (BLOCK_SIZE, BLOCK_SIZE))
FARMLAND_WET_COST = 1
FPS = 10
FLOWER_DANDELION = pygame.image.load(os.path.join('resources/images', 'flower_dandelion.png'))
FLOWER_DANDELION = pygame.transform.scale(FLOWER_DANDELION, (BLOCK_SIZE, BLOCK_SIZE))
FLOWER_DANDELION_COST = 5
FLOWER_DANDELION_GROW_PROBABILITY = 0.01
FLOWER_DANDELION_MAXIMUM_STATE = 1
FPS = 1
HEIGHT_AMOUNT, WIDTH_AMOUNT = 10, 10
HEIGHT, WIDTH = BLOCK_SIZE * HEIGHT_AMOUNT, BLOCK_SIZE * WIDTH_AMOUNT
IMAGE_SIZE_NEURAL_NETWORK = 16
@ -72,7 +77,7 @@ SPONGE = pygame.image.load(os.path.join('resources/images', 'sponge.png'))
SPONGE = pygame.transform.scale(SPONGE, (BLOCK_SIZE, BLOCK_SIZE))
STATION = pygame.image.load(os.path.join('resources/images', 'rail_normal.png'))
STATION = pygame.transform.scale(STATION, (BLOCK_SIZE, BLOCK_SIZE))
STATION_COST = 5
STATION_COST = 6
WHEAT_ADULT_COST = 4
WHEAT_GROW_COST = 10
WHEAT_GROW_TIME = 5

11
map.py
View File

@ -41,6 +41,8 @@ class Map:
rect = field.get_rect()
if field.get_plant().get_name() == "station" and field.get_plant().get_state() == -1:
block = definitions.STATION
elif field.get_plant().get_name() == "flower_dandelion" and field.get_plant().get_state() == 1:
block = definitions.FLOWER_DANDELION
elif field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() > 0 and field.get_plant().get_state() <= 1 * definitions.BEETROOTS_GROW_TIME:
block = definitions.BEETROOTS_STAGE_0
elif field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() > 1 * definitions.BEETROOTS_GROW_TIME and field.get_plant().get_state() <= 2 * definitions.BEETROOTS_GROW_TIME:
@ -89,6 +91,13 @@ class Map:
block = definitions.FARMLAND_WET
if block == definitions.STATION:
definitions.WINDOW.blit(definitions.SPONGE, (rect.x, rect.y))
elif block == definitions.FLOWER_DANDELION:
if field.get_soil().get_state() is False:
definitions.WINDOW.blit(definitions.DIRT, (rect.x, rect.y))
elif field.get_soil().get_state() is True and field.get_soil().get_water_level() is False:
definitions.WINDOW.blit(definitions.FARMLAND_DRY, (rect.x, rect.y))
elif field.get_soil().get_state() is True and field.get_soil().get_water_level() is True:
definitions.WINDOW.blit(definitions.FARMLAND_WET, (rect.x, rect.y))
elif block != definitions.DIRT or block != definitions.FARMLAND_DRY or block != definitions.FARMLAND_WET:
definitions.WINDOW.blit(definitions.FARMLAND_WET, (rect.x, rect.y))
definitions.WINDOW.blit(block, (rect.x, rect.y))
@ -96,6 +105,8 @@ class Map:
field = self.fields[x][y]
if field.get_plant().get_name() == "station" and field.get_plant().get_state() == -1:
return definitions.STATION_COST
elif field.get_plant().get_name() == "flower_dandelion" and field.get_plant().get_state() == 0:
return definitions.FLOWER_DANDELION_COST
elif field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() > 0 and field.get_plant().get_state() <= 3 * definitions.BEETROOTS_GROW_TIME:
return definitions.BEETROOTS_GROW_COST
elif field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() == definitions.BEETROOTS_MAXIMUM_STATE:

View File

@ -1,4 +1,5 @@
import definitions
import random
class Plant:
def __init__(self, name, state):
self.name = name #nazwa rośliny np. "wheat"
@ -12,7 +13,17 @@ class Plant:
def set_state(self, state):
self.state = state
@staticmethod
def grow_plants(map): #metoda statyczna, która zwiększa pole state (etap rozwoju rośliny) dla danej rośliny na danym polu o 1
def grow_flower_dandelion(map): #metoda statyczna, losująca czy na danym polu ma urosnąć kwiat dandelion
for i in range(definitions.WIDTH_AMOUNT):
for j in range(definitions.HEIGHT_AMOUNT):
field = map.get_fields()[i][j]
if field.get_plant().get_name() == "none":
random1 = random.uniform(0, 100)
if random1 <= definitions.FLOWER_DANDELION_GROW_PROBABILITY:
field.get_plant().set_name("flower_dandelion")
field.get_plant().set_state(definitions.FLOWER_DANDELION_MAXIMUM_STATE)
@staticmethod
def grow_plants(map): #metoda statyczna, która zwiększa pole state (etap rozwoju rośliny) dla danej rośliny na danym polu o 1
for i in range(definitions.WIDTH_AMOUNT):
for j in range(definitions.HEIGHT_AMOUNT):
field = map.get_fields()[i][j]

6
py.py
View File

@ -26,6 +26,7 @@ def main():
tree = treelearn.treelearn() #tworzenie drzewa decyzyjnego
decision = [0] #początkowa decyzja o braku powrotu do stacji (0)
classes, model = neuralnetwork.create_neural_network() #uczenie sieci neuronowej
grow_flower_dandelion = False
random_movement = False
run = True
while run: #pętla główna programu
@ -35,6 +36,7 @@ def main():
run = False
map1.draw_window(cart1, cart1_rect)
if not move_list: #jeżeli są jakieś ruchy do wykonania w move_list
grow_flower_dandelion = True
pygame.image.save(pygame.display.get_surface(), os.path.join('resources/neural_network/tiles/', 'screen.jpg')) #zrzut obecnego ekranu
tiles = image_slicer.slice(os.path.join('resources/neural_network/tiles/', 'screen.jpg'), 100, save=False) #pocięcie ekranu na sto części
image_slicer.save_tiles(tiles, directory=os.path.join('resources/neural_network/tiles/'), prefix='tile', format='png') #zapisanie części do folderu tiles
@ -50,10 +52,12 @@ def main():
random_movement = True
elif move_list: #jeżeli move_list nie jest pusta
cart1.handle_movement(cart1_rect, move_list.pop(0)) #wykonaj kolejny ruch oraz zdejmij ten ruch z początku listy
if random_movement is not False:
if random_movement is True:
cart1.handle_movement_random(cart1_rect) #wykonuj losowe ruchy
cart1.do_work(cart1_rect, map1, station1) #wykonaj pracę na danym polu
decision = treelearn.make_decision(cart1.get_all_amount_of_seeds(), cart1.get_all_collected_plants(), cart1.get_all_fertilizer(), cart1.get_fuel(), tree, cart1.get_water_level()) #podejmij decyzję czy wracać do stacji (0 : NIE, 1 : TAK)
if grow_flower_dandelion is True:
plant.Plant.grow_flower_dandelion(map1) #losuj urośnięcie kwiatka dandeliona
plant.Plant.grow_plants(map1) #zwiększ poziom dojrzałości roślin
pygame.quit()
if __name__ == "__main__":

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 0 B

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB