feat: added maxHeight heuristic and tests

main.py

@@ -0,0 +1,31 @@
+from src.game.board import Board
+from src.agents.heuristic import *
+
+def test_heuristic():
+    board = Board()
+    board.board =\
+    [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 1, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 1, 0, 1, 0, 0, 0, 0, 0, 0], 
+    [1, 0, 0, 0, 0, 0, 1, 0, 1, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 1, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
+
+    print(aggregate_heights(board))
+    print(max_height(board))
+
+test_heuristic()

src/agents/heuristic.py

@@ -14,24 +14,15 @@ def aggregate_heights(gameState: Board) -> int:
         for j in range(gameState.columns):
             if gameState.board[i][j] > 0:
                 if checkedList[j] == 0:
-                    checkedList[j] = gameState.rows - i+1
+                    checkedList[j] = gameState.rows - i
     return sum(checkedList)
-
-
 
-
-if __name__ == "__main__":
-    board = Board()
-    board.board =\
-    [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
-    [0, 0, 1, 0, 0, 0, 0, 0, 0, 0], 
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
-    [0, 1, 0, 1, 0, 0, 0, 0, 0, 0], 
-    [1, 0, 0, 0, 0, 0, 1, 0, 0, 0], 
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
-    [0, 0, 0, 0, 1, 0, 0, 0, 0, 0], 
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
-
-    assert aggregate_heights(board) == 27
+def max_height(gameState: Board) -> int:
+    """ Returns the maximum height of the columns in the game state. """
+    checkedList = [0 for i in range(gameState.columns)]
+    for i in range(gameState.rows):
+        for j in range(gameState.columns):
+            if gameState.board[i][j] > 0:
+                if checkedList[j] == 0:
+                    checkedList[j] = gameState.rows - i
+    return max(checkedList)

src/game/block.py

@@ -1,7 +1,5 @@
 import random
 
-import random
-
 class Block:
 
     def __init__(self, x, y, blockType):

src/game/board.py

@@ -1,7 +1,7 @@
 import pygame
 import random
 import copy
-from block import Block
+from src.game.block import Block
 
 '''
 Denne skriver ut brettet i terminal bare. 

test/agents/test_heuristic.py

@@ -0,0 +1,28 @@
+from src.game.board import Board
+from src.agents.heuristic import aggregate_heights
+
+def test_heuristic():
+    board = Board()
+    board.board =\
+    [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 1, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 1, 0, 1, 0, 0, 0, 0, 0, 0], 
+    [1, 0, 0, 0, 0, 0, 1, 0, 1, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 1, 0, 0, 0, 0, 0], 
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
+
+    assert aggregate_heights(board) == 27