X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=grid.c;h=76428d98bad2b6275c635f635bbef7fdc0d4b852;hb=95950fcacd327b24eb22bad24d15f377c0640e2c;hp=78c6c56d1370564c5165541a37f5be2192346174;hpb=17755d5a91f1470057bf2308984a25e7432bcd8a;p=wordgame diff --git a/grid.c b/grid.c index 78c6c56..76428d9 100644 --- a/grid.c +++ b/grid.c @@ -16,17 +16,12 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." */ -#include -#include +#include "word-game.h" + +#include #include #include #include -#include - -#include -#include - -#include "dict.h" char *cube_faces[16] = { "aaeeng", "abbjoo", "achops", "affkps", @@ -39,16 +34,16 @@ typedef struct _board { char letters[4][4]; /* Private, transient state used by enumerate */ - trie_t *result_trie; + dict_t *results; } board_t; -int +static int rand_within (int num_values) { return (int) ((double) num_values * (rand() / (RAND_MAX + 1.0))); } -void +static void shuffle (int *array, int length) { int i, r, tmp; @@ -62,7 +57,7 @@ shuffle (int *array, int length) } } -void +static void board_init (board_t *board) { int i; @@ -76,36 +71,53 @@ board_init (board_t *board) board->letters[i / 4][i % 4] = cube_faces[cubes[i]][rand_within(6)]; } -void -board_print (board_t *board) +/* ( 3 chars per cell + * x 4 cells per row + * + 1 newline per row + * ) x 4 rows per board + * + 1 terminator character + * = 53 + */ +#define BOARD_STRING_MAX 53 +static void +board_to_string (board_t *board, + char board_string[BOARD_STRING_MAX]) { - int x, y; char c; + int x, y; + char *s = &board_string[0]; - printf ("\n"); for (y = 0; y < 4; y++) { for (x = 0; x < 4; x++) { c = board->letters[y][x]; - printf (" %c%s", toupper (c), - c == 'q' ? "u" : " "); + *s++ = ' '; + *s++ = toupper (c); + if (c == 'q') + *s++ = 'u'; + else + *s++ = ' '; } - printf ("\n"); + if (y != 3) + *s++ = '\n'; } - printf ("\n"); + *s = '\0'; } #define SEEN_BIT(x, y) (1 << (4*(y)+(x))) -void +static void board_enumerate (board_t *board, int x, int y, int16_t seen, - string_t *word, - trie_t *dict_trie) + char *word, + dict_cursor_t dict_cursor) { char c; int dx, dy; + if (dict_cursor == DICT_CURSOR_NIL) + return; + if (x < 0 || x >= 4 || y < 0 || y >= 4 || seen & SEEN_BIT (x, y)) @@ -116,126 +128,66 @@ board_enumerate (board_t *board, seen |= SEEN_BIT (x, y); c = board->letters[y][x]; - string_append_char (word, c); - dict_trie = dict_trie->next[TRIE_CHAR_TO_INDEX (c)]; - if (dict_trie == NULL) - goto BAIL0; + word[strlen (word)] = c; + dict_cursor = dict_cursor_next (dict_cursor, c); if (c == 'q') { - string_append_char (word, 'u'); - dict_trie = dict_trie->next[TRIE_CHAR_TO_INDEX ('u')]; - if (dict_trie == NULL) - goto BAIL1; + word[strlen (word)] = 'u'; + dict_cursor = dict_cursor_next (dict_cursor, 'u'); } - if (dict_trie->flags & TRIE_FLAGS_IS_WORD) - trie_add (board->result_trie, word->s); + if (DICT_ENTRY_IS_WORD (dict_cursor_resolve (dict_cursor))) + dict_add_word (board->results, word); for (dy = -1; dy <= 1; dy++) for (dx = -1; dx <= 1; dx++) - board_enumerate (board, x + dx, y + dy, seen, word, dict_trie); + board_enumerate (board, x + dx, y + dy, seen, word, dict_cursor); - BAIL1: if (c == 'q') - string_chop (word); - BAIL0: - string_chop (word); + word [strlen (word) - 1] = '\0'; + word [strlen (word) - 1] = '\0'; } -void -board_solve (board_t *board, dict_t *dict, trie_t *solution) +static void +board_solve (board_t *board, dict_t *dict, dict_t *solution) { int x, y; int16_t seen = 0; - string_t word; + char word[18]; - board->result_trie = solution; + board->results = solution; - string_init (&word); + memset (word, '\0', 18); for (y = 0; y < 4; y++) for (x = 0; x < 4; x++) - board_enumerate (board, x, y, seen, &word, dict->trie); - - string_fini (&word); + board_enumerate (board, x, y, seen, word, dict_root (dict)); } #define GAME_LENGTH (3 * 60) int main (void) { - dict_t dict; + dict_t dict, solution; board_t board; - trie_t *solution; - struct timeval tv, tv_stop; - int remaining, minutes, seconds; - int found, missed; - char prompt[7], *response; - string_t word; + char board_string[BOARD_STRING_MAX]; + struct timeval tv; gettimeofday (&tv, NULL); srand (tv.tv_sec ^ tv.tv_usec); dict_init (&dict); dict_add_words_from_file (&dict, "words.txt"); - board_init (&board); - solution = trie_create (); - board_solve (&board, &dict, solution); + board_init (&board); + board_to_string (&board, board_string); - board_print (&board); + dict_init (&solution); + board_solve (&board, &dict, &solution); - gettimeofday (&tv, NULL); - tv_stop = tv; - tv_stop.tv_sec += GAME_LENGTH; - remaining = GAME_LENGTH; - do { - minutes = remaining / 60; - seconds = remaining % 60; - sprintf (prompt, "%02d:%02d ", minutes, seconds); - response = readline (prompt); - add_history (response); - chomp (response); - if (strlen (response) == 0) { - board_print (&board); - } else { - trie_t *t; - t = trie_find (solution, response); - if (t && (t->flags & TRIE_FLAGS_IS_WORD)) { - if (t->flags & TRIE_FLAGS_SEEN) - printf ("(repeat)\n"); - else - t->flags |= TRIE_FLAGS_SEEN; - } else { - t = trie_find (dict.trie, response); - if (t && (t->flags & TRIE_FLAGS_IS_WORD)) - printf ("(a good word, but it's not in the puzzle)\n"); - else - printf ("*** %s is not a word\n", response); - } - } - free (response); - gettimeofday (&tv, NULL); - remaining = floor (0.5 + (tv_stop.tv_sec - tv.tv_sec) + (tv_stop.tv_usec - tv.tv_usec) / 1000000.0); - minutes = remaining / 60; - } while (remaining > 0); - - printf ("\nWords you found:\n"); - string_init (&word); - found = trie_print_seen (solution, &word); - string_fini (&word); - printf ("\n"); - - printf ("\nWords you missed:\n"); - string_init (&word); - missed = trie_print_unseen (solution, &word); - string_fini (&word); - printf ("\n"); - - printf ("\nYou found %d of %d words (%.2f%%)\n", - found, found + missed, - 100 * (double) found / (found + missed)); + word_game_play (board_string, &dict, &solution, GAME_LENGTH); + dict_fini (&solution); dict_fini (&dict); return 0;