ch12 revisions

ChrisMayfield · ChrisMayfield · commit 3e9b0a3f3f7c · 2020-06-15T14:03:21.000-04:00
diff --git a/ch12/CardTable.java b/ch12/CardTable.java
@@ -15,11 +15,13 @@ public class CardTable extends Canvas {
      * Creates a CardTable.
      * cardset is the name of the folder that contains the card images.
      */
-    public CardTable(String cardset) {
+    public CardTable() {
         setBackground(new Color(0x088A4B));
 
         // create a 2-D array of card images
         images = new Image[14][4];
+
+        String cardset = "cardset-oxymoron";
         String suits = "cdhs";
 
         for (int suit = 0; suit <= 3; suit++) {
@@ -81,8 +83,7 @@ public static void main(String[] args) {
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
         // add the CardTable
-        String cardset = "cardset-oxymoron";
-        Canvas canvas = new CardTable(cardset);
+        Canvas canvas = new CardTable();
         frame.getContentPane().add(canvas);
 
         // show the frame
diff --git a/ch12/Search.java b/ch12/Search.java
@@ -62,28 +62,6 @@ public static int binarySearch(Card[] cards, Card target) {
         return -1;
     }
 
-    /**
-     * Binary search (recursive version).
-     */
-    public static int binarySearch(Card[] cards, Card target,
-                                   int low, int high) {
-        System.out.println(low + ", " + high);
-
-        if (high < low) {
-            return -1;
-        }
-        int mid = (low + high) / 2;                     // step 1
-        int comp = cards[mid].compareTo(target);
-
-        if (comp == 0) {                                // step 2
-            return mid;
-        } else if (comp < 0) {                          // step 3
-            return binarySearch(cards, target, mid + 1, high);
-        } else {                                        // step 4
-            return binarySearch(cards, target, low, mid - 1);
-        }
-    }
-
     /**
      * Demonstrates how to call the search methods.
      */
@@ -103,10 +81,6 @@ public static void main(String[] args) {
         System.out.println("Failed binary search");
         System.out.println(binarySearch(cards, fake));
         System.out.println();
-
-        System.out.println("Recursive binary search");
-        System.out.println(binarySearch(cards, jack, 0, 51));
-        System.out.println();
     }
 
 }
