From: Carl Worth <cworth@cworth.org>
Date: Wed, 14 Feb 2007 17:01:59 +0000 (-0800)
Subject: Merge branch 'master' of kevin:kub
X-Git-Url: https://git.cworth.org/git?p=kub;a=commitdiff_plain;h=80d1bc0be0fd7f098e3c5a1928bb3691b43fe051;hp=956338e0192faa969bef2e4bcb965aa9100bff49

Merge branch 'master' of kevin:kub

Conflicts:

	kub.c
---

diff --git a/.gitignore b/.gitignore
index d6ff91a..788a15e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+kub
 *~
 *.o
diff --git a/kub.c b/kub.c
index 88b678e..cf3c895 100644
--- a/kub.c
+++ b/kub.c
@@ -112,18 +112,25 @@ static int card_group_is_run_two(card_group_t *card_group)
     int lowest = 14, highest = 0;
     color_t run_color;
 
-    if (card_group->num_cards > 13 || card_group->num_cards < 3)
+    /* By definition, a run must have at least 3 cards. Also, it's
+     * impossible for any group of cards with more than 13 cards to be
+     * a run, (there are only 13 unique numbers so a group with more
+     * than 13 cards must have some duplicates).
+     */
+    if (card_group->num_cards < 3 || card_group->num_cards > 13)
     {
 	return 0;
     }
 
+    /* Loop through all cards in the group, ensuring that they are all
+     * the same color and finding the highest and lowest number in the
+     * group. */
     run_color = card_group->cards[0].color;
 
     for (i = 0; i < card_group->num_cards; i++)
     {
 	if (card_group->cards[i].color != run_color)
 	    return 0;
-
 	if (card_group->cards[i].number > highest)
 	{
 	    highest = card_group->cards[i].number;
@@ -133,10 +140,31 @@ static int card_group_is_run_two(card_group_t *card_group)
 	    lowest = card_group->cards[i].number;
 	}
     }
+
+    /* For a run, the difference between the highest and lowest cards
+     * will always be one less than the number of cards in the
+     * group. If not then we know it's not a run.
+     */
     if (highest - lowest != card_group->num_cards - 1)
     {
 	return 0;
     }
+
+    /* XXX: There's a bug here. We're guessing that at this point
+     * anything we're looking at must be a run. This would be correct
+     * if there were no duplicate cards, but since there are
+     * duplicates this us quite broken. For example consider two
+     * sequences of entirely red cards:
+     *
+     * This is a run:   1, 2, 3, 4
+     * But this is not: 1, 3, 4, 4
+     *
+     * As currently written, this function will consider both of these
+     * groups to be a run. One possible fix is to throw away the
+     * highest - lowest heuristic and instead simply sort the cards up
+     * front and ensure the difference between each adjacent pair is
+     * exactly 1.
+     */
     return 1;
 }