diff --git a/.DS_Store b/.DS_Store
index 261ea15..3e0c17a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml b/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml
index 6ccea19..9a6cf1f 100644
--- a/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml
+++ b/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml
@@ -7,7 +7,6 @@
-
@@ -51,6 +50,7 @@
+
@@ -58,6 +58,7 @@
+
diff --git a/.idea/.idea.RobotIntelFinal/.idea/workspace.xml b/.idea/.idea.RobotIntelFinal/.idea/workspace.xml
index 2fc297b..214598c 100644
--- a/.idea/.idea.RobotIntelFinal/.idea/workspace.xml
+++ b/.idea/.idea.RobotIntelFinal/.idea/workspace.xml
@@ -18,30 +18,24 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -115,7 +109,6 @@
-
@@ -129,7 +122,6 @@
-
@@ -139,8 +131,10 @@
-
+
+
+
@@ -152,7 +146,7 @@
-
+
@@ -220,7 +214,7 @@
-
+
diff --git a/ConsoleApp/.DS_Store b/ConsoleApp/.DS_Store
index 7ecef30..4cc31e4 100644
Binary files a/ConsoleApp/.DS_Store and b/ConsoleApp/.DS_Store differ
diff --git a/ConsoleApp/ConsoleApp.csproj b/ConsoleApp/ConsoleApp.csproj
index f73aec2..b47461a 100644
--- a/ConsoleApp/ConsoleApp.csproj
+++ b/ConsoleApp/ConsoleApp.csproj
@@ -22,7 +22,7 @@
PreserveNewest
-
+
PreserveNewest
diff --git a/ConsoleApp/Output 2.zip b/ConsoleApp/Output 2.zip
new file mode 100644
index 0000000..77fcc45
Binary files /dev/null and b/ConsoleApp/Output 2.zip differ
diff --git a/ConsoleApp/Output.zip b/ConsoleApp/Output.zip
new file mode 100644
index 0000000..af121f2
Binary files /dev/null and b/ConsoleApp/Output.zip differ
diff --git a/ConsoleApp/Output/Data.txt b/ConsoleApp/Output/Data.txt
index c536ecc..0436bc9 100644
--- a/ConsoleApp/Output/Data.txt
+++ b/ConsoleApp/Output/Data.txt
@@ -1,14 +1,14 @@
General:
- Total Mines: 23
+ Total Mines: 36
Hex:
- Total Moves: 420
- Bombs Found: 23
- Cleared Cell Count: 2263
- Uncleared Cell Count: 41
- Percentage Cleared: 98.22048611111111
+ Total Moves: 687
+ Bombs Found: 35
+ Cleared Cell Count: 3591
+ Uncleared Cell Count: 9
+ Percentage Cleared: 99.75
Square:
- Total Moves: 553
- Bombs Found: 20
- Cleared Cell Count: 1996
- Uncleared Cell Count: 308
- Percentage Cleared: 86.63194444444444
+ Total Moves: 1045
+ Bombs Found: 34
+ Cleared Cell Count: 3251
+ Uncleared Cell Count: 349
+ Percentage Cleared: 90.30555555555554
diff --git a/ConsoleApp/Output/HexCoverage.png b/ConsoleApp/Output/HexCoverage.png
index fb35575..73ea623 100644
Binary files a/ConsoleApp/Output/HexCoverage.png and b/ConsoleApp/Output/HexCoverage.png differ
diff --git a/ConsoleApp/Output/HexCoveredCells.txt b/ConsoleApp/Output/HexCoveredCells.txt
index 2aa75d2..8ae0eaa 100644
--- a/ConsoleApp/Output/HexCoveredCells.txt
+++ b/ConsoleApp/Output/HexCoveredCells.txt
@@ -45,6 +45,19 @@
0 44
0 45
0 46
+0 47
+0 48
+0 49
+0 50
+0 51
+0 52
+0 53
+0 54
+0 55
+0 56
+0 57
+0 58
+0 59
1 0
1 1
1 2
@@ -92,6 +105,19 @@
1 44
1 45
1 46
+1 47
+1 48
+1 49
+1 50
+1 51
+1 52
+1 53
+1 54
+1 55
+1 56
+1 57
+1 58
+1 59
2 0
2 1
2 2
@@ -139,6 +165,19 @@
2 44
2 45
2 46
+2 47
+2 48
+2 49
+2 50
+2 51
+2 52
+2 53
+2 54
+2 55
+2 56
+2 57
+2 58
+2 59
3 0
3 1
3 2
@@ -186,6 +225,19 @@
3 44
3 45
3 46
+3 47
+3 48
+3 49
+3 50
+3 51
+3 52
+3 53
+3 54
+3 55
+3 56
+3 57
+3 58
+3 59
4 0
4 1
4 2
@@ -233,6 +285,19 @@
4 44
4 45
4 46
+4 47
+4 48
+4 49
+4 50
+4 51
+4 52
+4 53
+4 54
+4 55
+4 56
+4 57
+4 58
+4 59
5 0
5 1
5 2
@@ -280,6 +345,19 @@
5 44
5 45
5 46
+5 47
+5 48
+5 49
+5 50
+5 51
+5 52
+5 53
+5 54
+5 55
+5 56
+5 57
+5 58
+5 59
6 0
6 1
6 2
@@ -327,6 +405,19 @@
6 44
6 45
6 46
+6 47
+6 48
+6 49
+6 50
+6 51
+6 52
+6 53
+6 54
+6 55
+6 56
+6 57
+6 58
+6 59
7 0
7 1
7 2
@@ -374,6 +465,19 @@
7 44
7 45
7 46
+7 47
+7 48
+7 49
+7 50
+7 51
+7 52
+7 53
+7 54
+7 55
+7 56
+7 57
+7 58
+7 59
8 0
8 1
8 2
@@ -421,6 +525,19 @@
8 44
8 45
8 46
+8 47
+8 48
+8 49
+8 50
+8 51
+8 52
+8 53
+8 54
+8 55
+8 56
+8 57
+8 58
+8 59
9 0
9 1
9 2
@@ -468,6 +585,19 @@
9 44
9 45
9 46
+9 47
+9 48
+9 49
+9 50
+9 51
+9 52
+9 53
+9 54
+9 55
+9 56
+9 57
+9 58
+9 59
10 0
10 1
10 2
@@ -515,6 +645,19 @@
10 44
10 45
10 46
+10 47
+10 48
+10 49
+10 50
+10 51
+10 52
+10 53
+10 54
+10 55
+10 56
+10 57
+10 58
+10 59
11 0
11 1
11 2
@@ -562,6 +705,19 @@
11 44
11 45
11 46
+11 47
+11 48
+11 49
+11 50
+11 51
+11 52
+11 53
+11 54
+11 55
+11 56
+11 57
+11 58
+11 59
12 0
12 1
12 2
@@ -609,6 +765,19 @@
12 44
12 45
12 46
+12 47
+12 48
+12 49
+12 50
+12 51
+12 52
+12 53
+12 54
+12 55
+12 56
+12 57
+12 58
+12 59
13 0
13 1
13 2
@@ -656,6 +825,19 @@
13 44
13 45
13 46
+13 47
+13 48
+13 49
+13 50
+13 51
+13 52
+13 53
+13 54
+13 55
+13 56
+13 57
+13 58
+13 59
14 0
14 1
14 2
@@ -703,6 +885,19 @@
14 44
14 45
14 46
+14 47
+14 48
+14 49
+14 50
+14 51
+14 52
+14 53
+14 54
+14 55
+14 56
+14 57
+14 58
+14 59
15 0
15 1
15 2
@@ -751,6 +946,18 @@
15 45
15 46
15 47
+15 48
+15 49
+15 50
+15 51
+15 52
+15 53
+15 54
+15 55
+15 56
+15 57
+15 58
+15 59
16 0
16 1
16 2
@@ -799,6 +1006,18 @@
16 45
16 46
16 47
+16 48
+16 49
+16 50
+16 51
+16 52
+16 53
+16 54
+16 55
+16 56
+16 57
+16 58
+16 59
17 0
17 1
17 2
@@ -818,6 +1037,7 @@
17 16
17 17
17 18
+17 19
17 20
17 21
17 22
@@ -846,6 +1066,18 @@
17 45
17 46
17 47
+17 48
+17 49
+17 50
+17 51
+17 52
+17 53
+17 54
+17 55
+17 56
+17 57
+17 58
+17 59
18 0
18 1
18 2
@@ -865,6 +1097,7 @@
18 16
18 17
18 18
+18 19
18 20
18 21
18 22
@@ -893,6 +1126,18 @@
18 45
18 46
18 47
+18 48
+18 49
+18 50
+18 51
+18 52
+18 53
+18 54
+18 55
+18 56
+18 57
+18 58
+18 59
19 0
19 1
19 2
@@ -912,6 +1157,7 @@
19 16
19 17
19 18
+19 19
19 20
19 21
19 22
@@ -940,6 +1186,18 @@
19 45
19 46
19 47
+19 48
+19 49
+19 50
+19 51
+19 52
+19 53
+19 54
+19 55
+19 56
+19 57
+19 58
+19 59
20 0
20 1
20 2
@@ -988,6 +1246,18 @@
20 45
20 46
20 47
+20 48
+20 49
+20 50
+20 51
+20 52
+20 53
+20 54
+20 55
+20 56
+20 57
+20 58
+20 59
21 0
21 1
21 2
@@ -1036,6 +1306,18 @@
21 45
21 46
21 47
+21 48
+21 49
+21 50
+21 51
+21 52
+21 53
+21 54
+21 55
+21 56
+21 57
+21 58
+21 59
22 0
22 1
22 2
@@ -1084,6 +1366,18 @@
22 45
22 46
22 47
+22 48
+22 49
+22 50
+22 51
+22 52
+22 53
+22 54
+22 55
+22 56
+22 57
+22 58
+22 59
23 0
23 1
23 2
@@ -1132,6 +1426,18 @@
23 45
23 46
23 47
+23 48
+23 49
+23 50
+23 51
+23 52
+23 53
+23 54
+23 55
+23 56
+23 57
+23 58
+23 59
24 0
24 1
24 2
@@ -1180,6 +1486,18 @@
24 45
24 46
24 47
+24 48
+24 49
+24 50
+24 51
+24 52
+24 53
+24 54
+24 55
+24 56
+24 57
+24 58
+24 59
25 0
25 1
25 2
@@ -1227,6 +1545,19 @@
25 44
25 45
25 46
+25 47
+25 48
+25 49
+25 50
+25 51
+25 52
+25 53
+25 54
+25 55
+25 56
+25 57
+25 58
+25 59
26 0
26 1
26 2
@@ -1274,6 +1605,19 @@
26 44
26 45
26 46
+26 47
+26 48
+26 49
+26 50
+26 51
+26 52
+26 53
+26 54
+26 55
+26 56
+26 57
+26 58
+26 59
27 0
27 1
27 2
@@ -1321,6 +1665,19 @@
27 44
27 45
27 46
+27 47
+27 48
+27 49
+27 50
+27 51
+27 52
+27 53
+27 54
+27 55
+27 56
+27 57
+27 58
+27 59
28 0
28 1
28 2
@@ -1368,6 +1725,15 @@
28 44
28 45
28 46
+28 47
+28 52
+28 53
+28 54
+28 55
+28 56
+28 57
+28 58
+28 59
29 0
29 1
29 2
@@ -1415,6 +1781,18 @@
29 44
29 45
29 46
+29 47
+29 48
+29 49
+29 51
+29 52
+29 53
+29 54
+29 55
+29 56
+29 57
+29 58
+29 59
30 0
30 1
30 2
@@ -1462,6 +1840,19 @@
30 44
30 45
30 46
+30 47
+30 48
+30 49
+30 50
+30 51
+30 52
+30 53
+30 54
+30 55
+30 56
+30 57
+30 58
+30 59
31 0
31 1
31 2
@@ -1509,6 +1900,19 @@
31 44
31 45
31 46
+31 47
+31 48
+31 49
+31 50
+31 51
+31 52
+31 53
+31 54
+31 55
+31 56
+31 57
+31 58
+31 59
32 0
32 1
32 2
@@ -1521,7 +1925,6 @@
32 9
32 10
32 11
-32 12
32 13
32 14
32 15
@@ -1556,6 +1959,19 @@
32 44
32 45
32 46
+32 47
+32 48
+32 49
+32 50
+32 51
+32 52
+32 53
+32 54
+32 55
+32 56
+32 57
+32 58
+32 59
33 0
33 1
33 2
@@ -1568,7 +1984,6 @@
33 9
33 10
33 11
-33 12
33 13
33 14
33 15
@@ -1603,6 +2018,19 @@
33 44
33 45
33 46
+33 47
+33 48
+33 49
+33 50
+33 51
+33 52
+33 53
+33 54
+33 55
+33 56
+33 57
+33 58
+33 59
34 0
34 1
34 2
@@ -1615,7 +2043,6 @@
34 9
34 10
34 11
-34 12
34 13
34 14
34 15
@@ -1650,6 +2077,19 @@
34 44
34 45
34 46
+34 47
+34 48
+34 49
+34 50
+34 51
+34 52
+34 53
+34 54
+34 55
+34 56
+34 57
+34 58
+34 59
35 0
35 1
35 2
@@ -1662,7 +2102,6 @@
35 9
35 10
35 11
-35 12
35 13
35 14
35 15
@@ -1697,6 +2136,19 @@
35 44
35 45
35 46
+35 47
+35 48
+35 49
+35 50
+35 51
+35 52
+35 53
+35 54
+35 55
+35 56
+35 57
+35 58
+35 59
36 0
36 1
36 2
@@ -1744,6 +2196,19 @@
36 44
36 45
36 46
+36 47
+36 48
+36 49
+36 50
+36 51
+36 52
+36 53
+36 54
+36 55
+36 56
+36 57
+36 58
+36 59
37 0
37 1
37 2
@@ -1791,6 +2256,19 @@
37 44
37 45
37 46
+37 47
+37 48
+37 49
+37 50
+37 51
+37 52
+37 53
+37 54
+37 55
+37 56
+37 57
+37 58
+37 59
38 0
38 1
38 2
@@ -1838,6 +2316,19 @@
38 44
38 45
38 46
+38 47
+38 48
+38 49
+38 50
+38 51
+38 52
+38 53
+38 54
+38 55
+38 56
+38 57
+38 58
+38 59
39 0
39 1
39 2
@@ -1885,6 +2376,19 @@
39 44
39 45
39 46
+39 47
+39 48
+39 49
+39 50
+39 51
+39 52
+39 53
+39 54
+39 55
+39 56
+39 57
+39 58
+39 59
40 0
40 1
40 2
@@ -1932,6 +2436,19 @@
40 44
40 45
40 46
+40 47
+40 48
+40 49
+40 50
+40 51
+40 52
+40 53
+40 54
+40 55
+40 56
+40 57
+40 58
+40 59
41 0
41 1
41 2
@@ -1979,6 +2496,19 @@
41 44
41 45
41 46
+41 47
+41 48
+41 49
+41 50
+41 51
+41 52
+41 53
+41 54
+41 55
+41 56
+41 57
+41 58
+41 59
42 0
42 1
42 2
@@ -2026,6 +2556,19 @@
42 44
42 45
42 46
+42 47
+42 48
+42 49
+42 50
+42 51
+42 52
+42 53
+42 54
+42 55
+42 56
+42 57
+42 58
+42 59
43 0
43 1
43 2
@@ -2073,6 +2616,19 @@
43 44
43 45
43 46
+43 47
+43 48
+43 49
+43 50
+43 51
+43 52
+43 53
+43 54
+43 55
+43 56
+43 57
+43 58
+43 59
44 0
44 1
44 2
@@ -2120,6 +2676,19 @@
44 44
44 45
44 46
+44 47
+44 48
+44 49
+44 50
+44 51
+44 52
+44 53
+44 54
+44 55
+44 56
+44 57
+44 58
+44 59
45 0
45 1
45 2
@@ -2167,6 +2736,19 @@
45 44
45 45
45 46
+45 47
+45 48
+45 49
+45 50
+45 51
+45 52
+45 53
+45 54
+45 55
+45 56
+45 57
+45 58
+45 59
46 0
46 1
46 2
@@ -2214,6 +2796,19 @@
46 44
46 45
46 46
+46 47
+46 48
+46 49
+46 50
+46 51
+46 52
+46 53
+46 54
+46 55
+46 56
+46 57
+46 58
+46 59
47 0
47 1
47 2
@@ -2261,3 +2856,736 @@
47 44
47 45
47 46
+47 47
+47 48
+47 49
+47 50
+47 51
+47 52
+47 53
+47 54
+47 55
+47 56
+47 57
+47 58
+47 59
+48 0
+48 1
+48 2
+48 3
+48 4
+48 5
+48 6
+48 7
+48 8
+48 9
+48 10
+48 11
+48 12
+48 13
+48 14
+48 15
+48 16
+48 17
+48 18
+48 19
+48 20
+48 21
+48 22
+48 23
+48 24
+48 25
+48 26
+48 27
+48 28
+48 29
+48 30
+48 31
+48 32
+48 33
+48 34
+48 35
+48 36
+48 37
+48 38
+48 39
+48 40
+48 41
+48 42
+48 43
+48 44
+48 45
+48 46
+48 47
+48 48
+48 49
+48 50
+48 51
+48 52
+48 53
+48 54
+48 55
+48 56
+48 57
+48 58
+48 59
+49 0
+49 1
+49 2
+49 3
+49 4
+49 5
+49 6
+49 7
+49 8
+49 9
+49 10
+49 11
+49 12
+49 13
+49 14
+49 15
+49 16
+49 17
+49 18
+49 19
+49 20
+49 21
+49 22
+49 23
+49 24
+49 25
+49 26
+49 27
+49 28
+49 29
+49 30
+49 31
+49 32
+49 33
+49 34
+49 35
+49 36
+49 37
+49 38
+49 39
+49 40
+49 41
+49 42
+49 43
+49 44
+49 45
+49 46
+49 47
+49 48
+49 49
+49 50
+49 51
+49 52
+49 53
+49 54
+49 55
+49 56
+49 57
+49 58
+49 59
+50 0
+50 1
+50 2
+50 3
+50 4
+50 5
+50 6
+50 7
+50 8
+50 9
+50 10
+50 11
+50 12
+50 13
+50 14
+50 15
+50 16
+50 17
+50 18
+50 19
+50 20
+50 21
+50 22
+50 23
+50 24
+50 25
+50 26
+50 27
+50 28
+50 29
+50 30
+50 31
+50 32
+50 33
+50 34
+50 35
+50 36
+50 37
+50 38
+50 39
+50 40
+50 41
+50 42
+50 43
+50 44
+50 45
+50 46
+50 47
+50 48
+50 49
+50 50
+50 51
+50 52
+50 53
+50 54
+50 55
+50 56
+50 57
+50 58
+50 59
+51 0
+51 1
+51 2
+51 3
+51 4
+51 5
+51 6
+51 7
+51 8
+51 9
+51 10
+51 11
+51 12
+51 13
+51 14
+51 15
+51 16
+51 17
+51 18
+51 19
+51 20
+51 21
+51 22
+51 23
+51 24
+51 25
+51 26
+51 27
+51 28
+51 29
+51 30
+51 31
+51 32
+51 33
+51 34
+51 35
+51 36
+51 37
+51 38
+51 39
+51 40
+51 41
+51 42
+51 43
+51 44
+51 45
+51 46
+51 47
+51 48
+51 49
+51 50
+51 51
+51 52
+51 53
+51 54
+51 55
+51 56
+51 57
+51 58
+51 59
+52 0
+52 1
+52 2
+52 3
+52 4
+52 5
+52 6
+52 7
+52 8
+52 9
+52 10
+52 11
+52 12
+52 13
+52 14
+52 15
+52 16
+52 17
+52 18
+52 19
+52 20
+52 21
+52 22
+52 23
+52 24
+52 25
+52 26
+52 27
+52 28
+52 29
+52 30
+52 31
+52 32
+52 33
+52 34
+52 35
+52 36
+52 37
+52 38
+52 39
+52 40
+52 41
+52 42
+52 43
+52 44
+52 45
+52 46
+52 47
+52 48
+52 49
+52 50
+52 51
+52 52
+52 53
+52 54
+52 55
+52 56
+52 57
+52 58
+52 59
+53 0
+53 1
+53 2
+53 3
+53 4
+53 5
+53 6
+53 7
+53 8
+53 9
+53 10
+53 11
+53 12
+53 13
+53 14
+53 15
+53 16
+53 17
+53 18
+53 19
+53 20
+53 21
+53 22
+53 23
+53 24
+53 25
+53 26
+53 27
+53 28
+53 29
+53 30
+53 31
+53 32
+53 33
+53 34
+53 35
+53 36
+53 37
+53 38
+53 39
+53 40
+53 41
+53 42
+53 43
+53 44
+53 45
+53 46
+53 47
+53 48
+53 49
+53 50
+53 51
+53 52
+53 53
+53 54
+53 55
+53 56
+53 57
+53 58
+53 59
+54 0
+54 1
+54 2
+54 3
+54 4
+54 5
+54 6
+54 7
+54 8
+54 9
+54 10
+54 11
+54 12
+54 13
+54 14
+54 15
+54 16
+54 17
+54 18
+54 19
+54 20
+54 21
+54 22
+54 23
+54 24
+54 25
+54 26
+54 27
+54 28
+54 29
+54 30
+54 31
+54 32
+54 33
+54 34
+54 35
+54 36
+54 37
+54 38
+54 39
+54 40
+54 41
+54 42
+54 43
+54 44
+54 45
+54 46
+54 47
+54 48
+54 49
+54 50
+54 51
+54 52
+54 53
+54 54
+54 55
+54 56
+54 57
+54 58
+54 59
+55 0
+55 1
+55 2
+55 3
+55 4
+55 5
+55 6
+55 7
+55 8
+55 9
+55 10
+55 11
+55 12
+55 13
+55 14
+55 15
+55 16
+55 17
+55 18
+55 19
+55 20
+55 21
+55 22
+55 23
+55 24
+55 25
+55 26
+55 27
+55 28
+55 29
+55 30
+55 31
+55 32
+55 33
+55 34
+55 35
+55 36
+55 37
+55 38
+55 39
+55 40
+55 41
+55 42
+55 43
+55 44
+55 45
+55 46
+55 47
+55 48
+55 49
+55 50
+55 51
+55 52
+55 53
+55 54
+55 55
+55 56
+55 57
+55 58
+55 59
+56 0
+56 1
+56 2
+56 3
+56 4
+56 5
+56 6
+56 7
+56 8
+56 9
+56 10
+56 11
+56 12
+56 13
+56 14
+56 15
+56 16
+56 17
+56 18
+56 19
+56 20
+56 21
+56 22
+56 23
+56 24
+56 25
+56 26
+56 27
+56 28
+56 29
+56 30
+56 31
+56 32
+56 33
+56 34
+56 35
+56 36
+56 37
+56 38
+56 39
+56 40
+56 41
+56 42
+56 43
+56 44
+56 45
+56 46
+56 47
+56 48
+56 49
+56 50
+56 51
+56 52
+56 53
+56 54
+56 55
+56 56
+56 57
+56 58
+56 59
+57 0
+57 1
+57 2
+57 3
+57 4
+57 5
+57 6
+57 7
+57 8
+57 9
+57 10
+57 11
+57 12
+57 13
+57 14
+57 15
+57 16
+57 17
+57 18
+57 19
+57 20
+57 21
+57 22
+57 23
+57 24
+57 25
+57 26
+57 27
+57 28
+57 29
+57 30
+57 31
+57 32
+57 33
+57 34
+57 35
+57 36
+57 37
+57 38
+57 39
+57 40
+57 41
+57 42
+57 43
+57 44
+57 45
+57 46
+57 47
+57 48
+57 49
+57 50
+57 51
+57 52
+57 53
+57 54
+57 55
+57 56
+57 57
+57 58
+57 59
+58 0
+58 1
+58 2
+58 3
+58 4
+58 5
+58 6
+58 7
+58 8
+58 9
+58 10
+58 11
+58 12
+58 13
+58 14
+58 15
+58 16
+58 17
+58 18
+58 19
+58 20
+58 21
+58 22
+58 23
+58 24
+58 25
+58 26
+58 27
+58 28
+58 29
+58 30
+58 31
+58 32
+58 33
+58 34
+58 35
+58 36
+58 37
+58 38
+58 39
+58 40
+58 41
+58 42
+58 43
+58 44
+58 45
+58 46
+58 47
+58 48
+58 49
+58 50
+58 51
+58 52
+58 53
+58 54
+58 55
+58 56
+58 57
+58 58
+58 59
+59 0
+59 1
+59 2
+59 3
+59 4
+59 5
+59 6
+59 7
+59 8
+59 9
+59 10
+59 11
+59 12
+59 13
+59 14
+59 15
+59 16
+59 17
+59 18
+59 19
+59 20
+59 21
+59 22
+59 23
+59 24
+59 25
+59 26
+59 27
+59 28
+59 29
+59 30
+59 31
+59 32
+59 33
+59 34
+59 35
+59 36
+59 37
+59 38
+59 39
+59 40
+59 41
+59 42
+59 43
+59 44
+59 45
+59 46
+59 47
+59 48
+59 49
+59 50
+59 51
+59 52
+59 53
+59 54
+59 55
+59 56
+59 57
+59 58
+59 59
diff --git a/ConsoleApp/Output/HexDetectedMines.txt b/ConsoleApp/Output/HexDetectedMines.txt
index 7730921..70d7f32 100644
--- a/ConsoleApp/Output/HexDetectedMines.txt
+++ b/ConsoleApp/Output/HexDetectedMines.txt
@@ -1,23 +1,35 @@
-39 7
-17 8
-12 11
-5 10
-12 14
-16 20
-27 14
-31 20
-32 14
-35 25
-33 22
-21 19
-20 21
-15 23
-9 29
-34 26
-37 26
-35 37
-35 36
-34 36
-29 38
-10 36
-20 42
+48 7
+47 13
+35 8
+12 8
+5 18
+31 14
+28 20
+36 14
+37 12
+42 18
+49 16
+45 23
+42 23
+49 27
+42 29
+6 22
+10 28
+9 31
+19 27
+54 29
+16 39
+10 34
+26 40
+33 42
+50 42
+52 53
+45 48
+38 48
+36 51
+34 51
+29 54
+30 50
+27 54
+26 49
+12 49
diff --git a/ConsoleApp/Output/HexPath.txt b/ConsoleApp/Output/HexPath.txt
index 107d209..78630bc 100644
--- a/ConsoleApp/Output/HexPath.txt
+++ b/ConsoleApp/Output/HexPath.txt
@@ -46,32 +46,59 @@
45 0
46 0
47 0
-47 1
-47 2
-47 3
-47 4
-47 5
-47 6
-47 7
-46 7
+48 0
+49 0
+50 0
+51 0
+52 0
+53 0
+54 0
+55 0
+56 0
+57 0
+58 0
+59 0
+59 1
+59 2
+59 3
+59 4
+59 5
+59 6
+59 7
+58 7
+57 7
+56 7
+55 7
+54 7
+53 7
+52 7
+51 7
+51 7
+51 7
+51 8
+50 9
+50 10
+49 10
+48 10
+47 10
+46 9
+46 8
45 7
44 7
43 7
42 7
-42 7
-42 7
-42 8
-41 9
-41 10
-40 10
-39 10
-38 10
-37 9
-37 8
-36 7
-35 7
-34 7
-33 7
+41 7
+40 7
+39 7
+38 7
+37 7
+37 7
+37 6
+36 5
+35 5
+34 5
+33 5
+33 6
32 7
31 7
30 7
@@ -86,18 +113,18 @@
21 7
20 7
19 7
-19 7
-19 6
-18 5
-17 5
-16 5
-15 5
-15 6
+18 7
+17 7
+16 7
+15 7
14 7
-13 7
-12 7
-11 7
-10 7
+14 7
+14 6
+13 5
+12 5
+11 5
+10 5
+10 6
9 7
8 7
7 7
@@ -124,16 +151,11 @@
7 14
8 14
9 14
-9 14
-9 14
-9 15
-10 16
-10 17
-11 17
-12 17
-13 17
-14 16
-14 15
+10 14
+11 14
+12 14
+13 14
+14 14
15 14
16 14
17 14
@@ -144,27 +166,26 @@
22 14
23 14
24 14
-24 14
-24 14
-24 15
-25 16
-25 17
-26 17
-27 17
-28 17
+25 14
+26 14
+27 14
+28 14
+28 14
+28 14
+28 15
29 16
-29 16
-30 16
+29 17
30 17
31 17
32 17
33 17
-34 16
-34 15
-35 14
-36 14
-37 14
-38 14
+33 17
+34 17
+35 17
+36 17
+37 17
+38 16
+38 15
39 14
40 14
41 14
@@ -172,72 +193,113 @@
43 14
44 14
45 14
-46 14
-47 14
-47 15
-47 16
-47 17
+45 14
+45 15
+46 16
+46 17
47 18
47 19
+48 19
+49 19
+50 19
+51 18
+51 17
+52 16
+51 15
+52 14
+53 14
+54 14
+55 14
+56 14
+57 14
+58 14
+59 14
+59 15
+59 16
+59 17
+59 18
+59 19
+59 20
+59 21
+58 21
+57 21
+56 21
+55 21
+54 21
+53 21
+52 21
+51 21
+50 21
+49 21
+48 21
+47 21
+47 21
+47 20
+46 20
+45 20
+46 20
47 20
47 21
-46 21
-45 21
-44 21
-43 21
-42 21
-41 21
-40 21
-39 21
+48 22
+48 23
+48 24
+47 25
+47 26
+46 26
+45 26
+44 26
+43 26
+42 26
+41 26
+40 25
+40 24
+39 23
+39 22
38 21
37 21
36 21
35 21
-35 21
-35 20
-34 19
-33 19
-33 18
-32 17
-31 17
-30 17
-29 17
-29 18
-28 19
-28 20
-28 21
-27 21
-26 21
+34 21
+33 21
+32 21
+31 21
+30 21
+30 21
+30 22
+29 23
+28 23
+27 23
+26 23
+26 22
25 21
24 21
23 21
-23 21
-23 22
-22 23
-22 24
-21 24
-20 24
-19 24
-18 24
-17 25
-17 26
-16 26
-15 26
-14 26
-13 25
-13 24
-12 23
-12 22
+22 21
+21 21
+20 21
+19 21
+18 21
+17 21
+16 21
+15 21
+14 21
+13 21
12 21
11 21
10 21
9 21
8 21
-7 21
-6 21
-5 21
-4 21
-3 21
+8 21
+9 22
+8 23
+8 24
+7 25
+6 25
+5 25
+4 25
+4 24
+3 23
+3 22
2 21
1 21
0 21
@@ -258,20 +320,24 @@
7 28
7 27
8 26
-9 26
-10 26
-11 26
-11 27
-12 28
+8 25
+9 25
+10 25
+11 25
+12 26
+12 27
13 28
14 28
15 28
16 28
17 28
-18 28
-19 28
-20 28
-21 28
+17 28
+17 29
+18 30
+19 30
+20 30
+21 30
+21 29
22 28
23 28
24 28
@@ -283,29 +349,59 @@
30 28
31 28
32 28
-32 28
-32 29
-33 29
-34 29
-35 29
-36 29
-37 29
-38 29
+33 28
+34 28
+35 28
+36 28
+37 28
+38 28
39 28
40 28
-41 28
-42 28
-43 28
-44 28
+40 28
+40 27
+41 26
+42 26
+43 26
+44 26
+44 27
45 28
46 28
47 28
+47 28
47 29
-47 30
-47 31
-47 32
-47 33
-47 34
+48 30
+49 30
+50 30
+51 30
+51 29
+52 28
+52 27
+53 26
+54 26
+55 26
+56 26
+56 27
+57 28
+58 28
+59 28
+59 29
+59 30
+59 31
+59 32
+59 33
+59 34
+59 35
+58 35
+57 35
+56 35
+55 35
+54 35
+53 35
+52 35
+51 35
+50 35
+49 35
+48 35
47 35
46 35
45 35
@@ -317,13 +413,11 @@
39 35
38 35
37 35
-37 34
-36 33
-35 33
-34 33
-33 33
-32 33
-32 34
+36 35
+35 35
+34 35
+33 35
+32 35
31 35
30 35
29 35
@@ -345,12 +439,12 @@
13 35
12 35
12 35
-12 34
-11 33
-10 33
-9 33
-8 33
-8 34
+12 36
+11 37
+10 37
+9 37
+8 37
+8 36
7 35
6 35
5 35
@@ -383,29 +477,31 @@
15 42
16 42
17 42
-17 42
-17 42
-17 43
-18 44
-18 45
-19 45
-20 45
-21 45
-22 44
-22 43
+18 42
+19 42
+20 42
+21 42
+22 42
23 42
24 42
-25 42
-26 42
-27 42
+24 42
+24 43
+25 43
+26 43
+27 43
28 42
29 42
30 42
-31 42
-32 42
-33 42
-34 42
-35 42
+30 42
+30 42
+30 43
+31 44
+31 45
+32 45
+33 45
+34 45
+35 44
+35 43
36 42
37 42
38 42
@@ -418,3 +514,174 @@
45 42
46 42
47 42
+47 42
+47 42
+47 43
+48 44
+48 45
+49 45
+50 45
+51 45
+52 44
+52 43
+53 42
+54 42
+55 42
+56 42
+57 42
+58 42
+59 42
+59 43
+59 44
+59 45
+59 46
+59 47
+59 48
+59 49
+58 49
+57 49
+56 49
+55 49
+54 49
+53 49
+52 49
+51 49
+50 49
+49 49
+48 49
+47 49
+47 49
+47 50
+46 51
+45 51
+44 51
+43 51
+43 50
+42 49
+41 49
+40 49
+40 49
+40 50
+39 51
+39 52
+38 53
+38 54
+37 54
+36 54
+35 54
+34 54
+33 54
+32 53
+32 54
+31 55
+31 56
+30 57
+29 57
+28 57
+27 57
+26 57
+25 57
+25 56
+24 55
+24 54
+24 53
+24 52
+23 51
+23 50
+23 49
+22 49
+21 49
+20 49
+19 49
+18 49
+17 49
+16 49
+15 49
+15 49
+15 49
+15 50
+14 51
+14 52
+13 52
+12 52
+11 52
+10 51
+10 50
+9 49
+8 49
+7 49
+6 49
+5 49
+4 49
+3 49
+2 49
+1 49
+0 49
+1 50
+1 51
+2 52
+1 53
+1 54
+0 55
+0 56
+1 56
+2 56
+3 56
+4 56
+5 56
+6 56
+7 56
+8 56
+9 56
+10 56
+11 56
+12 56
+13 56
+14 56
+15 56
+16 56
+17 56
+18 56
+19 56
+20 56
+21 56
+22 56
+23 56
+24 56
+25 56
+25 56
+25 57
+26 57
+27 57
+28 57
+29 57
+30 57
+31 56
+32 56
+33 56
+34 56
+35 56
+36 56
+37 56
+38 56
+39 56
+40 56
+41 56
+42 56
+43 56
+44 56
+45 56
+46 56
+47 56
+48 56
+49 56
+50 56
+51 56
+52 56
+53 56
+54 56
+55 56
+56 56
+57 56
+58 56
+59 56
diff --git a/ConsoleApp/Output/HexTest.png b/ConsoleApp/Output/HexTest.png
index 5a8e26e..ce3122a 100644
Binary files a/ConsoleApp/Output/HexTest.png and b/ConsoleApp/Output/HexTest.png differ
diff --git a/ConsoleApp/Output/Mines.txt b/ConsoleApp/Output/Mines.txt
index 2cea69e..ac08a9a 100644
--- a/ConsoleApp/Output/Mines.txt
+++ b/ConsoleApp/Output/Mines.txt
@@ -1,23 +1,36 @@
-32 14
-20 42
-27 14
-12 14
-34 26
-9 29
-10 36
-31 20
-34 36
-15 23
-5 10
-33 22
-35 37
-16 20
-37 26
-12 11
-39 7
-29 38
-35 36
-20 21
-21 19
-35 25
-17 8
+30 50
+48 7
+16 39
+42 18
+47 13
+50 42
+52 53
+49 16
+36 14
+54 29
+6 22
+26 49
+28 20
+10 34
+27 54
+49 27
+35 8
+26 40
+38 48
+10 28
+12 8
+5 18
+42 23
+45 23
+42 29
+36 51
+37 12
+29 54
+34 51
+33 12
+45 48
+19 27
+12 49
+31 14
+33 42
+9 31
diff --git a/ConsoleApp/Output/SquareCoverage.png b/ConsoleApp/Output/SquareCoverage.png
index 4cc6159..54a5cdc 100644
Binary files a/ConsoleApp/Output/SquareCoverage.png and b/ConsoleApp/Output/SquareCoverage.png differ
diff --git a/ConsoleApp/Output/SquareCoveredCells.txt b/ConsoleApp/Output/SquareCoveredCells.txt
index 9011f5d..833d09b 100644
--- a/ConsoleApp/Output/SquareCoveredCells.txt
+++ b/ConsoleApp/Output/SquareCoveredCells.txt
@@ -18,6 +18,7 @@
0 17
0 18
0 19
+0 20
0 21
0 22
0 23
@@ -33,6 +34,7 @@
0 33
0 34
0 35
+0 36
0 37
0 38
0 39
@@ -40,6 +42,21 @@
0 41
0 42
0 43
+0 44
+0 45
+0 46
+0 47
+0 48
+0 49
+0 50
+0 51
+0 52
+0 53
+0 54
+0 55
+0 56
+0 57
+0 58
1 0
1 1
1 2
@@ -60,6 +77,7 @@
1 17
1 18
1 19
+1 20
1 21
1 22
1 23
@@ -75,6 +93,7 @@
1 33
1 34
1 35
+1 36
1 37
1 38
1 39
@@ -82,6 +101,21 @@
1 41
1 42
1 43
+1 44
+1 45
+1 46
+1 47
+1 48
+1 49
+1 50
+1 51
+1 52
+1 53
+1 54
+1 55
+1 56
+1 57
+1 58
2 0
2 1
2 2
@@ -102,6 +136,7 @@
2 17
2 18
2 19
+2 20
2 21
2 22
2 23
@@ -128,6 +163,18 @@
2 44
2 45
2 46
+2 47
+2 48
+2 49
+2 50
+2 51
+2 52
+2 53
+2 54
+2 55
+2 56
+2 57
+2 58
3 0
3 1
3 2
@@ -148,6 +195,7 @@
3 17
3 18
3 19
+3 20
3 21
3 22
3 23
@@ -174,6 +222,18 @@
3 44
3 45
3 46
+3 47
+3 48
+3 49
+3 50
+3 51
+3 52
+3 53
+3 54
+3 55
+3 56
+3 57
+3 58
4 0
4 1
4 2
@@ -185,6 +245,8 @@
4 8
4 9
4 10
+4 11
+4 12
4 13
4 14
4 15
@@ -192,10 +254,10 @@
4 17
4 18
4 19
+4 20
4 21
4 22
4 23
-4 24
4 25
4 26
4 27
@@ -218,6 +280,18 @@
4 44
4 45
4 46
+4 47
+4 48
+4 49
+4 50
+4 51
+4 52
+4 53
+4 54
+4 55
+4 56
+4 57
+4 58
5 0
5 1
5 2
@@ -229,6 +303,8 @@
5 8
5 9
5 10
+5 11
+5 12
5 13
5 14
5 15
@@ -236,10 +312,7 @@
5 17
5 18
5 19
-5 21
-5 22
-5 23
-5 24
+5 20
5 25
5 26
5 27
@@ -262,6 +335,18 @@
5 44
5 45
5 46
+5 47
+5 48
+5 49
+5 50
+5 51
+5 52
+5 53
+5 54
+5 55
+5 56
+5 57
+5 58
6 0
6 1
6 2
@@ -274,6 +359,7 @@
6 9
6 10
6 11
+6 12
6 13
6 14
6 15
@@ -285,7 +371,6 @@
6 21
6 22
6 23
-6 24
6 25
6 26
6 27
@@ -308,6 +393,18 @@
6 44
6 45
6 46
+6 47
+6 48
+6 49
+6 50
+6 51
+6 52
+6 53
+6 54
+6 55
+6 56
+6 57
+6 58
7 0
7 1
7 2
@@ -320,6 +417,7 @@
7 9
7 10
7 11
+7 12
7 13
7 14
7 15
@@ -354,6 +452,18 @@
7 44
7 45
7 46
+7 47
+7 48
+7 49
+7 50
+7 51
+7 52
+7 53
+7 54
+7 55
+7 56
+7 57
+7 58
8 0
8 1
8 2
@@ -366,6 +476,7 @@
8 9
8 10
8 11
+8 12
8 13
8 14
8 15
@@ -400,6 +511,18 @@
8 44
8 45
8 46
+8 47
+8 48
+8 49
+8 50
+8 51
+8 52
+8 53
+8 54
+8 55
+8 56
+8 57
+8 58
9 0
9 1
9 2
@@ -412,6 +535,7 @@
9 9
9 10
9 11
+9 12
9 13
9 14
9 15
@@ -446,6 +570,18 @@
9 44
9 45
9 46
+9 47
+9 48
+9 49
+9 50
+9 51
+9 52
+9 53
+9 54
+9 55
+9 56
+9 57
+9 58
10 0
10 1
10 2
@@ -458,6 +594,7 @@
10 9
10 10
10 11
+10 12
10 13
10 14
10 15
@@ -470,14 +607,11 @@
10 22
10 23
10 24
-10 25
10 26
10 27
10 28
10 29
10 30
-10 31
-10 32
10 33
10 34
10 35
@@ -492,6 +626,18 @@
10 44
10 45
10 46
+10 47
+10 48
+10 49
+10 50
+10 51
+10 52
+10 53
+10 54
+10 55
+10 56
+10 57
+10 58
11 0
11 1
11 2
@@ -502,8 +648,8 @@
11 7
11 8
11 9
-11 10
11 11
+11 12
11 13
11 14
11 15
@@ -516,14 +662,6 @@
11 22
11 23
11 24
-11 25
-11 26
-11 27
-11 28
-11 29
-11 30
-11 31
-11 32
11 33
11 34
11 35
@@ -538,6 +676,18 @@
11 44
11 45
11 46
+11 47
+11 48
+11 49
+11 50
+11 51
+11 52
+11 53
+11 54
+11 55
+11 56
+11 57
+11 58
12 0
12 1
12 2
@@ -548,8 +698,9 @@
12 7
12 8
12 9
-12 10
12 11
+12 12
+12 13
12 14
12 15
12 16
@@ -561,13 +712,6 @@
12 22
12 23
12 24
-12 25
-12 26
-12 27
-12 28
-12 29
-12 30
-12 31
12 32
12 33
12 34
@@ -583,6 +727,18 @@
12 44
12 45
12 46
+12 47
+12 48
+12 49
+12 50
+12 51
+12 52
+12 53
+12 54
+12 55
+12 56
+12 57
+12 58
13 0
13 1
13 2
@@ -595,6 +751,9 @@
13 9
13 10
13 11
+13 12
+13 13
+13 14
13 15
13 16
13 17
@@ -605,8 +764,6 @@
13 22
13 23
13 24
-13 25
-13 26
13 27
13 28
13 29
@@ -627,6 +784,18 @@
13 44
13 45
13 46
+13 47
+13 48
+13 49
+13 50
+13 51
+13 52
+13 53
+13 54
+13 55
+13 56
+13 57
+13 58
14 0
14 1
14 2
@@ -639,6 +808,9 @@
14 9
14 10
14 11
+14 12
+14 13
+14 14
14 15
14 16
14 17
@@ -649,7 +821,6 @@
14 22
14 23
14 24
-14 25
14 26
14 27
14 28
@@ -671,6 +842,18 @@
14 44
14 45
14 46
+14 47
+14 48
+14 49
+14 50
+14 51
+14 52
+14 53
+14 54
+14 55
+14 56
+14 57
+14 58
15 0
15 1
15 2
@@ -683,6 +866,9 @@
15 9
15 10
15 11
+15 12
+15 13
+15 14
15 15
15 16
15 17
@@ -693,7 +879,6 @@
15 22
15 23
15 24
-15 25
15 26
15 27
15 28
@@ -715,6 +900,18 @@
15 44
15 45
15 46
+15 47
+15 48
+15 49
+15 50
+15 51
+15 52
+15 53
+15 54
+15 55
+15 56
+15 57
+15 58
16 0
16 1
16 2
@@ -726,15 +923,20 @@
16 8
16 9
16 10
+16 11
+16 12
+16 13
+16 14
+16 15
16 16
16 17
16 18
16 19
16 20
+16 21
16 22
16 23
16 24
-16 25
16 26
16 27
16 28
@@ -756,6 +958,18 @@
16 44
16 45
16 46
+16 47
+16 48
+16 49
+16 50
+16 51
+16 52
+16 53
+16 54
+16 55
+16 56
+16 57
+16 58
17 0
17 1
17 2
@@ -767,11 +981,20 @@
17 8
17 9
17 10
+17 11
+17 12
+17 13
+17 14
+17 15
+17 16
+17 17
+17 18
+17 19
+17 20
17 21
17 22
17 23
17 24
-17 25
17 26
17 27
17 28
@@ -793,6 +1016,18 @@
17 44
17 45
17 46
+17 47
+17 48
+17 49
+17 50
+17 51
+17 52
+17 53
+17 54
+17 55
+17 56
+17 57
+17 58
18 0
18 1
18 2
@@ -805,11 +1040,19 @@
18 9
18 10
18 11
+18 12
+18 13
+18 14
+18 15
+18 16
+18 17
+18 18
+18 19
+18 20
18 21
18 22
18 23
18 24
-18 25
18 26
18 27
18 28
@@ -831,6 +1074,18 @@
18 44
18 45
18 46
+18 47
+18 48
+18 49
+18 50
+18 51
+18 52
+18 53
+18 54
+18 55
+18 56
+18 57
+18 58
19 0
19 1
19 2
@@ -843,12 +1098,19 @@
19 9
19 10
19 11
+19 12
+19 13
+19 14
+19 15
+19 16
+19 17
+19 18
+19 19
+19 20
19 21
19 22
19 23
19 24
-19 25
-19 26
19 27
19 28
19 29
@@ -869,6 +1131,18 @@
19 44
19 45
19 46
+19 47
+19 48
+19 49
+19 50
+19 51
+19 52
+19 53
+19 54
+19 55
+19 56
+19 57
+19 58
20 0
20 1
20 2
@@ -881,11 +1155,19 @@
20 9
20 10
20 11
+20 12
+20 13
+20 14
+20 15
+20 16
+20 17
+20 18
+20 19
+20 20
20 21
20 22
20 23
20 24
-20 25
20 26
20 27
20 28
@@ -903,6 +1185,22 @@
20 40
20 41
20 42
+20 43
+20 44
+20 45
+20 46
+20 47
+20 48
+20 49
+20 50
+20 51
+20 52
+20 53
+20 54
+20 55
+20 56
+20 57
+20 58
21 0
21 1
21 2
@@ -915,6 +1213,13 @@
21 9
21 10
21 11
+21 12
+21 13
+21 14
+21 15
+21 16
+21 17
+21 18
21 19
21 20
21 21
@@ -939,6 +1244,22 @@
21 40
21 41
21 42
+21 43
+21 44
+21 45
+21 46
+21 47
+21 48
+21 49
+21 50
+21 51
+21 52
+21 53
+21 54
+21 55
+21 56
+21 57
+21 58
22 0
22 1
22 2
@@ -951,6 +1272,9 @@
22 9
22 10
22 11
+22 12
+22 13
+22 14
22 15
22 16
22 17
@@ -981,6 +1305,20 @@
22 42
22 43
22 44
+22 45
+22 46
+22 47
+22 48
+22 49
+22 50
+22 51
+22 52
+22 53
+22 54
+22 55
+22 56
+22 57
+22 58
23 0
23 1
23 2
@@ -993,6 +1331,8 @@
23 9
23 10
23 11
+23 12
+23 13
23 14
23 15
23 16
@@ -1025,6 +1365,19 @@
23 43
23 44
23 45
+23 46
+23 47
+23 48
+23 49
+23 50
+23 51
+23 52
+23 53
+23 54
+23 55
+23 56
+23 57
+23 58
24 0
24 1
24 2
@@ -1037,6 +1390,8 @@
24 9
24 10
24 11
+24 12
+24 13
24 14
24 15
24 16
@@ -1069,10 +1424,24 @@
24 43
24 44
24 45
+24 46
+24 47
+24 48
+24 49
+24 50
+24 51
+24 52
+24 53
+24 54
+24 55
+24 56
+24 57
+24 58
25 0
25 1
25 2
25 3
+25 4
25 5
25 6
25 7
@@ -1080,6 +1449,8 @@
25 9
25 10
25 11
+25 12
+25 13
25 14
25 15
25 16
@@ -1112,10 +1483,24 @@
25 43
25 44
25 45
+25 46
+25 47
+25 48
+25 49
+25 50
+25 51
+25 52
+25 53
+25 54
+25 55
+25 56
+25 57
+25 58
26 0
26 1
26 2
26 3
+26 4
26 5
26 6
26 7
@@ -1123,6 +1508,8 @@
26 9
26 10
26 11
+26 12
+26 13
26 14
26 15
26 16
@@ -1148,17 +1535,30 @@
26 36
26 37
26 38
-26 39
26 40
26 41
26 42
26 43
26 44
26 45
+26 46
+26 47
+26 48
+26 49
+26 50
+26 51
+26 52
+26 53
+26 54
+26 55
+26 56
+26 57
+26 58
27 0
27 1
27 2
27 3
+27 4
27 5
27 6
27 7
@@ -1166,6 +1566,8 @@
27 9
27 10
27 11
+27 12
+27 13
27 14
27 15
27 16
@@ -1188,19 +1590,32 @@
27 33
27 34
27 35
+27 36
27 37
27 38
-27 39
27 40
27 41
27 42
27 43
27 44
27 45
+27 46
+27 47
+27 48
+27 49
+27 51
+27 52
+27 53
+27 54
+27 55
+27 56
+27 57
+27 58
28 0
28 1
28 2
28 3
+28 4
28 5
28 6
28 7
@@ -1208,6 +1623,9 @@
28 9
28 10
28 11
+28 12
+28 13
+28 14
28 15
28 16
28 17
@@ -1229,18 +1647,29 @@
28 33
28 34
28 35
+28 36
+28 37
28 38
-28 39
28 40
28 41
28 42
28 43
28 44
28 45
+28 46
+28 47
+28 48
+28 49
+28 54
+28 55
+28 56
+28 57
+28 58
29 0
29 1
29 2
29 3
+29 4
29 5
29 6
29 7
@@ -1248,6 +1677,9 @@
29 9
29 10
29 11
+29 12
+29 13
+29 14
29 15
29 16
29 17
@@ -1269,18 +1701,29 @@
29 33
29 34
29 35
+29 36
+29 37
29 38
-29 39
29 40
29 41
29 42
29 43
29 44
29 45
+29 46
+29 47
+29 48
+29 49
+29 54
+29 55
+29 56
+29 57
+29 58
30 0
30 1
30 2
30 3
+30 4
30 5
30 6
30 7
@@ -1288,6 +1731,9 @@
30 9
30 10
30 11
+30 12
+30 13
+30 14
30 15
30 16
30 17
@@ -1309,26 +1755,40 @@
30 33
30 34
30 35
+30 36
30 37
30 38
-30 39
30 40
30 41
30 42
30 43
30 44
30 45
+30 46
+30 47
+30 48
+30 49
+30 50
+30 54
+30 55
+30 56
+30 57
+30 58
31 0
31 1
31 2
31 3
+31 4
31 5
31 6
31 7
31 8
31 9
31 10
-31 11
+31 12
+31 13
+31 14
+31 15
31 16
31 17
31 18
@@ -1349,28 +1809,44 @@
31 33
31 34
31 35
+31 36
31 37
31 38
-31 39
31 40
31 41
31 42
31 43
31 44
31 45
+31 46
+31 47
+31 48
+31 49
+31 50
+31 53
+31 54
+31 55
+31 56
+31 57
+31 58
32 0
32 1
32 2
32 3
+32 4
32 5
32 6
32 7
32 8
32 9
32 10
-32 11
-32 12
-32 13
+32 14
+32 15
+32 16
+32 17
+32 18
+32 19
+32 20
32 21
32 22
32 23
@@ -1386,28 +1862,39 @@
32 33
32 34
32 35
+32 36
32 37
32 38
-32 39
32 40
32 41
32 42
32 43
32 44
32 45
+32 46
+32 47
+32 48
+32 49
+32 50
+32 51
+32 52
+32 53
+32 54
+32 55
+32 56
+32 57
+32 58
33 0
33 1
33 2
33 3
+33 4
33 5
33 6
33 7
33 8
33 9
33 10
-33 11
-33 12
-33 13
33 14
33 15
33 16
@@ -1415,6 +1902,7 @@
33 18
33 19
33 20
+33 21
33 22
33 23
33 24
@@ -1429,28 +1917,37 @@
33 33
33 34
33 35
+33 36
33 37
33 38
-33 39
-33 40
33 41
33 42
33 43
33 44
33 45
+33 46
+33 47
+33 48
+33 49
+33 50
+33 51
+33 52
+33 53
+33 54
+33 55
+33 56
+33 57
+33 58
34 0
34 1
34 2
34 3
+34 4
34 5
34 6
34 7
34 8
34 9
-34 10
-34 11
-34 12
-34 13
34 14
34 15
34 16
@@ -1462,6 +1959,7 @@
34 22
34 23
34 24
+34 25
34 26
34 27
34 28
@@ -1472,28 +1970,35 @@
34 33
34 34
34 35
+34 36
34 37
34 38
-34 39
-34 40
-34 41
-34 42
34 43
34 44
34 45
+34 46
+34 47
+34 48
+34 49
+34 50
+34 51
+34 52
+34 53
+34 54
+34 55
+34 56
+34 57
+34 58
35 0
35 1
35 2
35 3
+35 4
35 5
35 6
35 7
35 8
35 9
-35 10
-35 11
-35 12
-35 13
35 14
35 15
35 16
@@ -1516,27 +2021,36 @@
35 33
35 34
35 35
+35 36
35 37
35 38
-35 39
-35 40
-35 41
-35 42
35 43
35 44
+35 45
+35 46
+35 47
+35 48
+35 49
+35 50
+35 51
+35 52
+35 53
+35 54
+35 55
+35 56
+35 57
+35 58
36 0
36 1
36 2
36 3
+36 4
36 5
36 6
36 7
36 8
36 9
36 10
-36 11
-36 12
-36 13
36 14
36 15
36 16
@@ -1559,28 +2073,36 @@
36 33
36 34
36 35
+36 36
36 37
36 38
-36 39
-36 40
-36 41
-36 42
36 43
36 44
+36 45
+36 46
+36 47
+36 48
+36 49
+36 50
+36 51
+36 52
+36 53
+36 54
+36 55
+36 56
+36 57
+36 58
37 0
37 1
37 2
37 3
+37 4
37 5
37 6
37 7
37 8
37 9
37 10
-37 11
-37 12
-37 13
-37 14
37 15
37 16
37 17
@@ -1602,27 +2124,36 @@
37 33
37 34
37 35
+37 36
37 37
37 38
-37 39
-37 40
-37 41
-37 42
37 43
37 44
+37 45
+37 46
+37 47
+37 48
+37 49
+37 50
+37 51
+37 52
+37 53
+37 54
+37 55
+37 56
+37 57
+37 58
38 0
38 1
38 2
38 3
+38 4
+38 5
38 6
38 7
38 8
38 9
38 10
-38 11
-38 12
-38 13
-38 14
38 15
38 16
38 17
@@ -1644,27 +2175,35 @@
38 33
38 34
38 35
+38 36
38 37
38 38
-38 39
-38 40
-38 41
-38 42
-38 43
38 44
+38 45
+38 46
+38 47
+38 48
+38 49
+38 50
+38 51
+38 52
+38 53
+38 54
+38 55
+38 56
+38 57
+38 58
39 0
39 1
39 2
39 3
+39 4
+39 5
39 6
39 7
39 8
39 9
39 10
-39 11
-39 12
-39 13
-39 14
39 15
39 16
39 17
@@ -1686,28 +2225,31 @@
39 33
39 34
39 35
+39 36
39 37
39 38
-39 39
-39 40
-39 41
-39 42
-39 43
-39 44
+39 48
+39 49
+39 50
+39 51
+39 52
+39 53
+39 54
+39 55
+39 56
+39 57
+39 58
40 0
40 1
40 2
40 3
+40 4
40 5
40 6
40 7
40 8
40 9
40 10
-40 11
-40 12
-40 13
-40 14
40 15
40 16
40 17
@@ -1729,27 +2271,32 @@
40 33
40 34
40 35
+40 36
40 37
40 38
-40 39
-40 40
-40 41
-40 42
-40 43
+40 47
+40 48
+40 49
+40 50
+40 51
+40 52
+40 53
+40 54
+40 55
+40 56
+40 57
+40 58
41 0
41 1
41 2
41 3
+41 4
41 5
41 6
41 7
41 8
41 9
41 10
-41 11
-41 12
-41 13
-41 14
41 15
41 16
41 17
@@ -1771,28 +2318,32 @@
41 33
41 34
41 35
+41 36
41 37
41 38
-41 39
-41 40
-41 41
-41 42
-41 43
+41 47
+41 48
+41 49
+41 50
+41 51
+41 52
+41 53
+41 54
+41 55
+41 56
+41 57
+41 58
42 0
42 1
42 2
42 3
+42 4
42 5
42 6
42 7
42 8
42 9
42 10
-42 11
-42 12
-42 13
-42 14
-42 15
42 16
42 17
42 18
@@ -1813,13 +2364,21 @@
42 33
42 34
42 35
+42 36
42 37
42 38
-42 39
-42 40
-42 41
-42 42
-42 43
+42 47
+42 48
+42 49
+42 50
+42 51
+42 52
+42 53
+42 54
+42 55
+42 56
+42 57
+42 58
43 0
43 1
43 2
@@ -1831,22 +2390,6 @@
43 8
43 9
43 10
-43 11
-43 12
-43 13
-43 14
-43 15
-43 16
-43 17
-43 18
-43 19
-43 20
-43 21
-43 22
-43 23
-43 24
-43 25
-43 26
43 27
43 28
43 29
@@ -1864,6 +2407,19 @@
43 41
43 42
43 43
+43 44
+43 47
+43 48
+43 49
+43 50
+43 51
+43 52
+43 53
+43 54
+43 55
+43 56
+43 57
+43 58
44 0
44 1
44 2
@@ -1875,21 +2431,6 @@
44 8
44 9
44 10
-44 11
-44 12
-44 13
-44 14
-44 15
-44 16
-44 17
-44 18
-44 19
-44 20
-44 21
-44 22
-44 23
-44 24
-44 25
44 26
44 27
44 28
@@ -1908,6 +2449,20 @@
44 41
44 42
44 43
+44 44
+44 45
+44 47
+44 48
+44 49
+44 50
+44 51
+44 52
+44 53
+44 54
+44 55
+44 56
+44 57
+44 58
45 0
45 1
45 2
@@ -1918,24 +2473,14 @@
45 7
45 8
45 9
-45 10
-45 11
-45 12
-45 13
-45 14
-45 15
-45 16
-45 17
-45 18
45 19
45 20
45 21
45 22
45 23
-45 24
-45 25
45 26
45 27
+45 28
45 29
45 30
45 31
@@ -1951,6 +2496,19 @@
45 41
45 42
45 43
+45 44
+45 45
+45 48
+45 49
+45 50
+45 51
+45 52
+45 53
+45 54
+45 55
+45 56
+45 57
+45 58
46 0
46 1
46 2
@@ -1959,16 +2517,6 @@
46 5
46 6
46 7
-46 8
-46 9
-46 10
-46 11
-46 12
-46 13
-46 14
-46 15
-46 16
-46 17
46 18
46 19
46 20
@@ -1976,9 +2524,9 @@
46 22
46 23
46 24
-46 25
46 26
46 27
+46 28
46 29
46 30
46 31
@@ -1994,3 +2542,710 @@
46 41
46 42
46 43
+46 44
+46 45
+46 46
+46 47
+46 48
+46 49
+46 50
+46 51
+46 52
+46 53
+46 54
+46 55
+46 56
+46 57
+46 58
+47 0
+47 1
+47 2
+47 3
+47 4
+47 5
+47 6
+47 7
+47 9
+47 10
+47 11
+47 12
+47 13
+47 18
+47 19
+47 20
+47 21
+47 22
+47 23
+47 24
+47 26
+47 27
+47 28
+47 29
+47 30
+47 31
+47 32
+47 33
+47 34
+47 35
+47 36
+47 37
+47 38
+47 39
+47 40
+47 41
+47 42
+47 43
+47 44
+47 45
+47 46
+47 47
+47 48
+47 49
+47 50
+47 51
+47 52
+47 53
+47 54
+47 55
+47 56
+47 57
+47 58
+48 0
+48 1
+48 2
+48 3
+48 4
+48 5
+48 6
+48 7
+48 8
+48 9
+48 10
+48 11
+48 12
+48 13
+48 14
+48 15
+48 18
+48 19
+48 20
+48 21
+48 22
+48 23
+48 24
+48 26
+48 27
+48 28
+48 29
+48 30
+48 31
+48 32
+48 33
+48 34
+48 35
+48 36
+48 37
+48 38
+48 39
+48 40
+48 41
+48 42
+48 43
+48 44
+48 45
+48 46
+48 47
+48 48
+48 49
+48 50
+48 51
+48 52
+48 53
+48 54
+48 55
+48 56
+48 57
+48 58
+49 0
+49 1
+49 2
+49 3
+49 4
+49 5
+49 6
+49 7
+49 8
+49 9
+49 10
+49 11
+49 12
+49 13
+49 14
+49 15
+49 16
+49 18
+49 19
+49 20
+49 21
+49 22
+49 23
+49 24
+49 27
+49 28
+49 29
+49 30
+49 31
+49 32
+49 33
+49 34
+49 35
+49 36
+49 37
+49 38
+49 39
+49 40
+49 41
+49 42
+49 43
+49 44
+49 45
+49 46
+49 47
+49 48
+49 49
+49 50
+49 51
+49 52
+49 53
+49 54
+49 55
+49 56
+49 57
+49 58
+50 0
+50 1
+50 2
+50 3
+50 4
+50 5
+50 6
+50 7
+50 8
+50 9
+50 10
+50 11
+50 12
+50 13
+50 14
+50 15
+50 16
+50 18
+50 19
+50 20
+50 21
+50 22
+50 23
+50 24
+50 28
+50 29
+50 30
+50 31
+50 32
+50 33
+50 34
+50 35
+50 36
+50 37
+50 38
+50 39
+50 40
+50 41
+50 42
+50 43
+50 44
+50 45
+50 46
+50 47
+50 48
+50 49
+50 50
+50 51
+50 52
+50 53
+50 54
+50 55
+50 56
+50 57
+50 58
+51 0
+51 1
+51 2
+51 3
+51 4
+51 5
+51 6
+51 7
+51 8
+51 9
+51 10
+51 11
+51 12
+51 13
+51 14
+51 15
+51 16
+51 17
+51 18
+51 19
+51 20
+51 21
+51 22
+51 23
+51 24
+51 25
+51 26
+51 27
+51 28
+51 29
+51 30
+51 31
+51 32
+51 33
+51 34
+51 35
+51 36
+51 37
+51 38
+51 39
+51 40
+51 41
+51 42
+51 43
+51 44
+51 45
+51 46
+51 47
+51 48
+51 49
+51 50
+51 51
+51 52
+51 53
+51 54
+51 55
+51 56
+51 57
+51 58
+52 0
+52 1
+52 2
+52 3
+52 4
+52 5
+52 6
+52 7
+52 8
+52 9
+52 10
+52 11
+52 12
+52 13
+52 14
+52 15
+52 16
+52 17
+52 18
+52 19
+52 20
+52 21
+52 22
+52 23
+52 24
+52 25
+52 26
+52 27
+52 28
+52 29
+52 30
+52 31
+52 32
+52 33
+52 34
+52 35
+52 36
+52 37
+52 38
+52 39
+52 40
+52 41
+52 42
+52 43
+52 44
+52 45
+52 46
+52 47
+52 48
+52 49
+52 50
+52 51
+52 52
+52 53
+52 54
+52 55
+52 56
+52 57
+52 58
+53 0
+53 1
+53 2
+53 3
+53 4
+53 5
+53 6
+53 7
+53 8
+53 9
+53 10
+53 11
+53 12
+53 13
+53 14
+53 15
+53 16
+53 17
+53 18
+53 19
+53 20
+53 21
+53 22
+53 23
+53 24
+53 25
+53 26
+53 27
+53 28
+53 29
+53 30
+53 31
+53 32
+53 33
+53 34
+53 35
+53 36
+53 37
+53 38
+53 39
+53 40
+53 41
+53 42
+53 43
+53 44
+53 45
+53 46
+53 47
+53 48
+53 49
+53 50
+53 51
+53 52
+53 53
+53 54
+53 55
+53 56
+53 57
+53 58
+54 0
+54 1
+54 2
+54 3
+54 4
+54 5
+54 6
+54 7
+54 8
+54 9
+54 10
+54 11
+54 12
+54 13
+54 14
+54 15
+54 16
+54 17
+54 18
+54 19
+54 20
+54 21
+54 22
+54 23
+54 24
+54 25
+54 26
+54 27
+54 28
+54 29
+54 30
+54 31
+54 32
+54 33
+54 34
+54 35
+54 36
+54 37
+54 38
+54 39
+54 40
+54 41
+54 42
+54 43
+54 44
+54 45
+54 46
+54 47
+54 48
+54 49
+54 50
+54 51
+54 52
+54 53
+54 54
+54 55
+54 56
+54 57
+54 58
+55 0
+55 1
+55 2
+55 3
+55 4
+55 5
+55 6
+55 7
+55 8
+55 9
+55 10
+55 11
+55 12
+55 13
+55 14
+55 15
+55 16
+55 17
+55 18
+55 19
+55 20
+55 21
+55 22
+55 23
+55 24
+55 25
+55 26
+55 27
+55 28
+55 29
+55 30
+55 31
+55 32
+55 33
+55 34
+55 35
+55 36
+55 37
+55 38
+55 39
+55 40
+55 41
+55 42
+55 43
+55 44
+55 45
+55 46
+55 47
+55 48
+55 49
+55 50
+55 51
+55 52
+55 53
+55 54
+55 55
+55 56
+55 57
+55 58
+56 0
+56 1
+56 2
+56 3
+56 4
+56 5
+56 6
+56 7
+56 8
+56 9
+56 10
+56 11
+56 12
+56 13
+56 14
+56 15
+56 16
+56 17
+56 18
+56 19
+56 20
+56 21
+56 22
+56 23
+56 24
+56 25
+56 26
+56 27
+56 28
+56 29
+56 30
+56 31
+56 32
+56 33
+56 34
+56 35
+56 36
+56 37
+56 38
+56 39
+56 40
+56 41
+56 42
+56 43
+56 44
+56 45
+56 46
+56 47
+56 48
+56 49
+56 50
+56 51
+56 52
+56 53
+56 54
+56 55
+56 56
+56 57
+56 58
+57 0
+57 1
+57 2
+57 3
+57 4
+57 5
+57 6
+57 7
+57 8
+57 9
+57 10
+57 11
+57 12
+57 13
+57 14
+57 15
+57 16
+57 17
+57 18
+57 19
+57 20
+57 21
+57 22
+57 23
+57 24
+57 25
+57 26
+57 27
+57 28
+57 29
+57 30
+57 31
+57 32
+57 33
+57 34
+57 35
+57 36
+57 37
+57 38
+57 39
+57 40
+57 41
+57 42
+57 43
+57 44
+57 45
+57 46
+57 47
+57 48
+57 49
+57 50
+57 51
+57 52
+57 53
+57 54
+57 55
+57 56
+57 57
+57 58
+58 0
+58 1
+58 2
+58 3
+58 4
+58 5
+58 6
+58 7
+58 8
+58 9
+58 10
+58 11
+58 12
+58 13
+58 14
+58 15
+58 16
+58 17
+58 18
+58 19
+58 20
+58 21
+58 22
+58 23
+58 24
+58 25
+58 26
+58 27
+58 28
+58 29
+58 30
+58 31
+58 32
+58 33
+58 34
+58 35
+58 36
+58 37
+58 38
+58 39
+58 40
+58 41
+58 42
+58 43
+58 44
+58 45
+58 46
+58 47
+58 48
+58 49
+58 50
+58 51
+58 52
+58 53
+58 54
+58 55
+58 56
+58 57
+58 58
diff --git a/ConsoleApp/Output/SquareDetectedMines.txt b/ConsoleApp/Output/SquareDetectedMines.txt
index 07b7790..9dbce08 100644
--- a/ConsoleApp/Output/SquareDetectedMines.txt
+++ b/ConsoleApp/Output/SquareDetectedMines.txt
@@ -1,20 +1,34 @@
-39 7
-17 8
-12 11
-5 10
-12 14
-16 20
-15 23
-9 29
-10 36
-20 21
-21 19
-27 14
-31 20
-33 22
-34 26
-37 26
-35 25
-20 42
-35 37
-29 38
+48 7
+47 13
+49 16
+35 8
+12 8
+31 14
+28 20
+36 14
+42 18
+42 23
+42 29
+49 27
+54 29
+45 23
+6 22
+5 18
+9 31
+10 28
+10 34
+16 39
+19 27
+26 40
+33 42
+38 48
+34 51
+36 51
+30 50
+26 49
+27 54
+29 54
+45 48
+52 53
+50 42
+12 49
diff --git a/ConsoleApp/Output/SquarePath.txt b/ConsoleApp/Output/SquarePath.txt
index 931f5aa..8d00889 100644
--- a/ConsoleApp/Output/SquarePath.txt
+++ b/ConsoleApp/Output/SquarePath.txt
@@ -45,83 +45,125 @@
44 0
45 0
46 0
-46 1
-46 2
+47 0
+48 0
+49 0
+50 0
+51 0
+52 0
+53 0
+54 0
+55 0
+56 0
+57 0
+58 0
+58 1
+58 2
+58 3
+58 4
+58 5
+58 6
+58 7
+57 7
+56 7
+55 7
+54 7
+53 7
+52 7
+51 7
+52 7
+52 8
+52 9
+52 10
+52 11
+51 11
+50 11
+51 11
+51 12
+51 13
+51 12
+51 11
+51 10
+52 10
+52 9
+52 8
+52 7
+52 6
+52 5
+52 4
+51 4
+51 3
+50 3
+49 3
+48 3
+47 3
46 3
-46 4
-46 5
-46 6
-46 7
-46 8
-45 8
-44 8
-43 8
-42 8
-43 8
-43 9
-43 10
-42 10
-42 11
-41 11
-40 11
-39 11
-38 11
-37 11
-36 11
-35 11
-35 10
-35 9
-35 8
-34 8
-33 8
-32 8
-31 8
-30 8
-29 8
-28 8
-27 8
-26 8
-25 8
-24 8
-23 8
-22 8
-21 8
-20 8
-21 8
+45 3
+45 4
+44 4
+43 4
+42 4
+42 5
+42 6
+42 7
+41 7
+40 7
+39 7
+38 7
+39 7
+39 6
+39 5
+38 5
+38 4
+37 4
+36 4
+35 4
+34 4
+33 4
+32 4
+31 4
+31 5
+31 6
+31 7
+30 7
+29 7
+28 7
+27 7
+26 7
+25 7
+24 7
+23 7
+22 7
21 7
-21 6
-21 5
-21 4
-20 4
-19 4
-18 4
-17 4
-16 4
+20 7
+19 7
+18 7
+17 7
+16 7
+15 7
+16 7
+16 6
+16 5
+15 5
15 4
14 4
13 4
-13 5
-13 6
-13 7
-13 8
-13 7
-12 7
-11 7
-10 7
-9 7
-9 8
-8 8
-8 7
+12 4
+11 4
+10 4
+9 4
+8 4
+8 5
8 6
-7 6
-6 6
-5 6
-4 6
-3 6
-2 6
-1 6
+8 7
+7 7
+6 7
+5 7
+4 7
+3 7
+2 7
1 7
-1 8
+0 7
0 8
0 9
0 10
@@ -129,425 +171,875 @@
0 12
0 13
0 14
-0 15
-0 16
-1 16
-2 16
-3 16
-4 16
-5 16
-6 16
-7 16
-8 16
-9 16
-9 17
-9 18
-10 18
-11 18
-12 18
-13 18
-12 18
-12 19
-12 20
-12 21
-11 21
-11 22
-11 23
-11 24
-11 25
-11 26
-11 25
-10 25
-9 25
-8 25
-7 25
-6 25
-5 25
-5 26
-5 27
-5 28
-5 29
-5 30
-5 31
-5 32
-6 32
-6 33
-7 33
-8 33
-7 33
-6 33
-6 34
-6 35
-6 36
-6 37
-6 38
-6 39
-7 39
-7 40
-8 40
-9 40
-10 40
-11 40
-12 40
-13 40
-13 39
-14 39
-14 38
-14 37
-14 36
-14 35
-14 34
-14 33
-14 32
-14 31
-14 30
-14 29
-15 29
-15 28
-15 27
-16 27
-17 27
-18 27
-18 26
-19 26
-19 25
-19 24
-19 25
-20 25
-21 25
-22 25
-23 25
-23 24
-24 24
-24 23
-24 22
+1 14
+2 14
+3 14
+4 14
+5 14
+6 14
+7 14
+8 14
+9 14
+10 14
+11 14
+12 14
+13 14
+14 14
+15 14
+16 14
+17 14
+18 14
+19 14
+20 14
+21 14
+22 14
+23 14
+24 14
+25 14
+26 14
+27 14
+28 14
+27 14
+27 15
+27 16
+27 17
+27 16
+26 16
+25 16
+24 16
+23 16
+23 17
+23 18
+23 19
+23 20
+24 20
24 21
-25 21
-25 20
-25 19
-25 18
-25 17
-25 18
-26 18
-27 18
-28 18
-27 18
-27 19
-27 20
-27 21
-27 22
-27 23
-28 23
+24 22
+24 23
+25 23
+25 24
+26 24
+27 24
28 24
29 24
30 24
-30 25
-30 26
-30 27
-30 28
-31 28
-31 29
-31 30
-31 31
-31 32
-32 32
-33 32
-34 32
-34 31
-35 31
-35 30
-36 30
-37 30
-37 29
-37 30
-38 30
-39 30
-40 30
-41 30
-41 29
-41 28
-41 27
-41 26
-41 25
-41 24
-41 23
-40 23
-40 22
+31 24
+31 23
+32 23
+32 22
+32 21
+32 20
+32 19
+32 18
+33 18
+34 18
+34 17
+34 18
+35 18
+36 18
+37 18
+38 18
+39 18
+38 18
+38 19
+38 20
+38 21
+38 22
39 22
38 22
-37 22
-37 21
-37 20
-37 19
-37 18
-36 18
-36 17
-36 16
-37 16
-38 16
-39 16
-40 16
-41 16
-42 16
-43 16
-44 16
-45 16
-46 16
-46 17
-46 18
-46 19
-46 20
-46 21
-46 22
-46 23
-46 24
-45 24
-44 24
-43 24
-42 24
-41 24
-41 24
-41 24
-41 25
-41 26
-41 27
-41 28
-41 29
-40 29
-40 30
-39 30
+38 23
+38 24
+38 25
+38 26
+39 26
+39 27
+38 27
+38 28
+38 29
38 30
-37 30
-36 30
-35 30
-34 30
-33 30
-32 30
-31 30
-30 30
-29 30
-29 29
-29 28
-29 27
-29 26
-29 25
+38 31
+38 32
+39 32
+39 33
+40 33
+41 33
+42 33
+43 33
+44 33
+45 33
+45 32
+46 32
+46 31
+46 30
+46 29
+46 30
+46 31
+47 31
+48 31
+49 31
+50 31
+51 31
+51 32
+51 33
+51 34
+51 35
+52 35
+53 35
+54 35
+54 34
+55 34
+55 33
+56 33
+57 33
+57 32
+58 32
+58 31
+58 30
+58 29
+58 28
+58 27
+58 26
+57 26
+57 25
+56 25
+55 25
+54 25
+54 24
+54 23
+54 22
+54 21
+54 20
+54 19
+54 18
+54 17
+54 16
+54 15
+54 14
+55 14
+56 14
+57 14
+58 14
+58 15
+58 16
+58 17
+58 18
+58 19
+58 20
+58 21
+57 21
+56 21
+55 21
+54 21
+53 21
+52 21
+51 21
+50 21
+49 21
+48 21
+49 21
+50 21
+51 21
+52 21
+53 21
+54 21
+55 21
+56 21
+57 21
+58 21
+59 21
+59 22
+59 23
+59 24
+59 25
+59 26
+59 27
+59 28
+59 29
+59 30
+59 31
+59 32
+59 33
+58 33
+57 33
+56 33
+55 33
+54 33
+53 33
+52 33
+51 33
+50 33
+49 33
+48 33
+47 33
+46 33
+45 33
+44 33
+43 33
+42 33
+41 33
+40 33
+39 33
+38 33
+38 32
+38 31
+38 30
+38 29
+38 28
+38 27
+38 26
+38 25
+38 24
+38 23
+38 22
+38 21
+37 21
+36 21
+35 21
+34 21
+33 21
+32 21
+32 21
+32 21
+32 22
+32 23
+31 23
+31 24
+30 24
29 24
28 24
27 24
26 24
25 24
24 24
-23 24
-23 24
-22 25
-22 26
-22 27
-22 28
-22 29
-22 30
-21 30
-21 31
-20 31
-19 31
-19 32
-18 32
-18 33
-18 34
-18 35
-18 36
-18 37
-18 38
-18 39
-17 39
-16 39
-16 40
-16 41
-16 42
-16 43
-16 44
-15 44
-14 44
-13 44
-12 44
-11 44
-10 44
-9 44
-8 44
-7 44
-6 44
-5 44
-5 43
-5 42
-5 41
-5 40
-5 39
-5 38
-5 37
-5 36
-5 35
-5 34
-5 33
-5 32
-5 31
-5 30
-5 29
-5 28
-5 27
-5 26
-5 25
-5 24
-6 24
-7 24
-8 24
-9 24
-10 24
-9 24
-8 24
-7 24
-6 24
-5 24
-4 24
-3 24
-2 24
-1 24
+24 23
+24 22
+24 21
+23 21
+22 21
+21 21
+20 21
+19 21
+18 21
+17 21
+16 21
+15 21
+14 21
+13 21
+12 21
+11 21
+10 21
+9 21
+10 21
+10 20
+10 19
+9 19
+9 18
+8 18
+9 18
+9 17
+9 16
+9 15
+8 15
+8 14
+7 14
+6 14
+5 14
+4 14
+3 14
+2 14
+1 14
+1 15
+1 16
+1 17
+1 18
+1 19
+1 20
+1 21
+0 21
+0 22
+0 23
0 24
0 25
0 26
0 27
0 28
-0 29
-0 30
-0 31
-0 32
-1 32
-2 32
-3 32
-4 32
+1 28
+2 28
+3 28
+4 28
+5 28
+6 28
+7 28
+6 28
+5 28
+5 29
+5 30
+5 31
5 32
-6 32
-6 32
-6 32
-6 33
+5 33
+5 34
6 34
6 35
+7 35
+6 35
6 36
6 37
-6 38
-6 39
-7 39
-7 40
-8 40
-9 40
-10 40
-11 40
+7 37
+7 38
+8 38
+9 38
+10 38
+11 38
+12 38
+13 38
+12 38
+12 39
12 40
-13 40
-13 39
-14 39
-14 38
-14 37
-14 36
-14 35
-14 34
-14 33
-13 33
-13 32
-12 32
-13 32
-14 32
-15 32
+12 41
+12 42
+13 42
+13 43
+14 43
+15 43
+16 43
+17 43
+18 43
+19 43
+19 42
+20 42
+20 41
+20 40
+20 39
+20 38
+20 37
+20 36
+19 36
+19 35
+18 35
+17 35
+16 35
+16 34
+16 33
16 32
-17 32
-18 32
-19 32
-20 32
-21 32
-22 32
-23 32
-24 32
-25 32
-26 32
-27 32
-28 32
-29 32
-30 32
-31 32
-32 32
-33 32
-34 32
-35 32
-36 32
-37 32
+16 31
+16 30
+16 29
+16 30
+16 31
+17 31
+18 31
+19 31
+20 31
+21 31
+22 31
+22 30
+23 30
+23 29
+23 28
+24 28
+25 28
+26 28
+27 28
+28 28
+29 28
+30 28
+31 28
+32 28
+33 28
+34 28
+35 28
+36 28
+37 28
+38 28
+38 28
+38 28
+38 29
+38 30
+38 31
38 32
39 32
-40 32
-41 32
-42 32
-43 32
-44 32
-45 32
-46 32
+39 33
+40 33
+41 33
+42 33
+43 33
+44 33
+45 33
46 33
-46 34
+47 33
+48 33
+49 33
+50 33
+51 33
+52 33
+53 33
+54 33
+55 33
+56 33
+57 33
+57 32
+58 32
+58 31
+58 30
+58 29
+58 28
+58 29
+58 30
+58 31
+58 32
+58 33
+58 34
+58 35
+57 35
+56 35
+55 35
+54 35
+53 35
+52 35
+51 35
+50 35
+49 35
+48 35
+47 35
46 35
-46 36
-46 37
-46 38
+45 35
+44 35
+43 35
+42 35
+41 35
+40 35
+39 35
+38 35
+37 35
+36 35
+35 35
+34 35
+33 35
+32 35
+31 35
+30 35
+29 35
+28 35
+27 35
+26 35
+25 35
+24 35
+23 35
+22 35
+21 35
+20 35
+19 35
+18 35
+17 35
+16 35
+15 35
+14 35
+14 35
+14 35
+15 35
+16 35
+17 35
+18 35
+19 35
+19 36
+20 36
+20 37
+20 38
+20 39
+20 40
+20 41
+20 42
+19 42
+19 43
+18 43
+17 43
+16 43
+15 43
+14 43
+13 43
+12 43
+11 43
+10 43
+9 43
+8 43
+7 43
+6 43
+6 42
+6 41
+6 40
+6 39
+6 38
+6 37
+6 36
+6 35
+5 35
+4 35
+3 35
+2 35
+1 35
+0 35
+0 36
+0 37
+0 38
+0 39
+0 40
+0 41
+0 42
+1 42
+2 42
+3 42
+4 42
+5 42
+6 42
+7 42
+8 42
+9 42
+10 42
+11 42
+12 42
+13 42
+13 42
+14 43
+15 43
+16 43
+17 43
+18 43
+19 43
+19 42
+20 42
+21 42
+22 42
+23 42
+23 43
+23 44
+24 44
+25 44
+26 44
+27 44
+28 44
+29 44
+29 43
+30 43
+29 43
+29 44
+29 45
+30 45
+30 46
+31 46
+32 46
+33 46
+34 46
+35 46
+34 46
+34 47
+34 48
+34 47
+33 47
+32 47
+32 46
+31 46
+30 46
+29 46
+28 46
+28 45
+27 45
+26 45
+25 45
+24 45
+23 45
+22 45
+22 46
+22 47
+22 48
+22 49
+22 50
+22 51
+22 52
+23 52
+23 53
+24 53
+23 53
+23 54
+23 55
+23 56
+23 57
+24 57
+24 58
+25 58
+26 58
+27 58
+28 58
+29 58
+30 58
+30 57
+30 58
+31 58
+32 58
+33 58
+34 58
+34 57
+34 56
+34 55
+35 55
+36 55
+37 55
+38 55
+39 55
+39 54
+40 54
+40 53
+40 52
+41 52
+41 51
+42 51
+42 50
+42 51
+42 52
+43 52
+44 52
+45 52
+46 52
+47 52
+48 52
+48 51
+49 51
+49 50
+49 49
+49 48
+49 47
+49 46
+49 45
+49 46
+50 46
+51 46
+52 46
+53 46
+53 45
+54 45
+54 44
+54 43
+54 42
+54 41
+54 40
+54 39
+53 39
+53 38
+52 38
+51 38
+50 38
+49 38
+48 38
+47 38
+47 39
46 39
46 40
-45 40
-44 40
-43 40
-42 40
-41 40
-40 40
-39 40
-38 40
-37 40
-37 41
-36 41
-35 41
-34 41
-33 41
-32 41
-32 40
-32 41
-32 42
-31 42
-30 42
-29 42
-28 42
-27 42
-26 42
-25 42
-25 41
-25 40
-24 40
-24 40
-23 39
-23 38
-22 38
-21 38
-20 38
-19 38
-18 38
-17 38
-16 38
-16 39
-16 40
-15 40
-14 40
-13 40
-12 40
-11 40
-10 40
-9 40
-8 40
-7 40
-6 40
-5 40
-4 40
-3 40
-2 40
-1 40
-0 40
+46 41
+46 42
+46 42
+46 42
+46 41
+46 40
+46 39
+47 39
+47 38
+48 38
+49 38
+50 38
+51 38
+52 38
+53 38
+53 39
+54 39
+54 40
+54 41
+54 42
+55 42
+56 42
+57 42
+58 42
+58 43
+58 44
+58 45
+58 46
+58 47
+58 48
+58 49
+57 49
+56 49
+55 49
+54 49
+53 49
+52 49
+51 49
+50 49
+49 49
+49 49
+49 49
+50 49
+51 49
+52 49
+53 49
+54 49
+55 49
+56 49
+57 49
+58 49
+59 49
+59 50
+59 51
+59 52
+59 53
+58 53
+57 53
+56 53
+56 54
+56 55
+56 56
+55 56
+55 57
+54 57
+53 57
+52 57
+51 57
+50 57
+49 57
+48 57
+47 57
+46 57
+45 57
+44 57
+43 57
+43 58
+42 58
+41 58
+40 58
+39 58
+38 58
+37 58
+36 58
+35 58
+34 58
+33 58
+32 58
+31 58
+30 58
+29 58
+28 58
+27 58
+26 58
+25 58
+24 58
+23 58
+22 58
+22 57
+22 56
+22 55
+22 54
+22 53
+22 52
+22 51
+22 50
+22 49
+21 49
+20 49
+19 49
+18 49
+17 49
+16 49
+15 49
+16 49
+16 50
+16 51
+16 52
+16 53
+15 53
+14 53
+13 53
+12 53
+11 53
+10 53
+9 53
+8 53
+8 52
+8 51
+8 50
+8 49
+7 49
+6 49
+5 49
+4 49
+3 49
+2 49
+1 49
+0 49
+0 50
+0 51
+0 52
+0 53
+0 54
+0 55
+0 56
+1 56
+2 56
+3 56
+4 56
+5 56
+6 56
+7 56
+8 56
+9 56
+10 56
+11 56
+12 56
+13 56
+14 56
+15 56
+16 56
+17 56
+18 56
+19 56
+20 56
+21 56
+22 56
+23 56
+23 56
+24 57
+24 58
+25 58
+26 58
+27 58
+28 58
+29 58
+30 58
+31 58
+32 58
+32 57
+33 57
+33 56
+34 56
+35 56
+36 56
+37 56
+38 56
+39 56
+40 56
+41 56
+42 56
+43 56
+44 56
+45 56
+46 56
+47 56
+48 56
+49 56
+49 56
+50 57
+51 57
+52 57
+53 57
+54 57
+55 57
+55 56
+56 56
+57 56
+58 56
diff --git a/ConsoleApp/Output/SquareTest.png b/ConsoleApp/Output/SquareTest.png
index 2c0e00f..d7efa5f 100644
Binary files a/ConsoleApp/Output/SquareTest.png and b/ConsoleApp/Output/SquareTest.png differ
diff --git a/ConsoleApp/PathPlanners/PathPlanner.cs b/ConsoleApp/PathPlanners/PathPlanner.cs
index 508d8b8..fe7d532 100644
--- a/ConsoleApp/PathPlanners/PathPlanner.cs
+++ b/ConsoleApp/PathPlanners/PathPlanner.cs
@@ -42,9 +42,9 @@ namespace ConsoleApp.PathPlanners
path.AddRange(
map.GetShortestPath(
currentPostion,
- map.GetCell(currentPostion.X, currentPostion.Y + vehicle.DetectorRadius * 2 - 1)));
+ map.GetCell(currentPostion.X, currentPostion.Y + (vehicle.DetectorRadius * 2) - 1)));
- currentPostion = new Cell(currentPostion.X, currentPostion.Y + (vehicle.DetectorRadius * 2 - 1));
+ currentPostion = new Cell(currentPostion.X, currentPostion.Y + (vehicle.DetectorRadius * 2) -1);
if (currentHeading == GlobalDirection.East)
currentHeading = GlobalDirection.West;
else
diff --git a/ConsoleApp/Program.cs b/ConsoleApp/Program.cs
index 044e423..684cbab 100644
--- a/ConsoleApp/Program.cs
+++ b/ConsoleApp/Program.cs
@@ -27,19 +27,10 @@ namespace ConsoleApp
private static void Initialization()
{
- _userConsole.PrintStartMenu();
- var input = UserConsole.GetUserInput();
- if (input == "1")
- {
- var (x,y) = _userConsole.GetMapDimensions();
- var minePercentage = UserConsole.GetMinePercentage();
- RunSimulation(x, y, minePercentage);
- }
- else
- {
- UserConsole.PrintInvalidInput();
- Initialization();
- }
+ var (x,y) = _userConsole.GetMapDimensions();
+ var minePercentage = 1;
+ RunSimulation(x, y, minePercentage);
+
}
private static void RunSimulation(int x, int y, double minePercentage)
@@ -53,7 +44,7 @@ namespace ConsoleApp
private static void GenerateImages()
{
- var file = Path.Combine("./",Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"HexPlot.py");
+ var file = Path.Combine("./",Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"plotGraphs.py");
ProcessStartInfo startInfo = new ProcessStartInfo()
{
FileName = "python3",
diff --git a/ConsoleApp/UserConsole.cs b/ConsoleApp/UserConsole.cs
index 1eae039..3801a12 100644
--- a/ConsoleApp/UserConsole.cs
+++ b/ConsoleApp/UserConsole.cs
@@ -24,18 +24,18 @@ namespace ConsoleApp
public (int width, int height) GetMapDimensions()
{
- Console.WriteLine($"Enter map width: ");
+ Console.WriteLine($"Enter map width (5-15) meters: ");
var x = GetUserInput();
- if (!int.TryParse(x, out var width))
+ if (!int.TryParse(x, out var width) && width >= 5 && width <= 15)
{
PrintInvalidInput();
GetMapDimensions();
}
- Console.WriteLine($"Enter map height: ");
+ Console.WriteLine($"Enter map height (5-15) meters: ");
var y = GetUserInput();
- if (int.TryParse(y, out var height)) return (width, height);
+ if (int.TryParse(y, out var height) && height >= 5 && height <= 15) return (width, height);
PrintInvalidInput();
GetMapDimensions();
return (width, height);
diff --git a/ConsoleApp/HexPlot.py b/ConsoleApp/plotGraphs.py
similarity index 80%
rename from ConsoleApp/HexPlot.py
rename to ConsoleApp/plotGraphs.py
index 9acf4dd..921c830 100644
--- a/ConsoleApp/HexPlot.py
+++ b/ConsoleApp/plotGraphs.py
@@ -68,10 +68,9 @@ if __name__ == "__main__":
yf.append(int(y))
fig = plt.figure(1)
- plt.plot(xc, yc)
- plt.plot(xc, yc, 'o', label='vehicle', color='blue')
- plt.plot(xm, ym, 'o', label='all mines', color='red')
- plt.plot(xf, yf, 'o', label='detected mines', color='orange')
+ plt.plot(xc, yc, 'h', label='vehicle', color='blue', linestyle='None')
+ plt.plot(xm, ym, 'h', label='all mines', color='red', linestyle='None')
+ plt.plot(xf, yf, 'h', label='detected mines', color='orange', linestyle='None')
plt.title('Hex Simulation')
plt.legend(loc='lower left', fontsize='xx-small')
matplotlib.pyplot.savefig('/Users/brady.bodily/Documents/Repositories/CS5890_Robot_Intelligence/RobotIntelFinal/ConsoleApp/Output/HexTest.png')
@@ -80,10 +79,9 @@ if __name__ == "__main__":
plt.close(fig)
fig = plt.figure(2)
- plt.plot(sxc, syc)
- plt.plot(sxc, syc, 'o', label='vehicle', color='blue')
- plt.plot(sxm, sym, 'o', label='all mines', color='red')
- plt.plot(sxf, syf, 'o', label='detected mines', color='orange')
+ plt.plot(sxc, syc, 's', label='vehicle', color='blue', linestyle='None')
+ plt.plot(sxm, sym, 's', label='all mines', color='red', linestyle='None')
+ plt.plot(sxf, syf, 's', label='detected mines', color='orange', linestyle='None')
plt.title('Square Simulation')
plt.legend(loc='lower left', fontsize='xx-small')
matplotlib.pyplot.savefig('/Users/brady.bodily/Documents/Repositories/CS5890_Robot_Intelligence/RobotIntelFinal/ConsoleApp/Output/SquareTest.png')
@@ -91,8 +89,8 @@ if __name__ == "__main__":
plt.close(fig)
fig = plt.figure(3)
- plt.plot(hccx, hccy, 'o', label='covered cells', color='red')
- plt.plot(xf, xy, 'o', label='detected mines', color='blue')
+ plt.plot(hccx, hccy, 'h', label='covered cells', color='red', linestyle='None')
+ plt.plot(xf, yf, 'h', label='detected mines', color='blue', linestyle='None')
plt.title('Hex Coverage')
plt.legend(loc='lower left', fontsize='xx-small')
matplotlib.pyplot.savefig('/Users/brady.bodily/Documents/Repositories/CS5890_Robot_Intelligence/RobotIntelFinal/ConsoleApp/Output/HexCoverage.png')
@@ -100,8 +98,8 @@ if __name__ == "__main__":
plt.close(fig)
fig = plt.figure(4)
- plt.plot(sccx, sccy, 'o', label='covered cells', color='red')
- plt.plot(sxf, syf, 'o', label='detected mines', color='blue')
+ plt.plot(sccx, sccy, 's', label='covered cells', color='red', linestyle='None')
+ plt.plot(sxf, syf, 's', label='detected mines', color='blue', linestyle='None')
plt.title('Square Coverage')
plt.legend(loc='lower left', fontsize='xx-small')
matplotlib.pyplot.savefig('/Users/brady.bodily/Documents/Repositories/CS5890_Robot_Intelligence/RobotIntelFinal/ConsoleApp/Output/SquareCoverage.png')