Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
2048
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Thomas Bianco
2048
Commits
895877af
Commit
895877af
authored
6 years ago
by
Garance Guey
Browse files
Options
Downloads
Patches
Plain Diff
Renommage des fichiers pour le partage
parent
883ba07a
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
__pycache__/grid_2048.cpython-36.pyc
+0
-0
0 additions, 0 deletions
__pycache__/grid_2048.cpython-36.pyc
gg_grid_2048.py
+43
-5
43 additions, 5 deletions
gg_grid_2048.py
gg_test_grid_2048.py
+1
-1
1 addition, 1 deletion
gg_test_grid_2048.py
with
44 additions
and
6 deletions
__pycache__/grid_2048.cpython-36.pyc
deleted
100644 → 0
+
0
−
0
View file @
883ba07a
File deleted
This diff is collapsed.
Click to expand it.
grid_2048.py
→
gg_
grid_2048.py
+
43
−
5
View file @
895877af
...
@@ -22,6 +22,7 @@ def add_new_tile(grid):
...
@@ -22,6 +22,7 @@ def add_new_tile(grid):
def
choose_value_new_tile
():
def
choose_value_new_tile
():
#choisi la valeur de la nouvelle case avec la probabilté indiquée dans l'énoncé
value
=
rd
.
choice
([
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
4
])
value
=
rd
.
choice
([
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
2
,
4
])
return
(
value
)
return
(
value
)
...
@@ -70,16 +71,53 @@ def init_game(taille):
...
@@ -70,16 +71,53 @@ def init_game(taille):
#FONCTIONNALITE 2
#FONCTIONNALITE 2
def
grid_to_string
(
grid
):
def
grid_to_string
(
grid
):
#je chosis de ne pas prendre l'argument "n" car cette information est déjà contenue dans la grid et elle me semble redondante
#on suppose que la grille est carrée
affichage
=
"
"
+
"
===
"
*
len
(
grid
)
+
"
\n
"
affichage
=
"
"
+
"
===
"
*
len
(
grid
)
+
"
\n
"
#crée la délimation du dessus
for
ligne
in
range
(
len
(
grid
)):
for
ligne
in
range
(
len
(
grid
)):
for
colonne
in
range
(
len
(
grid
[
0
])):
for
colonne
in
range
(
len
(
grid
[
0
])):
#on suppose que la grille a au moins une ligne et qu'elles ont toutes la même taille
#on suppose que la grille a au moins une ligne et qu'elles ont toutes la même taille
affichage
=
affichage
+
"
|
"
+
str
(
grid
[
ligne
][
colonne
])
+
"
"
affichage
=
affichage
+
"
|
"
+
str
(
grid
[
ligne
][
colonne
])
+
"
"
affichage
=
affichage
+
"
|
\n
"
#crée l'affichage de l'interieure des tuiles et de leur séparation
affichage
=
affichage
+
"
"
+
"
===
"
*
len
(
grid
)
+
"
\n
"
#on suppose que la grille est carrée
affichage
=
affichage
+
"
|
\n
"
#fini la ligne
affichage
=
affichage
+
"
"
+
"
===
"
*
len
(
grid
)
+
"
\n
"
#
return
(
affichage
)
return
(
affichage
)
print
(
grid_to_string
([[
1
,
2
,
"
"
],[
"
"
,
4
,
3
],[
4
,
7
,
6
]]))
def
long_value
def
long_value
(
grid
):
all_tiles
=
get_all_tiles
(
grid
)
str_all_tiles
=
[]
#création d'une liste de chaine de caractére prenant la valeur des tuiles
long_str_tiles
=
[]
#liste contenant les longueurs des tuiles
for
tile
in
range
(
len
(
all_tiles
)):
str_all_tiles
.
append
(
str
(
all_tiles
[
tile
]))
for
string_tile
in
range
(
len
(
str_all_tiles
)):
long_str_tiles
.
append
(
len
(
str_all_tiles
[
string_tile
]))
return
(
max
(
long_str_tiles
))
def
grid_to_string_with_size
(
grid
):
longest
=
long_value
(
grid
)
nb_espace
=
longest
+
2
#donne le nombre d'espace necessaire dansla grille
espaces
=
"
=
"
*
nb_espace
espaces
=
espaces
+
"
"
affichage
=
"
"
+
espaces
*
len
(
grid
)
+
"
\n
"
#crée la délimation du dessus
for
ligne
in
range
(
len
(
grid
)):
for
colonne
in
range
(
len
(
grid
[
0
])):
#on suppose que la grille a au moins une ligne et qu'elles ont toutes la même taille
nb_espace_manquant
=
longest
-
len
(
str
(
grid
[
ligne
][
colonne
]))
-
1
affichage
=
affichage
+
"
|
"
+
str
(
grid
[
ligne
][
colonne
])
+
"
"
*
nb_espace_manquant
affichage
=
affichage
+
"
|
\n
"
#fini la ligne
affichage
=
"
"
+
espaces
*
len
(
grid
)
+
"
\n
"
return
(
affichage
)
This diff is collapsed.
Click to expand it.
test_grid_2048.py
→
gg_
test_grid_2048.py
+
1
−
1
View file @
895877af
from
game2048.grid_2048
import
*
from
game2048.
gg_
grid_2048
import
*
from
pytest
import
*
from
pytest
import
*
def
test_create_grid
():
def
test_create_grid
():
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment