Was adding wrong edge

Bump version to 1.6

.gitignore

@@ -16,3 +16,6 @@ mazemaker
 *.so
 *.so.*
 logs
+.ninja_deps
+.ninja_log
+build.ninja

CMakeLists.txt

@@ -1,11 +1,14 @@
 cmake_minimum_required (VERSION 3.0)
 cmake_policy(VERSION 3.0)
-project (mazemaker VERSION 1.5)
+project (mazemaker VERSION 1.6)
 
 SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE)
 SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE)
 SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH  "Installation prefix for object code libraries" FORCE)
 
+set(CMAKE_MACOSX_RPATH 1)
+set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mazemaker.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/mazemaker.pc)
 
 link_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/lib)

include/mazemaker.h

@@ -25,6 +25,7 @@ typedef enum {
 typedef struct mazeoptions mazeoptions_t;
 
 void mazemaker_generate_maze(int width, int height, mazegrid_t* result);
+void mazemaker_generate_maze_opt(int width, int height, mazegrid_t* result, mazeoptions_t const*);
 void mazemaker_free_maze(mazegrid_t* maze);
 int mazemaker_maze_to_png(mazegrid_t const* maze, char const* filename);
 int mazemaker_maze_to_png_opt(mazegrid_t const* maze, char const* filename, mazeoptions_t const*);
@@ -35,5 +36,6 @@ mazeoptions_t* mazemaker_options_new();
 void mazemaker_options_free(mazeoptions_t*);
 int mazemaker_options_set_wall_color(mazeoptions_t*, char const* color_desc);
 int mazemaker_options_set_background_color(mazeoptions_t*, char const* color_desc);
+void mazemaker_options_set_seed(mazeoptions_t*, unsigned int seed);
 
 #endif // !def(_MAZEMAKER_H)

lib/CMakeLists.txt

@@ -15,6 +15,7 @@ find_package(PkgConfig REQUIRED)
 pkg_search_module(PNG REQUIRED libpng)
 
 check_symbol_exists(arc4random_uniform "stdlib.h" HAVE_ARC4RANDOM)
+check_symbol_exists(srand_deterministic "stdlib.h" HAVE_SRAND_DETERMINISTIC)
 
 configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
                 "${CMAKE_CURRENT_SOURCE_DIR}/config.h" )

lib/config.h.in

@@ -1 +1,2 @@
-#cmakedefine HAVE_ARC4RANDOM "@HAVE_ARC4RANDOM@"
+#cmakedefine HAVE_ARC4RANDOM @HAVE_ARC4RANDOM@
+#cmakedefine HAVE_SRAND_DETERMINISTIC @HAVE_SRAND_DETERMINISTIC@

lib/grid.c

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include "grid.h"
+#include "options.h"
 #include "config.h"
 
 #define MAX_EDGE_WEIGHT 100
@@ -19,14 +20,25 @@
 #define HORIZONTAL_HALF_LEFT "\xe2\x95\xb8"
 #define HORIZONTAL_HALF_RIGHT "\xe2\x95\xba"
 
