empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compute distribution paths center by center

Browse source 
This way, we compute all distribution paths from the same center in
one go, and thus fully exploit the fast multiple paths from same
source capability of Dijkstra's algorithm.

Sorting by dist center increases the average length of runs from 4.5
to 73 for my continental test case, and from 3 to 10 for my island
test case.

Compared to the commit before the previous one, distribution path
assembly runs more than 40 times faster for my continental test case,
and more than 5 times faster for my island test case.

The new path finder now runs my continental test case more than 30
times faster than the old A*, and the island test case more than 6
times, in a fraction of the memory.  This makes the continental
updates run 3.5 times faster, and the island updates 6% faster.
Distribution path assembly no longer dominates the continental
update's run time: it takes less than 10% instead of more than 70%.

In a sense, this is the path cache done right.
This commit is contained in:
Markus Armbruster 2011-02-21 23:13:07 +01:00
parent bf97fa9c9c
commit bbd6e9182f
1 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/lib/update/finish.c
View file

@ -110,18 +110,54 @@ finish_sects(int etu)
} }
static int
distcmp(const void *p, const void *q)
{
int a = *(int *)p;
int b = *(int *)q;
struct sctstr *sp = (void *)empfile[EF_SECTOR].cache;
int d;
d = sp[b].sct_dist_y - sp[a].sct_dist_y;
if (d)
return d;
d = sp[b].sct_dist_x - sp[a].sct_dist_x;
if (d)
return d;
return b - a;
}
static void static void
assemble_dist_paths(double *import_cost) assemble_dist_paths(double *import_cost)
{ {
struct sctstr *sp; struct sctstr *sp;
struct sctstr *dist; struct sctstr *dist;
int n; int n;
static int *job;
int uid, i;
coord dx = 1, dy = 0; /* invalid */ coord dx = 1, dy = 0; /* invalid */
for (n = 0; NULL != (sp = getsectid(n)); n++) { if (!job)
import_cost[n] = -1; job = malloc(WORLD_SZ() * sizeof(*job));
n = 0;
for (uid = 0; NULL != (sp = getsectid(uid)); uid++) {
import_cost[uid] = -1;
if (sp->sct_dist_x == sp->sct_x && sp->sct_dist_y == sp->sct_y) if (sp->sct_dist_x == sp->sct_x && sp->sct_dist_y == sp->sct_y)
continue; continue;
job[n++] = uid;
}
#ifdef PATH_FIND_STATS
printf("dist path reuse %zu bytes, %d/%d used\n",
WORLD_SZ() * sizeof(*job), n, WORLD_SZ());
#endif
qsort(job, n, sizeof(*job), distcmp);
for (i = 0; i < n; i++) {
uid = job[i];
sp = getsectid(uid);
dist = getsectp(sp->sct_dist_x, sp->sct_dist_y); dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
if (CANT_HAPPEN(!dist)) if (CANT_HAPPEN(!dist))
continue; continue;
@ -132,7 +168,7 @@ assemble_dist_paths(double *import_cost)
dy = sp->sct_dist_y; dy = sp->sct_dist_y;
path_find_from(dx, dy, dist->sct_own, MOB_MOVE); path_find_from(dx, dy, dist->sct_own, MOB_MOVE);
} }
import_cost[n] = path_find_to(sp->sct_x, sp->sct_y); import_cost[uid] = path_find_to(sp->sct_x, sp->sct_y);
} }
path_find_print_stats(); path_find_print_stats();
} }