Add option to set random seed for deterministic behavior
Bump version to 1.6
This commit is contained in:
29
lib/grid.c
29
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);
|
||||
return arc4random_uniform(MAX_EDGE_WEIGHT);
|
||||
#else // HAVE_ARC4RANDOM
|
||||
return random()%MAX_EDGE_WEIGHT;
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user