Compare commits

..

84 Commits

Author SHA1 Message Date
10ac917df3 Merge pull request 'Genetic-algorythm' (#29) from Genetic-algorythm into main
Reviewed-on: s473601/Machine_learning_2023#29
Reviewed-by: Nastassia Zhuravel <naszhu@st.amu.edu.pl>
2023-06-16 15:13:36 +02:00
Mateusz Dokowicz
a404e70058 mutations geneticAlg 2023-06-16 03:22:30 +02:00
Mateusz Dokowicz
74fd6d9263 crossover working version 2023-06-16 00:48:59 +02:00
Mateusz Dokowicz
8b1e390e6b Improvement on code + path creation 2023-06-15 16:46:08 +02:00
Mateusz Dokowicz
af7027a90f neural network config 2023-06-14 19:59:23 +02:00
e2c2ea8f0e Merge pull request 'Implementation-neuron-model' (#28) from Implementation-neuron-model into main
Reviewed-on: s473601/Machine_learning_2023#28
Reviewed-by: Nastassia Zhuravel <naszhu@st.amu.edu.pl>
2023-06-04 20:19:42 +02:00
Pavel
e8b8de741d changes for better understanding of code 2023-06-04 19:16:50 +02:00
Pavel
7e3a9cf3d0 Last changies for correct work of neuron network 2023-06-04 19:11:12 +02:00
Pavel
7490cc8e06 changies in main file for using power of config 2023-06-04 19:09:59 +02:00
Pavel
5910777fa4 changies in config file for work simplification 2023-06-04 19:05:45 +02:00
Pavel
71c18c567d requirements file changing 2023-06-04 19:04:14 +02:00
Pavel
f3e6d04eb4 recognition file changes + link for neuron model 2023-06-04 19:02:37 +02:00
Pavel
20d32201ae dataset for recognition 2023-06-04 18:54:32 +02:00
Pavel
f98855d93c preparing recognnition file to implimintation 2023-06-04 18:52:06 +02:00
82b964ac2a Merge pull request 'image_recognition' (#26) from image_recognition into main
Reviewed-on: s473601/Machine_learning_2023#26
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-06-01 19:38:09 +02:00
countingthedots
563fa7da6a image recognition 2023-06-01 19:35:54 +02:00
countingthedots
04d725103d Neural network for image recognition 2023-06-01 19:30:04 +02:00
5bc61434e9 Merge pull request 'fixing-Errors' (#24) from fixing-Errors into main
Reviewed-on: s473601/Machine_learning_2023#24
2023-05-29 09:13:00 +02:00
Mateusz Dokowicz
769876e131 photo decision tree 2023-05-26 12:16:50 +02:00
Mateusz Dokowicz
8b7c4ed086 trash value 25->5 2023-05-26 01:17:33 +02:00
Mateusz Dokowicz
f85ba27472 item description decision tree 2023-05-25 17:28:58 +02:00
Mateusz Dokowicz
d470601fe1 config added constant 2023-05-25 16:59:50 +02:00
Mateusz Dokowicz
44bdfa8ae1 Number of generated bananas 2023-05-25 16:49:24 +02:00
Mateusz Dokowicz
c6538f420f astar to aStar 2023-05-25 16:34:55 +02:00
Mateusz Dokowicz
cbaaed7820 USE AUTOFORMATTING 2023-05-25 16:26:13 +02:00
Mateusz Dokowicz
991dd93650 tile cost fix 2023-05-25 16:25:37 +02:00
Mateusz Dokowicz
3dcd5db03d Vacuum takes more than 100% 2023-05-25 16:23:56 +02:00
Mateusz Dokowicz
ae838bbbc5 props => properties 2023-05-25 16:23:12 +02:00
3fe4b6f2e1 Merge pull request 'complete decision tree' (#23) from d_tree into main
Reviewed-on: s473601/Machine_learning_2023#23
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-05-19 17:51:03 +02:00
8c7517e1a2 remove files 2023-05-19 15:54:14 +02:00
b7b9e8e97c changes 2023-05-19 15:49:17 +02:00
Polevara Veronika
b7dfc33086 change cvs 2023-05-18 23:33:04 +02:00
Polevara Veronika
ef7aa77470 changes 2023-05-18 23:18:07 +02:00
ddb69cc1ec Merge pull request 'a-star-implementation' (#22) from a-star-implementation into main
Reviewed-on: s473601/Machine_learning_2023#22
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-05-14 14:27:45 +02:00
Maciej
246fda4e8a conflict merge 2023-05-14 10:15:09 +02:00
Maciej
236f608830 a-star-implementation 2023-05-14 10:09:52 +02:00
Maciej
a4f822ad93 Merge branch 'main' of https://git.wmi.amu.edu.pl/s473601/Machine_learning_2023 into a-star-implementation 2023-05-14 09:51:58 +02:00
Maciej
423e7e858c astar imlpementation 2023-05-14 09:10:31 +02:00
3283eaa46d Merge pull request 'Add decision tree' (#20) from decision_tree into main
Reviewed-on: s473601/Machine_learning_2023#20
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-05-12 22:23:28 +02:00
8a05edf925 add decision tree 2023-05-11 19:34:08 +02:00
f20ac56cc0 Merge pull request 'Added BFS algorithm to search path using 3 actions: turn left/right, go straight' (#19) from rotation_actions into main
Reviewed-on: s473601/Machine_learning_2023#19
Reviewed-by: Maciej Wiklandt <macwik@st.amu.edu.pl>
2023-05-04 21:32:51 +02:00
Eikthyrnir
2d4cc41157 refactoring 2023-05-02 00:02:00 +02:00
Eikthyrnir
f4ad111371 refactoring 2023-05-01 23:59:15 +02:00
Eikthyrnir
afdcac8b56 now the vacuum can only go straight and rotate left/right to change direction 2023-04-21 13:11:52 +02:00
c95ce82ac4 Merge pull request 'Next increment - AI movement' (#18) from Automatic-robot-movement into main
Reviewed-on: s473601/Machine_learning_2023#18
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-04-21 10:14:31 +02:00
Mateusz Dokowicz
ccefc6afbc AI move from position A to B 2023-04-20 03:38:55 +02:00
Mateusz Dokowicz
f5003e93fe Config for cat 2023-04-20 00:15:00 +02:00
e972dcfd83 Merge pull request 'Vacuum_cleaning-ability' (#16) from Vacuum_cleaning-ability into main
Reviewed-on: s473601/Machine_learning_2023#16
Reviewed-by: Nastassia Zhuravel <naszhu@st.amu.edu.pl>
2023-04-14 13:54:02 +02:00
Pavel
7dd2190c76 Added maximum mount of container_filling value, it's 100% - one pell it's 25%. 2023-04-14 00:25:35 +02:00
Pavel
029bcb1986 Added the Vacuum Doc Station, which can refresh vacuum container_filling level + add sprite of Doc Station + display Doc Station on screen(files) 2023-04-13 19:25:04 +02:00
Pavel
8ef3da8df0 Added the Vacuum Doc Station, which can refresh vacuum container_filling level + add sprite of Doc Station + display Doc Station on screen 2023-04-13 19:04:57 +02:00
Pavel
3b761e41ab Added the cleaning ability to vacuum and container_filling status now is visible. 2023-04-10 18:43:16 +02:00
2929495348 Merge pull request 'added some properties' (#15) from Add-Properties into main
Reviewed-on: s473601/Machine_learning_2023#15
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-30 19:26:53 +02:00
Mateusz Dokowicz
959ed6bfda added some properties 2023-03-30 18:45:52 +02:00
2c9500c2bf Merge pull request 'Redesigned project architecture to be a little bit more modular' (#12) from sandbox into main
Reviewed-on: s473601/Machine_learning_2023#12
2023-03-30 18:29:26 +02:00
Mateusz Dokowicz
f7b97c5f74 auto formatting 2023-03-30 18:27:51 +02:00
Mateusz Dokowicz
291e028a8a resolve endregion problem 2023-03-30 18:24:41 +02:00
Mateusz Dokowicz
047ef87bab Delete import non existing file 2023-03-30 18:18:46 +02:00
Eikthyrnir
83ef0fecad deleted old code 2023-03-29 12:22:05 +02:00
Eikthyrnir
03ece1218b refactoring 2023-03-29 11:27:59 +02:00
Eikthyrnir
a0fe606c23 added cat and plants 2023-03-29 07:13:08 +02:00
Eikthyrnir
5b85d415e4 Merge branch 'main' into sandbox 2023-03-28 22:02:25 +02:00
40a8322852 plants images added
Reviewed-on: s473601/Machine_learning_2023#11
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-28 21:57:34 +02:00
countingthedots
5de48e2c3f plants images added 2023-03-28 21:48:52 +02:00
Eikthyrnir
c54a99369e Merge branch 'main' into sandbox 2023-03-28 21:41:01 +02:00
adf4eaee00 Added static plants, fixed cat moving out of the world
Reviewed-on: s473601/Machine_learning_2023#10
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-28 21:39:59 +02:00
countingthedots
77feab6a4e static plants added 2023-03-28 21:32:07 +02:00
Eikthyrnir
31dcf7b6dc Merge branch 'main' into sandbox 2023-03-28 21:12:47 +02:00
Eikthyrnir
28af8048b9 initial mix of Veronika and Mateusz code 2023-03-28 20:14:23 +02:00
848e23d062 Added a cat that can move around a world
Reviewed-on: s473601/Machine_learning_2023#9
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-28 20:11:08 +02:00
countingthedots
7358cb73fe unrequired cat image deleted 2023-03-28 19:47:46 +02:00
countingthedots
50a0eda8ef obrazy kota 2023-03-28 19:44:39 +02:00
countingthedots
5818a63e1e moving cat added 2023-03-28 19:36:57 +02:00
ad828cb7d1 Merge pull request 'Create-Array-for-Grid' (#8) from Create-Array-for-Grid into main 2023-03-23 15:35:53 +01:00
Mateusz Dokowicz
667d19084f Merge branch 'main' into Create-Array-for-Grid 2023-03-23 00:59:13 +01:00
Mateusz Dokowicz
586a94e0c0 working arrays and movement 2023-03-23 00:54:05 +01:00
Mateusz Dokowicz
be307ebab5 bugFixes 2023-03-22 23:11:13 +01:00
Mateusz Dokowicz
4933c04bd8 upadte + array_to_window_position 2023-03-22 20:48:02 +01:00
Mateusz Dokowicz
e55dbcccea error correction 2023-03-22 20:47:14 +01:00
Mateusz Dokowicz
7757843da8 formatting requirements 2023-03-22 20:46:05 +01:00
Mateusz Dokowicz
51a629285d Revert "Merge pull request 'Refactor and sprites' (#7) from refactor into main"
This reverts commit a65b07727b, reversing
changes made to 4ec034d548.
2023-03-21 21:15:08 +01:00
a65b07727b Merge pull request 'Refactor and sprites' (#7) from refactor into main
Reviewed-on: s473601/Machine_learning_2023#7
2023-03-21 20:45:49 +01:00
Mateusz Dokowicz
e37a889e1e Array Grid 2023-03-20 01:14:48 +01:00
Mateusz Dokowicz
101136b0b7 radius Fix 2023-03-19 22:00:10 +01:00
1248 changed files with 1769 additions and 239 deletions

12
.gitignore vendored
View File

@ -1,4 +1,8 @@
/venv
.DS_Store
/.vscode
__pycache__
/venv
.DS_Store
/.vscode
__pycache__
#PyCharm
.idea/
AI_brain/model.h5

3
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/PythEnv" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
</module>

View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

4
.idea/misc.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (Machine_learning_2023)" project-jdk-type="Python SDK" />
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Machine_learning_2023.iml" filepath="$PROJECT_DIR$/.idea/Machine_learning_2023.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Some files were not shown because too many files have changed in this diff Show More