diff --git a/TP8/war.py b/TP8/war.py index 877157de16db626e4c682748250e72917c6487a7..4f3d7cde35a1bf6b74b65f46ac24f2916aac6d93 100755 --- a/TP8/war.py +++ b/TP8/war.py @@ -14,6 +14,7 @@ from card import Card from apqueue import * from apstack import * +import random def distribute(n_card: int) -> tuple[ApQueue, ApQueue]: """ @@ -36,18 +37,19 @@ def distribute(n_card: int) -> tuple[ApQueue, ApQueue]: $$$ isinstance(carte, Card) True """ - deck = Card.deck(n_card * 2) - random.shuffle(deck) - m1 = ApQueue(deck[:n_card]) - m2 = ApQueue(deck[n_card:]) - return m1, m2 - + m1 = ApQueue() + m2 = ApQueue() + liste_carte = Card.deck(n_card) + + for elt in range(0, len(liste_carte)): + m1.enqueue(liste_carte[elt]) + for elt in range(0, len(liste_carte)): + m2.enqueue(liste_carte[elt]) + return m1,m2 + + def gather_stack(main: ApQueue, pile: ApStack) -> None: """ - ajoute les carte de la pile dans la main - - exemples : - $$$ cartes = Card.deck(4) $$$ main = ApQueue() $$$ pile = ApStack()