shithub: puzzles

Info  •  Files  •  Log  •  Branches

Mike's changes to dsf.c alter the internal storage format of dsf
structures, meaning that ad-hoc initialisation now doesn't work.
Hence, this checkin converts all ad-hoc dsf initialisations into
calls to dsf_init() or snew_dsf(). At least, I _hope_ I've caught
all of them.

[originally from svn r6888]

--- a/bridges.c

+++ b/bridges.c

@@ -1064,8 +1064,7 @@

     struct island *is, *is_join;

     /* Initialise dsf. */

-    for (i = 0; i < wh; i++)

-        dsf[i] = i;

+    dsf_init(dsf, wh);

     /* For each island, find connected islands right or down

      * and merge the dsf for the island squares as well as the

@@ -1602,9 +1601,8 @@

     ret->solved = ret->completed = 0;

     ret->solver = snew(struct solver_state);

-    ret->solver->dsf = snewn(wh, int);

+    ret->solver->dsf = snew_dsf(wh);

     ret->solver->tmpdsf = snewn(wh, int);

-    for (i = 0; i < wh; i++) ret->solver->dsf[i] = i;

     ret->solver->refcount = 1;

--- a/map.c

+++ b/map.c

@@ -1695,8 +1695,7 @@

     int i, k, pos, state;

     char *p = *desc;

-    for (i = 0; i < wh; i++)

-	map[wh+i] = i;

+    dsf_init(map+wh, wh);

     pos = -1;

     state = 0;

--- a/net.c

+++ b/net.c

@@ -521,9 +521,7 @@

      * classes) by finding the representative of each tile and

      * setting equivalence[one]=the_other.

      */

-    equivalence = snewn(w * h, int);

-    for (i = 0; i < w*h; i++)

-	equivalence[i] = i;	       /* initially all distinct */

+    equivalence = snew_dsf(w * h);

     /*

      * On a non-wrapping grid, we instantly know that all the edges

--- a/slant.c

+++ b/slant.c

@@ -468,15 +468,13 @@

      * Establish a disjoint set forest for tracking connectedness

      * between grid points.

      */

-    for (i = 0; i < W*H; i++)

-	sc->connected[i] = i;	       /* initially all distinct */

+    dsf_init(sc->connected, W*H);

     /*

      * Establish a disjoint set forest for tracking which squares

      * are known to slant in the same direction.

      */

-    for (i = 0; i < w*h; i++)

-	sc->equiv[i] = i;	       /* initially all distinct */

+    dsf_init(sc->equiv, w*h);

     /*

      * Clear the slashval array.

@@ -1006,9 +1004,7 @@

      * Establish a disjoint set forest for tracking connectedness

      * between grid points.

      */

-    connected = snewn(W*H, int);

-    for (i = 0; i < W*H; i++)

-	connected[i] = i;		       /* initially all distinct */

+    connected = snew_dsf(W*H);

     /*

      * Prepare a list of the squares in the grid, and fill them in

@@ -1389,8 +1385,7 @@

      * edge is visited at most twice.

      */

     dsf = state->clues->tmpdsf;

-    for (i = 0; i < W*H; i++)

-        dsf[i] = i;		       /* initially all distinct */

+    dsf_init(dsf, W*H);

     for (y = 0; y < h; y++)

         for (x = 0; x < w; x++) {

             int i1, i2;