add Foundation

diff --git a/src/solitaire/Card.java b/src/solitaire/Card.java
index ec6efcfad09442b6eb63b897e9a61435270a7232..bace9aeaa2636f0c91301ad82762302eaa011200 100644 (file)
--- a/src/solitaire/Card.java
+++ b/src/solitaire/Card.java
@@ -34,8 +34,8 @@ final class Card {
     @Override
     public String toString() {
        if (isHidden())
     @Override
     public String toString() {
        if (isHidden())

-           return "[ * ]";
+           return " * ";

 
 

-       return String.format("[%s%2s]", suit, rank);
+       return String.format("%s%2s", suit, rank);

     }
 }
     }
 }

diff --git a/src/solitaire/Foundation.java b/src/solitaire/Foundation.java
new file mode 100644 (file)
index 0000000..54d4162
--- /dev/null
+++ b/src/solitaire/Foundation.java
@@ -0,0 +1,54 @@
+package solitaire;
+
+import java.util.LinkedList;
+import java.util.List;
+
+final class Foundation {
+    private final List<Card> cards;
+    private final Suit suit;
+
+    Foundation(Suit suit) {
+       this.cards = new LinkedList<>();
+       this.suit = suit;
+    }
+
+    Suit getSuit() {
+       return suit;
+    }
+
+    boolean isFull() {
+       return cards.size() == Rank.RANKS.size();
+    }
+
+    private boolean isValidNextCard(Card card) {
+       Rank cardRank, lastRank;
+
+       if (card.getSuit() != this.suit)
+           return false;
+
+       cardRank = card.getRank();
+
+       if (cards.isEmpty())
+           return cardRank == Rank.ACE;
+
+       lastRank = cards.getLast().getRank();
+
+       return cardRank.isSuccessorOf(lastRank);
+    }
+
+    boolean add(Card card) {
+       if (!isValidNextCard(card))
+           return false;
+
+       cards.add(card);
+       return true;
+    }
+
+    @Override
+    public String toString() {
+       if (cards.isEmpty())
+           return String.format("( %s )", suit);
+
+       return String.format("(%s)", cards.getLast());
+    }
+}

diff --git a/src/solitaire/Main.java b/src/solitaire/Main.java
index 75d65d91e811a60512c809fd2c313dc5d003cf1b..18e5629ae26e12f83d83639463d8358877b42fd8 100644 (file)
--- a/src/solitaire/Main.java
+++ b/src/solitaire/Main.java
@@ -3,9 +3,10 @@ package solitaire;
 class Main {
     private static Stock stock = new Stock();
     private static Waste waste = new Waste();
 class Main {
     private static Stock stock = new Stock();
     private static Waste waste = new Waste();

+    private static Foundation foundation = new Foundation(Suit.CLUBS);

 
     private static void printTable() {
 
     private static void printTable() {

-       System.out.printf("%s   %s\n", stock, waste);
+       System.out.printf("%s  %s\n\n%s\n\n", stock, waste, foundation);

     }
 
     public static void main(String[] args) {
     }
 
     public static void main(String[] args) {


@@ -16,7 +17,9 @@ class Main {
 
            c = stock.draw();
            c.reveal();
 
            c = stock.draw();
            c.reveal();

-           waste.add(c);
+
+           if (!foundation.add(c))
+               waste.add(c);

        }
 
        printTable();
        }
 
        printTable();

diff --git a/src/solitaire/Rank.java b/src/solitaire/Rank.java
index 0bd1c2508d9ac77b5c29002b13e82ea4a3f949ee..f85d1d2713d2d6681901721482085d6484faa1c8 100644 (file)
--- a/src/solitaire/Rank.java
+++ b/src/solitaire/Rank.java
@@ -14,6 +14,10 @@ enum Rank {
        this.symbol = symbol;
     }
 
        this.symbol = symbol;
     }
 

+    boolean isSuccessorOf(Rank rank) {
+       return this.ordinal() == rank.ordinal() + 1;
+    }
+

     @Override
     public String toString() {
        return symbol;
     @Override
     public String toString() {
        return symbol;

diff --git a/src/solitaire/Stock.java b/src/solitaire/Stock.java
index 3f3a951e355e6bf2234d7eb577f871136db79b23..91907fbee4c4a2fe4109de47c040e0271a9112da 100644 (file)
--- a/src/solitaire/Stock.java
+++ b/src/solitaire/Stock.java
@@ -30,6 +30,6 @@ final class Stock {
        if (isEmpty())
            return "{   }";
 
        if (isEmpty())
            return "{   }";
 

-       return "{ * }";
+       return String.format("{%s}", cards.getLast());

     }
 }
     }
 }

diff --git a/src/solitaire/Waste.java b/src/solitaire/Waste.java
index 763fea9cd6ead3e523be57b4dd71bfa743ada70d..24ee6f5e7c61fbc34fb0077e77510c4c96617805 100644 (file)
--- a/src/solitaire/Waste.java
+++ b/src/solitaire/Waste.java
@@ -28,6 +28,6 @@ final class Waste {
        if (isEmpty())
            return "{   }";
 
        if (isEmpty())
            return "{   }";
 

-       return cards.stream().map(String::valueOf).collect(Collectors.joining("", "{ ", " }"));
+       return cards.stream().map(String::valueOf).collect(Collectors.joining("|", "[", "]"));

     }
 }
     }
 }