diff --git a/src/main/java/deck/Card.java b/src/main/java/deck/Card.java index 8ed6d61..ec9d94f 100644 --- a/src/main/java/deck/Card.java +++ b/src/main/java/deck/Card.java @@ -19,4 +19,28 @@ public Rank getRank() { public Suit getSuit() { return suit; } + + @Override + public String toString() { + return rank + " of " + suit; + } + + @Override + public int hashCode() { + return suit.hashCode()*rank.hashCode(); + } + + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + else if (!(other instanceof Card)) { + return false; + } + else { + return suit.equals(((Card) other).suit) + && rank.equals(((Card) other).rank); + } + } } diff --git a/src/main/java/deck/Deck.java b/src/main/java/deck/Deck.java index 1f2197a..8f04cfb 100644 --- a/src/main/java/deck/Deck.java +++ b/src/main/java/deck/Deck.java @@ -25,6 +25,13 @@ private void addAllSuit(Suit suit) { } } + @Override + public String toString() { + final StringBuilder stringBuilder = new StringBuilder(); + deck.forEach(card -> stringBuilder.append(card.toString() + "\n")); + return stringBuilder.toString(); + } + public void shuffle() { Collections.shuffle(deck); } diff --git a/src/main/java/gametypes/NLimitHoldem/Hand.java b/src/main/java/gametypes/NLimitHoldem/Hand.java index be12f7b..042dd54 100644 --- a/src/main/java/gametypes/NLimitHoldem/Hand.java +++ b/src/main/java/gametypes/NLimitHoldem/Hand.java @@ -1,7 +1,12 @@ package gametypes.NLimitHoldem; +import deck.Card; + +import java.util.Iterator; + /** * Created by oliv on 6/28/15. */ public class Hand { + }