Increase the window size a bit

[wordgame] / rack.c

diff --git a/rack.c b/rack.c
index fa0cdc1f6f45873770685d1cca05612bd4b9c6cd..f7203f8806daf9a49434618ea5145bb8b8f60acf 100644 (file)
--- a/rack.c
+++ b/rack.c
@@ -1,7 +1,7 @@
 /*
  * Copyright © 2006 Carl Worth
  *
- * This program is free software; you can redistribute it and\/or modify
+ * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
@@ -23,78 +23,6 @@
 #include <sys/time.h>
 #include <time.h>
 
-char bag_orig[101] =
-"AAAAAAAAABBCCDDDDEEEEEEEEEEEEFFGGGHHIIIIIIIIIJKLLLL"
-"MMNNNNNNOOOOOOOOPPQRRRRRRSSSSTTTTTTUUUUVVWWXYYZ??";
-
-static int
-rand_within (int num_values)
-{
-    return (int) ((double) num_values * (rand() / (RAND_MAX + 1.0)));
-}
-
-static void
-shuffle (char *array, int length)
-{
-    int i, r, tmp;
-
-    for (i = 0; i < length; i++)
-    {
-       r = i + rand_within (length - i);
-       tmp = array[i];
-       array[i] = array[r];
-       array[r] = tmp;
-    }
-}
-
-static const char *subanagram_anagram;
-static char subanagram_enumerate_word[WORD_GAME_MAX_WORD_LENGTH];
-static dict_t *subanagram_enumerate_answers;
-
-static void
-subanagram_enumerate (dict_cursor_t     cursor,
-                     uint8_t            seen)
-{
-    char c;
-    unsigned int i, last;
-    uint8_t next_seen;
-
-    if (cursor == DICT_CURSOR_NIL)
-       return;
-
-    if (DICT_ENTRY_IS_WORD (dict_cursor_resolve (cursor)))
-       dict_add_word (subanagram_enumerate_answers, subanagram_enumerate_word);
-
-    last = strlen (subanagram_enumerate_word);
-
-    for (i = 0; i < strlen (subanagram_anagram); i++) {
-       if (seen & (1 << i))
-           continue;
-       next_seen = seen | (1 << i);
-       c = subanagram_anagram[i];
-       if (c == '?' || c == '_') {
-           for (c = 'a'; c <= 'z'; c++) {
-               subanagram_enumerate_word[last] = c;
-               subanagram_enumerate (dict_cursor_next (cursor, c), next_seen);
-           }
-       } else {
-           subanagram_enumerate_word[last] = c;
-           subanagram_enumerate (dict_cursor_next (cursor, c), next_seen);
-       }
-       subanagram_enumerate_word[last] = '\0';
-    }
-}
-
-static void
-subanagram_expand (const char *anagram, dict_t *dict, dict_t *answers)
-{
-    subanagram_anagram = anagram;
-    memset (subanagram_enumerate_word, '\0', WORD_GAME_MAX_WORD_LENGTH);
-    subanagram_enumerate_answers = answers;
-
-    subanagram_enumerate (dict_root (dict), 0);
-}
-
 static int
 character_compare (const void *_a,
                   const void *_b)
@@ -114,15 +42,16 @@ main (void)
 {
     dict_t dict, solution;
     struct timeval tv;
-    char bag[100], rack[8];
+    bag_t bag;
+    char rack[8];
 
     gettimeofday (&tv, NULL);
     srand (tv.tv_sec ^ tv.tv_usec);
 
-    memcpy (bag, bag_orig, 100);
-    shuffle (bag, 100);
+    bag_init (&bag);
+    bag_shuffle (&bag);
 
-    memcpy (rack, bag, 7);
+    memcpy (rack, bag.tiles, 7);
     rack[7] = '\0';
     qsort (rack, 7, 1, character_compare);