-static edgeweight_t random_edgeweight() {
+static edgeweight_t random_edgeweight(mazeoptions_t const* options) {
+    if (!options->seed_set) {
 #ifdef HAVE_ARC4RANDOM
         return arc4random_uniform(MAX_EDGE_WEIGHT);
 #else // HAVE_ARC4RANDOM
         return random()%MAX_EDGE_WEIGHT;
 #endif // HAVE_ARC4RANDOM
+    } else {
+        // use deterministic random number generator
+        return rand()%MAX_EDGE_WEIGHT;
+    }
 }
 
+#ifdef HAVE_SRAND_DETERMINISTIC
+#define SRAND(x) (srand_deterministic(x))
+#else
+#define SRAND(x) (srand(x))
+#endif // defined(HAVE_SRAND_DETERMINISTIC)
+
 mazegrid_t mazegrid_new(size_t width, size_t height) {
     mazeedges_t** grid = calloc(height, sizeof(mazeedges_t*));
     for (size_t i = 0; i < height; i++) {
@@ -72,11 +84,16 @@ edgeweight_t mazegrid_get_edge(mazegrid_t const* g, size_t x, size_t y, mazeedge
     else return g->grid[y][x].up;
 }
 
-void mazegrid_randomize(mazegrid_t* g) {
+void mazegrid_randomize(mazegrid_t* g, mazeoptions_t const* options) {
+    // initialize random system
+    if (options->seed_set) {
+        SRAND(options->seed);
+    }
+
     for (size_t i = 0; i < g->height; i++) {
         for (size_t j = 0; j < g->width; j++) {
-            if (i < g->height - 1) g->grid[i][j].up = random_edgeweight();
-            if (j < g->width - 1) g->grid[i][j].right = random_edgeweight();
+            if (i < g->height - 1) g->grid[i][j].up = random_edgeweight(options);
+            if (j < g->width - 1) g->grid[i][j].right = random_edgeweight(options);
         }
     }
 }

lib/grid.h

@@ -10,7 +10,7 @@ void mazegrid_free(mazegrid_t* g);
 int mazegrid_set_edge(mazegrid_t* g, size_t x, size_t y, mazeedge_dir_t dir, edgeweight_t wt);
 edgeweight_t mazegrid_get_edge(mazegrid_t const* g, size_t, size_t y, mazeedge_dir_t dir);
 
-void mazegrid_randomize(mazegrid_t* g);
+void mazegrid_randomize(mazegrid_t* g, mazeoptions_t const* options);
 void mazegrid_uniform(mazegrid_t* g);
 
 void mazegrid_print(mazegrid_t const* g, FILE * f);

lib/maze.c

@@ -1,13 +1,21 @@
 #include <mazemaker.h>
+#include <stdlib.h>
 #include "grid.h"
 #include "prim.h"
 
-void mazemaker_generate_maze(int width, int height, mazegrid_t* result) {
+void mazemaker_generate_maze_opt(int width, int height, mazegrid_t* result, mazeoptions_t const* options) {
     mazegrid_t g = mazegrid_new(width, height);
-    mazegrid_randomize(&g);
+    mazegrid_randomize(&g, options);
     prim(&g, result);
     mazegrid_free(&g);
 }
+
+void mazemaker_generate_maze(int width, int height, mazegrid_t* result) {
+    mazeoptions_t* options = mazemaker_options_new(); // use defaults
+    mazemaker_generate_maze_opt(width, height, result, options);
+    mazemaker_options_free(options);
+}
+
 void mazemaker_free_maze(mazegrid_t* maze) {
     mazegrid_free(maze);
 }

lib/options.c

@@ -10,6 +10,8 @@ mazeoptions_t* mazemaker_options_new() {
     // set defaults
     memset(result->wall_color, 0, 3);
     memset(result->background_color, 0xff, 3);
+    result->seed = 0;
+    result->seed_set = false;
 
     return result;
 }
@@ -78,3 +80,7 @@ int mazemaker_options_set_background_color(mazeoptions_t* options, char const* c
     return stringToColor(color_desc, options->background_color);
 }
 
+void mazemaker_options_set_seed(mazeoptions_t* options, rand_seed_t seed) {
+    options->seed = seed;
+    options->seed_set = true;
+}

lib/options.h

@@ -2,12 +2,16 @@
 #define _OPTIONS_H 1
 
 #include <stdint.h>
+#include <stdbool.h>
 
 typedef uint8_t rgb_color_t[3];
+typedef unsigned int rand_seed_t;
 
 typedef struct mazeoptions {
     rgb_color_t wall_color;
     rgb_color_t background_color;
+    rand_seed_t seed;
+    bool seed_set;
 } mazeoptions_t;
 
 #endif // !def(_OPTIONS_H)

lib/pq.c

@@ -1,110 +0,0 @@
-#include <stdlib.h>
-#include "pq.h"
-
-typedef struct {
-    unsigned int priority;
-    size_t x, y;
-    mazeedge_dir_t dir;
-} _point_t;
-
-struct pq {
-    size_t heap_size, next;
-    _point_t* heap; 
-};
-
-struct pq* pq_new(size_t heap_size) {
-    struct pq* result = malloc(sizeof(struct pq));
-    result->heap_size = heap_size;
-    result->next = 0;
-    result->heap = calloc(heap_size, sizeof(_point_t));
-    return result;
-}
-
-static void _swap(struct pq* q, size_t idx1, size_t idx2) {
-    unsigned int priority = q->heap[idx1].priority;
-    size_t x = q->heap[idx1].x;
-    size_t y = q->heap[idx1].y;
-    mazeedge_dir_t dir = q->heap[idx1].dir;
-
-    q->heap[idx1].priority = q->heap[idx2].priority;
-    q->heap[idx1].x = q->heap[idx2].x;
-    q->heap[idx1].y = q->heap[idx2].y;
-    q->heap[idx1].dir = q->heap[idx2].dir;
-
-    q->heap[idx2].priority = priority;
-    q->heap[idx2].x = x;
-    q->heap[idx2].y = y;
-    q->heap[idx2].dir = dir;
-}
-
-static void _heapify_up(struct pq* q) {
-    size_t i = q->next - 1;
-    while (i > 0) {
-        size_t parent = i / 2;
-        if (q->heap[parent].priority > q->heap[i].priority) {
-            _swap(q, parent, i);
-            i = parent;
-        } else {
-            // done
-            return;
-        }
-    }
-}
-
-void pq_add(struct pq* q, unsigned int priority, size_t x, size_t y, mazeedge_dir_t dir) {
-    q->heap[q->next].x = x;
-    q->heap[q->next].y = y;
-    q->heap[q->next].priority = priority;
-    q->heap[q->next].dir = dir;
-    q->next++;
-    _heapify_up(q);
-}
-
-bool pq_empty(struct pq const* q) {
-    return q->next == 0;
-}
-
-static void _heapify_down(struct pq* q) {
-    size_t i = 0;
-    while (i < q->next) {
-        size_t ch1 = i * 2, ch2 = i * 2 + 1;
-        if (ch1 >= q->next) return;
-        if (ch2 >= q->next) {
-            if (q->heap[ch1].priority < q->heap[i].priority) {
-                _swap(q, i, ch1);
-            }
-            return;
-        }
-
-        // three-way compare
-        if ((q->heap[i].priority < q->heap[ch1].priority) &&
-            (q->heap[i].priority < q->heap[ch2].priority)) {
-            return; // all done - partial order ensured
-        }
-        if (q->heap[ch1].priority < q->heap[ch2].priority) {
-            _swap(q, i, ch1);
-            i = ch1;
-        } else {
-            _swap(q, i, ch2);
-            i = ch2;
-        }
-    }
-}
-
-int pq_pop(struct pq* q, size_t* x, size_t* y, mazeedge_dir_t* dir) {
-    if (pq_empty(q)) return 0;
-    *x = q->heap[0].x;
-    *y = q->heap[0].y;
-    *dir = q->heap[0].dir;
-    _swap(q, 0, q->next-1);
-    q->next--;
-    _heapify_down(q);
-    return 1;
-}
-
-void pq_free(struct pq* q) {
-    free(q->heap); q->heap = NULL;
-    q->heap_size = 0;
-    q->next = 0;
-    free(q);
-}

lib/pq.h

@@ -1,15 +1,101 @@
 #ifndef _PQ_H
 #define _PQ_H 1
 
-#include <stdbool.h>
-#include "grid.h"
+#include <stdlib.h>
+#include <string.h>
 
-struct pq;
+#define DEFAULT_HEAP_SIZE 16
 
-struct pq* pq_new(size_t heap_size);
-void pq_add(struct pq* q, unsigned int priority, size_t x, size_t y, mazeedge_dir_t dir);
-int pq_pop(struct pq* q, size_t* x, size_t* y, mazeedge_dir_t *dir);
-bool pq_empty(struct pq const* q);
-void pq_free(struct pq* q);
+#define DEFINE_PQ(T, N, P) \
+struct _##N##HeapNode { \
+    P priority; \
+    T data; \
+}; \
+typedef struct { \
+    size_t heap_size, next; \
+    struct _##N##HeapNode* heap; \
+} N; \
+static void _##N##_swap(N* pq, size_t i, size_t j) { \
+    struct _##N##HeapNode tmp = pq->heap[i]; \
+    pq->heap[i] = pq->heap[j]; \
+    pq->heap[j] = tmp; \
+} \
+static void _##N##_heapify_up(N* pq) { \
+    size_t i = pq->next - 1; \
+    while (i > 0) { \
+        size_t parent = i / 2; \
+        if (pq->heap[parent].priority > pq->heap[i].priority) { \
+            _##N##_swap(pq, parent, i); \
+            i = parent; \
+        } else return; \
+    } \
+} \
+static void _##N##_heapify_down(N* pq) { \
+    size_t i = 0; \
+    while (i < pq->next) { \
+        size_t ch1 = i * 2, ch2 = i * 2 + 1; \
+        if (ch1 >= pq->next) return; \
+        if (ch2 >= pq->next) { \
+            if (pq->heap[ch1].priority < pq->heap[i].priority) { \
+                _##N##_swap(pq, i, ch1); \
+            } \
+            return; \
+        } \
+        if ((pq->heap[i].priority < pq->heap[ch1].priority) && \
+            (pq->heap[i].priority < pq->heap[ch2].priority)) { \
+            return; \
+        } \
+        if (pq->heap[ch1].priority < pq->heap[ch2].priority) { \
+            _##N##_swap(pq, i, ch1); \
+            i = ch1; \
+        } else { \
+            _##N##_swap(pq, i, ch2); \
+            i = ch2; \
+        } \
+    } \
+}
+
+#define NEW_PQ(T, N) \
+    T N = (T) { .heap_size = DEFAULT_HEAP_SIZE, .next = 0, .heap = calloc(DEFAULT_HEAP_SIZE, sizeof(struct _##T##HeapNode)) }
+
+// WARNING: S cannot be an expression that has side effects!
+#define NEW_PQ_SZ(T, N, S) \
+    T N = (T) { .heap_size = (S), .next = 0, .heap = calloc((S), sizeof(struct _##T##HeapNode)) }
+
+#define PUSH_PQ(Q, N, I, P) { \
+    if ((Q).next >= (Q).heap_size) { \
+        (Q).heap = realloc((Q).heap, (Q).heap_size * 2 * sizeof(struct _##N##HeapNode)); \
+        (Q).heap_size *= 2; \
+    } \
+    (Q).heap[(Q).next].data = (I); \
+    (Q).heap[(Q).next].priority = (P); \
+    (Q).next++; \
+    _##N##_heapify_up(&(Q)); \
+}
+
+#define EMPTY_PQ(Q) ((Q).next == 0)
+
+// check for emptiness first!
+#define POP_PQ(Q, N, DST_I, DST_P) { \
+    DST_I = (Q).heap[0].data; \
+    DST_P = (Q).heap[0].priority; \
+    _##N##_swap(&(Q), 0, (Q).next-1); \
+    (Q).next--; \
+    _##N##_heapify_down(&(Q)); \
+}
+
+#define FOREACH_PQ(Q, DST_DATA, DST_P) \
+    for (size_t idx = 0; idx < (Q).next; idx++) { \
+        DST_DATA = (Q).heap[idx].data; \
+        DST_P = (Q).heap[idx].priority;
+
+#define FOREACH_PQ_END }
+
+// warning: be sure to clean up your data to avoid leaks!
+#define FREE_PQ(Q) { \
+    free((Q).heap); \
+    (Q).heap_size = 0; \
+    (Q).next = 0; \
+}
 
 #endif // !def(_PQ_H)

lib/prim.c

@@ -2,42 +2,57 @@
 #include "prim.h"
 #include "set.h"
 
+typedef struct {
+    size_t x, y;
+    mazeedge_dir_t dir;
+} _point_t;
+
+DEFINE_PQ(_point_t, PointPQ, unsigned int);
+
 void prim(mazegrid_t const* g, mazegrid_t* result) {
-    struct pq* q = pq_new(g->width*g->height*4);
+    NEW_PQ_SZ(PointPQ, q, g->width*g->height*4);
     struct node_set* s = node_set_new(g->width, g->height);
     *result = mazegrid_new(g->width, g->height);
 
     node_set_add(s, 0, 0);
-    if (g->height > 1) pq_add(q, mazegrid_get_edge(g, 0, 0, EDGE_UP), 0, 1, EDGE_DOWN);
-    if (g->width > 1) pq_add(q, mazegrid_get_edge(g, 0, 0, EDGE_RIGHT), 1, 0, EDGE_LEFT);
-
-    while (!pq_empty(q) && (node_set_size(s) < g->width * g->height)) {
-        size_t x, y;
-        mazeedge_dir_t dir;
-        pq_pop(q, &x, &y, &dir);
-
-        if (node_set_contains(s, x, y)) continue;
+    if (g->height > 1) {
+        _point_t e = { 0, 1, EDGE_DOWN };
+        PUSH_PQ(q, PointPQ, e, mazegrid_get_edge(g, 0, 0, EDGE_UP));
+    }
+    if (g->width > 1) {
+        _point_t e = { 1, 0, EDGE_LEFT };
+        PUSH_PQ(q, PointPQ, e, mazegrid_get_edge(g, 0, 0, EDGE_RIGHT));
+    }
+    while (!EMPTY_PQ(q) && (node_set_size(s) < g->width * g->height)) {
+        _point_t e;
+        unsigned int p;
+        POP_PQ(q, PointPQ, e, p);
+        if (node_set_contains(s, e.x, e.y)) continue;
 
         // add edge to tree
-        mazegrid_set_edge(result, x, y, dir, 1);
+        mazegrid_set_edge(result, e.x, e.y, e.dir, 1);
 
         // add neighbors
-        if ((x > 0) && !node_set_contains(s, x - 1, y)) {
-            pq_add(q, mazegrid_get_edge(g, x, y, EDGE_LEFT), x - 1, y, EDGE_RIGHT);
+        if ((e.x > 0) && !node_set_contains(s, e.x - 1, e.y)) {
+            _point_t pt = { e.x - 1, e.y, EDGE_RIGHT };
+            PUSH_PQ(q, PointPQ, pt, mazegrid_get_edge(g, e.x, e.y, EDGE_LEFT));
         }
-        if ((x < g->width - 1) && !node_set_contains(s, x + 1, y)) {
-            pq_add(q, mazegrid_get_edge(g, x, y, EDGE_RIGHT), x + 1, y, EDGE_LEFT);
+        if ((e.x < g->width - 1) && !node_set_contains(s, e.x + 1, e.y)) {
+            _point_t pt = { e.x + 1, e.y, EDGE_LEFT };
+            PUSH_PQ(q, PointPQ, pt, mazegrid_get_edge(g, e.x, e.y, EDGE_RIGHT));
         }
-        if ((y > 0) && !node_set_contains(s, x, y - 1)) {
-            pq_add(q, mazegrid_get_edge(g, x, y, EDGE_DOWN), x, y - 1, EDGE_UP);
+        if ((e.y > 0) && !node_set_contains(s, e.x, e.y - 1)) {
+            _point_t pt = { e.x, e.y - 1, EDGE_UP };
+            PUSH_PQ(q, PointPQ, pt, mazegrid_get_edge(g, e.x, e.y, EDGE_DOWN));
         }
-        if ((y < g->height - 1) && !node_set_contains(s, x, y + 1)) {
-            pq_add(q, mazegrid_get_edge(g, x, y, EDGE_UP), x, y + 1, EDGE_DOWN);
+        if ((e.y < g->height - 1) && !node_set_contains(s, e.x, e.y + 1)) {
+            _point_t pt = { e.x, e.y + 1, EDGE_DOWN };
+            PUSH_PQ(q, PointPQ, pt, mazegrid_get_edge(g, e.x, e.y, EDGE_UP));
         }
 
-        node_set_add(s, x, y);
+        node_set_add(s, e.x, e.y);
     }
 
     node_set_free(s);
-    pq_free(q);
+    FREE_PQ(q);
 }

utils/mazemaker.c

@@ -6,7 +6,8 @@
 int main(int argc, char* argv[]) {
     char c;
     int width = 0, height = 0;
-    char const *filename = NULL, *fg_color = NULL, *bg_color = NULL;
+    unsigned int seed = 0;
+    char const *filename = NULL, *fg_color = NULL, *bg_color = NULL, *seed_str = NULL;
     struct poptOption options_table[] = {
         { "width", 'w', POPT_ARG_INT, &width, 0,
           "Width of the maze", "BLOCKS" },
@@ -16,6 +17,8 @@ int main(int argc, char* argv[]) {
           "Foreground (wall) color", "#rrggbb" },
         { "background", 'b', POPT_ARG_STRING, &bg_color, 0,
           "Background color", "#rrggbb" },
+        { "seed", 's', POPT_ARG_STRING, &seed_str, 0,
+          "Random seed", "SEED" },
         POPT_AUTOHELP
         { NULL, 0, 0, NULL, 0 }
     };
@@ -53,7 +56,11 @@ int main(int argc, char* argv[]) {
             exit(1);
         }
     }
-    mazemaker_generate_maze(width, height, &maze);
+    if (seed_str != NULL) {
+        seed = (unsigned int)atol(seed_str);
+        mazemaker_options_set_seed(options, seed);
+    }
+    mazemaker_generate_maze_opt(width, height, &maze, options);
     mazemaker_maze_to_png_opt(&maze, filename, options);
     mazemaker_free_maze(&maze);
     mazemaker_options_free(options);