luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some optimizations on the "select search" function. Mainly this 

stops checking for the "best" path during the feed-forward check
and only enumerates the cost function for every tile in the
selection, moving outward from the source.  This keeps the
algorithm efficient.
This commit is contained in:
Tim Edwards 2022-01-03 17:49:54 -05:00
parent 1fceef6acd
commit 2fc0e669b6
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.250 8.3.251

30
select/selOps.c
View File

@ -393,7 +393,6 @@ selShortFindReverse(rlist, tile, pnum, fdir)
*rlist = newrrec; *rlist = newrrec;
if ((int)tile->ti_client == 0) return 0; /* We're done */ if ((int)tile->ti_client == 0) return 0; /* We're done */
// if (mincost == 0) return 0; /* We're done */
minp = pnum; minp = pnum;
/* Search top */ /* Search top */
@ -504,9 +503,6 @@ donesides:
/* If mincost is still set to INT_MAX we have a real serious problem! */ /* If mincost is still set to INT_MAX we have a real serious problem! */
if (mincost == INT_MAX) return 1; if (mincost == INT_MAX) return 1;
/* If no tile had lower cost than this one, then we have an error */
// if (mincost == (int)tile->ti_client) return 1;
/* Stopgap measure: Error should not happen, but it does! */ /* Stopgap measure: Error should not happen, but it does! */
/* Remove client data of current tile and take minimum. */ /* Remove client data of current tile and take minimum. */
if (mincost == (int)tile->ti_client) TiSetClient(tile, CLIENTDEFAULT); if (mincost == (int)tile->ti_client) TiSetClient(tile, CLIENTDEFAULT);
@ -516,6 +512,8 @@ donesides:
pnum = minp; pnum = minp;
fdir = mindir; fdir = mindir;
} }
/* Not reached */
} }
/* Data structure used by selShortFindForward() to store a tile and */ /* Data structure used by selShortFindForward() to store a tile and */
@ -588,6 +586,12 @@ selShortProcessTile(tile, cost, fdir, mask)
{ {
TileType ttype; TileType ttype;
/* Ignore tiles that were already processed. This causes the */
/* algorithm to find any valid path but not the best path. That */
/* choice keeps the algorithm fast and efficient. */
if (tile->ti_client != (ClientData)CLIENTDEFAULT) return 1;
if (IsSplit(tile)) if (IsSplit(tile))
{ {
switch(fdir) switch(fdir)
@ -640,8 +644,7 @@ selShortProcessTile(tile, cost, fdir, mask)
* Function for finding shorts. The cell searched is always SelectDef. * Function for finding shorts. The cell searched is always SelectDef.
* *
* Results: * Results:
* Return 0 to keep going; return 1 to stop when the tile contains * None
* the destination point.
* *
* Side effects: * Side effects:
* Each tile visited has its ClientData record set to the current * Each tile visited has its ClientData record set to the current
@ -650,7 +653,7 @@ selShortProcessTile(tile, cost, fdir, mask)
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
int void
selShortFindForward(srctile, srctype, srcpnum, desttile) selShortFindForward(srctile, srctype, srcpnum, desttile)
Tile *srctile; Tile *srctile;
TileType srctype; TileType srctype;
@ -665,7 +668,6 @@ selShortFindForward(srctile, srctype, srcpnum, desttile)
static Stack *ShortStack = (Stack *)NULL; static Stack *ShortStack = (Stack *)NULL;
int cost = 0; int cost = 0;
int best = INT_MAX;
if (ShortStack == (Stack *)NULL) if (ShortStack == (Stack *)NULL)
ShortStack = StackNew(64); ShortStack = StackNew(64);
@ -686,18 +688,6 @@ selShortFindForward(srctile, srctype, srcpnum, desttile)
type = sd->type; type = sd->type;
freeMagic((char *)sd); freeMagic((char *)sd);
/* If this tile is the destination tile, do not search further */
if (tile == desttile)
{
if (best >= cost) best = (cost - 1);
continue;
}
/* If we're more costly than the best known path to destination, */
/* do not search further. */
if (cost >= best) continue;
lmask = &DBConnectTbl[type]; lmask = &DBConnectTbl[type];
/* Search top */ /* Search top */