X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=grid.c;h=acfee21831118ef1f1c28df7d975639b1fcee0fb;hb=c0136554ee870455bf1d1b527d7a724beda989b3;hp=8f30a1b9082ab8f82da1580cca146440a5c7767c;hpb=bcb7792b716e8903450e023cd4648fb89a6434ce;p=wordgame

diff --git a/grid.c b/grid.c
index 8f30a1b..acfee21 100644
--- a/grid.c
+++ b/grid.c
@@ -16,26 +16,28 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
  */
 
-#include "word-game.h"
+#include "grid.h"
 
 #include <string.h>
 #include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
+#include <assert.h>
 
-char *cube_faces[16] = {
+#define GRID_CUBES_MAX (GRID_SIZE_MAX * GRID_SIZE_MAX)
+
+char *cubes4[16] = {
     "aaeeng", "abbjoo", "achops", "affkps",
     "aoottw", "cimotu", "deilrx", "delrvy",
     "distty", "eeghnw", "eeinsu", "ehrtvw",
     "eiosst", "elrtty", "himnqu", "hlnnrz"
 };
 
-typedef struct _grid {
-    char letters[4][4];
-
-    /* Private, transient state used by enumerate */
-    dict_t *results;
-} grid_t;
+char *cubes5[25] = {
+    "aaafrs", "aaeeee", "aafirs", "adennn", "aeeeem",
+    "aeegmu", "aegmnn", "afirsy", "bjkqxz", "ccnstw",
+    "ceiilt", "ceilpt", "ceipst", "ddlnor", "dhhlor",
+    "dhhnot", "dhlnor", "eiiitt", "emottt", "ensssu",
+    "fiprsy", "gorrvw", "hiprry", "nootuw", "ooottu"
+};
 
 static int
 rand_within (int num_values)
@@ -57,38 +59,42 @@ shuffle (int *array, int length)
     }
 }
 
-static void
-grid_init (grid_t *grid)
+void
+grid_init (grid_t *grid, int size)
 {
     int i;
-    int cubes[16];
+    int cubes[GRID_CUBES_MAX];
+    char **cubes_source;
+    int num_cubes;
+
+    assert (size == 4 || size == 5);
+
+    grid->size = size;
+    num_cubes = size * size;
 
-    for (i = 0; i < 16; i++)
+    if (size == 4)
+	cubes_source = cubes4;
+    else 
+	cubes_source = cubes5;
+
+    for (i = 0; i < num_cubes; i++)
 	cubes[i] = i;
-    shuffle (cubes, 16);
+    shuffle (cubes, num_cubes);
  
-    for (i = 0; i < 16; i++)
-	grid->letters[i / 4][i % 4] = cube_faces[cubes[i]][rand_within(6)];
+    for (i = 0; i < num_cubes; i++)
+	grid->letters[i / grid->size][i % grid->size] =
+	    cubes_source[cubes[i]][rand_within(6)];
 }
 
-/* (  3 chars per cell
- *  x 4 cells per row
- *  + 1 newline per row
- * ) x 4 rows per grid
- *   + 1 terminator character
- * = 53
- */
-#define GRID_STRING_MAX 53
-static void
-grid_to_string (grid_t	*grid,
-		char	 grid_string[GRID_STRING_MAX])
+char *
+grid_string (grid_t *grid)
 {
     char c;
     int x, y;
-    char *s = &grid_string[0];
+    char *s = grid->string;
 
-    for (y = 0; y < 4; y++) {
-	for (x = 0; x < 4; x++) {
+    for (y = 0; y < grid->size; y++) {
+	for (x = 0; x < grid->size; x++) {
 	    c = grid->letters[y][x];
 	    *s++ = ' ';
 	    *s++ = toupper (c);
@@ -101,14 +107,16 @@ grid_to_string (grid_t	*grid,
 	    *s++ = '\n';
     }
     *s = '\0';
+
+    return grid->string;
 }
 
-#define SEEN_BIT(x, y) (1 << (4*(y)+(x)))
+#define SEEN_BIT(x, y) (1 << ((grid->size)*(y)+(x)))
 static void
 grid_enumerate (grid_t		*grid,
 		int		 x,
 		int		 y,
-		int16_t		 seen,
+		int32_t		 seen,
 		char		*word,
 		dict_cursor_t	 dict_cursor)
 {
@@ -118,8 +126,8 @@ grid_enumerate (grid_t		*grid,
     if (dict_cursor == DICT_CURSOR_NIL)
 	return;
 
-    if (x < 0 || x >= 4 ||
-	y < 0 || y >= 4 ||
+    if (x < 0 || x >= grid->size ||
+	y < 0 || y >= grid->size ||
 	seen & SEEN_BIT (x, y))
     {
 	return;
@@ -151,47 +159,18 @@ grid_enumerate (grid_t		*grid,
     word [strlen (word) - 1] = '\0';
 }
 
-static void
+void
 grid_solve (grid_t *grid, dict_t *dict, dict_t *solution)
 {
     int x, y;
-    int16_t seen = 0;
+    int32_t seen = 0;
     char word[18];
 
     grid->results = solution;
 
     memset (word, '\0', 18);
 
-    for (y = 0; y < 4; y++)
-	for (x = 0; x < 4; x++)
+    for (y = 0; y < grid->size; y++)
+	for (x = 0; x < grid->size; x++)
 	    grid_enumerate (grid, x, y, seen, word, dict_root (dict));
 }
-
-#define GAME_LENGTH (3 * 60)
-int
-main (void)
-{
-    dict_t dict, solution;
-    grid_t grid;
-    char grid_string[GRID_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");
-
-    grid_init (&grid);
-    grid_to_string (&grid, grid_string);
-
-    dict_init (&solution);
-    grid_solve (&grid, &dict, &solution);
-
-    word_game_play (grid_string, &dict, &solution, GAME_LENGTH);
-
-    dict_fini (&solution);
-    dict_fini (&dict);
-
-    return 0;
-}