From 10a4be0ed312b8a67244c4d8fb10bd56ec5c788e Mon Sep 17 00:00:00 2001
From: unknown <thomas.bianco@student-cs.fr>
Date: Wed, 14 Nov 2018 10:54:53 +0100
Subject: [PATCH] fonctionnalite 5

---
 game2048/.pytest_cache/v/cache/lastfailed | 3 +--
 game2048/.pytest_cache/v/cache/nodeids    | 1 +
 game2048/grid_2048.py                     | 7 +++++--
 game2048/test_grid_2048.py                | 6 ++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/game2048/.pytest_cache/v/cache/lastfailed b/game2048/.pytest_cache/v/cache/lastfailed
index 450bf77..fb70bde 100644
--- a/game2048/.pytest_cache/v/cache/lastfailed
+++ b/game2048/.pytest_cache/v/cache/lastfailed
@@ -1,4 +1,3 @@
 {
-  "test_grid_2048.py::test_grid_to_string": true,
-  "test_grid_2048.py::test_move_possible": true
+  "test_grid_2048.py::test_grid_to_string": true
 }
\ No newline at end of file
diff --git a/game2048/.pytest_cache/v/cache/nodeids b/game2048/.pytest_cache/v/cache/nodeids
index d737313..83a8465 100644
--- a/game2048/.pytest_cache/v/cache/nodeids
+++ b/game2048/.pytest_cache/v/cache/nodeids
@@ -9,6 +9,7 @@
   "test_grid_2048.py::test_long_value_with_theme",
   "test_grid_2048.py::test_move_row_left",
   "test_grid_2048.py::test_move_row_right",
+  "test_grid_2048.py::test_move_grid",
   "test_grid_2048.py::test_is_grid_full",
   "test_grid_2048.py::test_move_possible"
 ]
\ No newline at end of file
diff --git a/game2048/grid_2048.py b/game2048/grid_2048.py
index 76cdfe0..495a125 100644
--- a/game2048/grid_2048.py
+++ b/game2048/grid_2048.py
@@ -162,8 +162,11 @@ def is_grid_full(grid):
 def move_possible(grid):
     possibles = []
     for d in ["left","right","up","down"]:
-        possibles.append(move_gride(grid,d) != grid)
+        possibles.append(move_grid(grid,d) != grid)
     return possibles
 
 def is_game_over(grid):
-    
+    return is_grid_full(grid) and True not in move_possible(grid)
+
+def get_grid_tile_max(grid):
+    return max(get_all_tiles(grid))
diff --git a/game2048/test_grid_2048.py b/game2048/test_grid_2048.py
index 3655978..3acae3a 100644
--- a/game2048/test_grid_2048.py
+++ b/game2048/test_grid_2048.py
@@ -84,6 +84,12 @@ def test_move_row_right():
     assert move_row_right([2, 4, 4, 0]) == [0, 0, 2, 8]
     assert move_row_right([4, 8, 16, 32]) == [4, 8, 16, 32]
 
+def test_move_grid():
+    assert move_grid([[2,0,0,2], [4, 4, 0, 0], [8, 0, 8, 0], [0, 2, 2, 0]],"left") == [[4,0,0,0], [8, 0, 0, 0], [16, 0, 0, 0], [4, 0, 0, 0]]
+    assert move_grid([[2,0,0,2], [4, 4, 0, 0], [8, 0, 8, 0], [0, 2, 2, 0]],"right") == [[0,0,0,4], [0, 0, 0, 8], [0, 0, 0, 16], [0, 0, 0, 4]]
+    assert move_grid([[2,0,0,2], [2, 4, 0, 0], [8, 4, 2, 0], [8, 2, 2, 0]],"up") == [[4,8,4,2], [16, 2, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
+    assert move_grid([[2,0,0,2], [2, 4, 0, 0], [8, 4, 2, 0], [8, 2, 2, 0]],"down") == [[0, 0, 0, 0], [0, 0, 0, 0],[4,8,0,0],[16, 2, 4, 2]]
+
 def test_is_grid_full():
     assert is_grid_full([[0, 16, 32, 0], [64, 0, 32, 2], [2, 2, 8, 4], [512, 8, 16, 0]]) == False
     assert is_grid_full([[4, 16, 32, 4], [64, 8, 32, 2], [2, 2, 8, 4], [512, 8, 16, 1024]]) == True
-- 
GitLab