From 9915c6be1fb75f3503a808946b081d3655166eec Mon Sep 17 00:00:00 2001 From: AlvaroH Date: Tue, 15 Sep 2020 09:04:15 +0200 Subject: [PATCH] Terminado el capitulo 1 --- 01-data-model/frenchdeck.py | 30 ++++++++++++++++++++++++++++++ 01-data-model/vector2d.py | 14 +++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/01-data-model/frenchdeck.py b/01-data-model/frenchdeck.py index 47a0d05..7b44ff6 100644 --- a/01-data-model/frenchdeck.py +++ b/01-data-model/frenchdeck.py @@ -15,3 +15,33 @@ def __len__(self): def __getitem__(self, position): return self._cards[position] + +if __name__=='__main__': + deck = FrenchDeck() + print (deck[0]) + + from random import choice + print(choice(deck)) + print(choice(deck)) + print(choice(deck)) + + print(deck[:3]) + print(deck[5:9]) + + for card in reversed(deck[:5]): + print (card) + + print(Card('Q','hearts') in deck) + print(Card("O",'hearts') in deck) + + # Ordenamos lo que mas vale son los ases y dentro de etsto el de espadas + suit_values= dict(spades=3,hearts=2,diamonds=1,clubs=0) + + def spades_high(card): + rank_value = FrenchDeck.ranks.index(card.rank) + return rank_value*len(suit_values) + suit_values[card.suit] + + for card in sorted(deck, key=spades_high): + print(card) + + diff --git a/01-data-model/vector2d.py b/01-data-model/vector2d.py index 178f498..1e45c81 100644 --- a/01-data-model/vector2d.py +++ b/01-data-model/vector2d.py @@ -13,7 +13,7 @@ def __abs__(self): return hypot(self.x, self.y) def __bool__(self): - return bool(abs(self)) + return bool(abs(self)) # 0 retorna falso el resto retorna true def __add__(self, other): x = self.x + other.x @@ -22,3 +22,15 @@ def __add__(self, other): def __mul__(self, scalar): return Vector(self.x * scalar, self.y * scalar) + +if __name__=='__main__': + v = Vector(3,4) + print(abs(v)) + print(v * 3) + v2 = Vector(3,9) + print(v+v2) + v3 = Vector() + if bool(v3): + print ('Vacio') + else: + print('No vacio') \ No newline at end of file