Merge pull request 'Improve logic of fitness function' (#34) from better-fitness-function into master

Reviewed-on: #34

.gitignore

@@ -0,0 +1,2 @@
+__pycache__/*
+/**/.idea/*

agent.py

@@ -3,10 +3,18 @@ import settings
 
 
 class Instance:
-    def __init__(self):
+    def __init__(self, tank_capacity, direction, seeds, feritizer, water, carrots, potatoes, wheat):
         size = settings.Field.size
         self.rect = pygame.Rect(0, 0, size(), size())
         self.action = ''
+        self.tank_capacity = tank_capacity
+        self.direction = direction
+        self.seeds = seeds
+        self.feritizer = feritizer
+        self.water = water
+        self.carrots = carrots
+        self.potatoes = potatoes
+        self.wheat = wheat
 
     def coordinates(self):
         return {
@@ -20,20 +28,96 @@ class Instance:
     def y(self):
         return int(self.rect.y / settings.Field.size())
 
-    def move(self):
+    def get_tank_capacity(self):
+        return self.tank_capacity
+
+    def set_tank_capacity(self, fuel_units):
+        self.tank_capacity = fuel_units
+
+    def get_direction(self):
+        return self.direction
+
+    def set_direction(self, direction):
+        self.direction = direction
+
+    def get_seeds(self):
+        return self.seeds
+
+    def set_seeds(self, seeds):
+        self.seeds = seeds
+
+    def get_feritizer(self):
+        return self.feritizer
+
+    def set_feritizer(self, feritizer):
+        self.feritizer = feritizer
+
+    def get_water(self):
+        return self.water
+
+    def set_water(self, water):
+        self.water = water
+
+    def get_carrots(self):
+        return self.carrots
+
+    def set_carrots(self, carrots):
+        self.carrots = carrots
+
+    def get_potatoes(self):
+        return self.potatoes
+
+    def set_potatoes(self, potatoes):
+        self.potatoes = potatoes
+
+    def get_wheat(self):
+        return self.wheat
+
+    def set_wheat(self, wheat):
+        self.wheat = wheat
+
+    def move(self, action):
         key_pressed = pygame.key.get_pressed()
         height = settings.Pygame.height()
         width = settings.Pygame.width()
         tile_size = settings.Field.size()
 
-        if key_pressed[pygame.K_LEFT] and self.rect.x > 0:
+        if key_pressed[pygame.K_UP] and self.direction == 4 and self.rect.x > 0 and action is None:
             self.rect.x -= tile_size
-        elif key_pressed[pygame.K_RIGHT] and self.rect.x < width - tile_size:
+        elif key_pressed[pygame.K_UP] and self.direction == 2 and self.rect.x < width - tile_size and action is None:
             self.rect.x += tile_size
-        elif key_pressed[pygame.K_UP] and self.rect.y > 0:
+        elif key_pressed[pygame.K_UP] and self.direction == 1 and self.rect.y > 0 and action is None:
             self.rect.y -= tile_size
-        elif key_pressed[pygame.K_DOWN] and self.rect.y < height - tile_size:
+        elif key_pressed[pygame.K_UP] and self.direction == 3 and self.rect.y < height - tile_size and action is None:
+            self.rect.y += tile_size
+        elif action == 'f' and self.direction == 4 and self.rect.x > 0:
+            self.rect.x -= tile_size
+        elif action == 'f' and self.direction == 2 and self.rect.x < width - tile_size:
+            self.rect.x += tile_size
+        elif action == 'f' and self.direction == 1 and self.rect.y > 0:
+            self.rect.y -= tile_size
+        elif action == 'f' and self.direction == 3 and self.rect.y < height - tile_size:
             self.rect.y += tile_size
         elif key_pressed[pygame.K_SPACE]:
             return 'open_window'
         return 'none'
+
+    def rotate(self, action):
+        key_pressed = pygame.key.get_pressed()
+        if key_pressed[pygame.K_LEFT] and self.direction == 2 or action == 'l' and self.direction == 2:
+            self.direction = 1
+        elif key_pressed[pygame.K_LEFT] and self.direction == 1 or action == 'l' and self.direction == 1:
+            self.direction = 4
+        elif key_pressed[pygame.K_LEFT] and self.direction == 4 or action == 'l' and self.direction == 4:
+            self.direction = 3
+        elif key_pressed[pygame.K_LEFT] and self.direction == 3 or action == 'l' and self.direction == 3:
+            self.direction = 2
+        elif key_pressed[pygame.K_RIGHT] and self.direction == 1 or action == 'r' and self.direction == 1:
+            self.direction = 2
+        elif key_pressed[pygame.K_RIGHT] and self.direction == 4 or action == 'r' and self.direction == 4:
+            self.direction = 1
+        elif key_pressed[pygame.K_RIGHT] and self.direction == 3 or action == 'r' and self.direction == 3:
+            self.direction = 4
+        elif key_pressed[pygame.K_RIGHT] and self.direction == 2 or action == 'r' and self.direction == 2:
+            self.direction = 3
+        return 'none'

assets/data/data.csv

@@ -0,0 +1,201 @@
+Fuel,Water,Fertalizer,Carrots,Potatoes,Wheat,X,Y,seeds,back to station
+1371,31,14,17,25,5,1,9,24,1
+16,6,16,21,22,24,6,8,8,0
+835,13,2,10,3,6,6,6,33,1
+637,41,35,6,24,10,0,6,7,1
+1318,27,17,20,10,12,2,5,47,0
+569,22,6,22,23,2,4,2,19,1
+1151,41,33,14,19,21,5,3,22,0
+633,29,0,6,13,7,3,8,35,1
+1422,12,26,5,23,20,2,9,18,0
+292,18,3,7,0,25,8,8,3,1
+851,47,38,18,7,17,3,10,16,0
+368,15,15,5,1,19,8,5,41,0
+970,28,11,20,14,14,6,8,2,1
+260,38,44,22,18,14,9,9,17,0
+701,5,20,24,7,1,10,1,19,1
+1187,18,46,22,7,13,2,6,38,0
+1236,29,39,2,4,15,1,3,38,0
+696,48,12,0,2,9,9,1,12,0
+793,41,26,4,13,22,4,8,27,0
+458,19,4,9,18,4,10,9,10,1
+598,2,5,24,22,3,2,0,8,1
+375,31,14,10,21,11,6,7,10,0
+467,49,37,23,2,11,1,3,40,1
+477,33,48,5,22,10,10,5,30,0
+395,21,24,14,2,19,10,6,45,0
+451,24,50,20,23,1,8,5,36,1
+389,13,37,20,18,17,10,7,31,0
+298,22,39,2,19,15,6,2,12,0
+638,5,18,9,4,23,6,3,16,1
+1211,6,28,1,25,24,4,1,13,1
+1341,23,16,19,19,21,9,10,26,0
+804,32,33,23,0,9,6,4,44,1
+943,37,30,2,10,12,2,2,19,0
+1008,0,13,19,25,24,8,5,50,1
+954,14,48,14,10,19,7,8,12,0
+700,41,8,13,24,14,7,6,34,1
+969,3,16,10,17,18,8,9,17,0
+687,1,5,3,25,6,8,0,10,1
+1115,45,16,25,21,4,6,2,31,1
+747,28,37,11,11,15,3,6,50,0
+190,48,32,9,7,12,9,1,10,1
+598,14,13,18,7,20,3,8,38,0
+1296,23,21,16,1,2,4,5,2,1
+487,20,48,10,19,10,5,8,12,0
+625,30,7,19,9,8,10,8,24,0
+1351,8,50,3,10,12,1,2,10,0
+1450,32,26,5,15,24,10,8,23,1
+976,9,10,14,17,17,6,0,15,0
+31,8,9,4,6,18,7,8,9,1
+1324,42,8,6,15,11,8,5,46,0
+1407,47,29,24,22,4,10,10,13,0
+51,20,37,6,9,1,3,8,43,1
+707,38,31,23,6,1,2,9,31,1
+1363,2,10,17,24,0,8,2,2,1
+5,11,31,5,17,10,1,5,4,1
+516,16,4,17,13,18,9,1,14,0
+262,25,1,1,22,16,8,4,20,1
+1046,35,47,0,2,12,9,1,1,1
+295,14,35,21,25,20,5,4,31,1
+728,18,17,15,11,25,7,10,13,1
+715,36,50,8,3,18,7,8,40,0
+122,15,18,21,0,6,8,3,42,1
+787,19,10,6,0,1,10,3,28,0
+1037,46,35,8,6,3,10,9,22,0
+822,35,34,9,18,17,3,7,4,0
+170,46,45,18,25,6,9,0,17,1
+205,10,43,14,21,19,6,6,25,0
+1213,9,43,20,16,9,3,7,0,1
+1388,7,48,14,11,5,3,9,19,0
+947,10,31,23,6,13,10,4,24,1
+1137,5,48,25,3,6,10,1,50,1
+1048,25,14,14,21,2,2,2,28,0
+715,43,0,3,10,9,6,1,40,1
+377,42,12,12,5,6,3,4,4,1
+1332,42,28,5,21,12,4,8,25,0
+116,0,25,19,23,6,1,1,36,1
+497,23,20,19,1,10,5,9,13,0
+178,27,46,2,14,5,9,0,50,1
+1170,10,22,21,13,2,4,6,18,0
+1308,0,13,0,8,5,6,5,46,1
+1267,37,13,13,12,8,3,4,1,1
+148,48,16,16,6,8,1,2,29,0
+24,31,31,1,18,21,10,4,35,1
+641,30,47,24,17,11,0,10,6,1
+1444,22,26,19,11,13,10,4,1,1
+825,38,17,19,19,2,7,8,40,0
+844,29,42,6,19,1,10,3,14,0
+1103,43,4,13,19,17,2,3,27,1
+732,21,26,7,5,14,10,10,30,0
+356,47,26,5,21,9,6,1,10,0
+852,11,20,20,11,5,0,10,1,1
+221,12,11,15,14,0,3,6,21,0
+853,42,17,2,17,25,4,2,34,1
+636,42,23,25,16,2,7,1,48,1
+1195,15,38,12,8,16,4,1,26,0
+1431,0,9,7,4,20,9,2,22,1
+655,37,31,12,6,5,10,9,20,0
+1052,48,48,12,1,23,6,1,33,1
+755,14,16,13,15,9,10,8,15,0
+848,4,18,10,6,6,2,8,28,1
+1261,10,44,10,24,9,6,4,28,1
+966,16,15,14,9,8,3,10,41,0
+1188,12,13,15,14,9,6,0,25,0
+1497,33,10,1,1,23,2,2,32,1
+1244,1,43,10,7,12,6,10,16,1
+1443,27,44,15,7,6,7,3,41,0
+1410,13,21,3,18,4,5,1,38,0
+1195,10,33,10,0,15,8,9,37,0
+849,36,15,3,5,5,8,8,35,0
+599,42,28,6,2,10,7,10,30,0
+1473,43,50,9,8,3,1,8,34,0
+828,16,1,25,25,4,5,10,7,1
+920,11,2,19,17,13,5,4,27,1
+455,18,10,24,7,8,2,0,48,1
+1295,35,0,22,8,10,5,3,22,1
+998,49,49,14,20,2,4,8,18,0
+1058,2,49,2,1,8,2,10,15,1
+609,32,35,24,7,16,4,4,2,1
+1224,13,33,12,0,19,3,9,8,0
+139,38,6,21,2,3,3,2,30,1
+552,5,13,3,18,15,7,6,23,0
+136,39,37,25,8,8,8,9,25,1
+323,40,7,1,8,23,6,6,35,1
+555,31,29,18,14,3,9,2,3,1
+1295,21,9,20,8,15,10,7,22,0
+203,4,20,0,16,1,1,1,41,1
+120,48,23,15,25,3,7,4,42,1
+520,50,50,20,4,11,3,1,40,0
+1281,20,23,20,12,6,7,4,42,0
+1009,4,25,10,20,17,6,4,16,1
+780,34,14,5,20,13,0,5,26,0
+1064,5,16,1,16,9,6,1,23,0
+1309,14,2,21,17,12,6,5,13,1
+1356,16,23,9,0,20,8,1,30,0
+1398,20,12,20,14,14,0,5,11,0
+820,9,15,2,1,24,1,9,26,1
+193,48,46,19,25,0,4,8,4,1
+1410,43,34,2,0,12,6,10,21,0
+673,15,8,21,18,18,10,8,30,0
+1394,19,23,19,18,14,0,10,49,0
+711,26,32,0,4,10,5,2,42,0
+1437,15,49,2,1,2,10,7,44,0
+255,41,23,4,20,20,4,3,35,0
+1058,13,17,11,16,7,7,3,24,0
+506,9,2,18,21,12,3,0,40,1
+1183,32,48,6,14,13,6,7,10,0
+12,27,3,5,19,8,4,8,10,1
+779,38,43,12,9,18,6,10,30,0
+447,44,26,13,20,22,7,10,41,1
+1401,50,20,6,4,3,10,10,0,1
+829,27,21,14,17,3,7,10,30,0
+479,29,33,11,1,23,7,0,9,1
+772,30,15,10,11,22,7,0,35,0
+1466,12,11,10,21,8,8,0,7,0
+346,47,42,10,24,23,6,8,26,1
+765,19,48,20,20,19,9,7,45,0
+962,9,16,5,14,1,5,5,27,0
+472,21,7,6,7,24,2,2,49,1
+245,42,47,14,19,23,3,3,33,1
+327,10,11,21,13,8,8,3,10,0
+6,1,4,21,3,10,8,5,44,1
+235,2,0,10,3,13,7,3,9,1
+830,13,17,9,17,3,3,8,37,0
+148,21,27,2,15,1,10,8,5,1
+1112,25,42,25,23,5,3,7,50,1
+1162,2,19,18,14,2,9,3,42,1
+218,15,3,25,3,4,0,3,27,1
+725,12,29,9,7,2,4,2,48,0
+514,40,23,6,18,5,6,1,46,0
+84,36,31,18,21,5,1,2,9,1
+415,41,15,12,1,20,0,2,13,0
+1003,41,49,3,9,23,9,4,14,1
+800,31,37,1,7,21,2,2,43,0
+782,22,12,7,19,23,9,7,46,1
+465,40,27,14,6,13,4,5,31,0
+959,6,17,9,25,15,9,5,12,1
+1041,6,8,6,3,2,3,0,8,0
+130,2,26,8,24,1,1,2,28,1
+1170,1,30,20,2,25,3,3,33,1
+762,33,36,16,13,0,0,2,14,0
+173,50,8,2,10,22,1,3,46,0
+59,4,5,25,6,12,8,3,11,1
+639,0,29,21,10,5,5,0,7,1
+833,49,22,6,24,5,7,0,48,1
+303,23,26,17,7,8,0,0,21,0
+1306,30,17,1,0,20,1,9,31,0
+577,46,25,17,6,16,10,4,15,0
+1217,24,9,24,8,5,8,1,15,1
+567,13,36,17,25,9,4,10,46,1
+1265,11,4,0,13,0,5,6,38,1
+312,41,39,20,1,15,2,7,20,0
+1113,44,0,22,3,18,1,5,20,1
+1264,18,29,22,10,13,8,6,36,0
+663,40,42,15,5,22,5,0,16,1
+72,26,22,23,3,8,3,5,48,1
+1151,5,15,24,10,14,7,5,44,1
+808,34,11,0,18,17,0,4,13,0
+187,44,2,2,19,12,9,1,9,1
+459,44,9,19,22,17,4,6,37,0
+1496,7,22,9,2,15,7,7,34,0