Compile-time option to use A* for distribution

[empserver] / src / lib / update / finish.c

diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index 605d3dd651a128efacae986fb4c624dc3f7b0cf0..16c9872d9fe86b799e2e2d5d87e4f19f5edc3ba4 100644 (file)
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -36,6 +35,8 @@
 
 #include <config.h>
 
+#include <assert.h>
+#include <math.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include "distribute.h"
@@ -123,17 +124,98 @@ finish_sects(int etu)
 
 }
 
+#if (defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)) && !defined(DIST_PATH_NO_REUSE)
+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;
+}
+#endif
+
 static void
 assemble_dist_paths(double *import_cost)
 {
-    char *path;
-    double d;
     struct sctstr *sp;
     struct sctstr *dist;
     int n;
+#if defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)
+    static int *job;
+    int uid, i;
+    coord dx = 1, dy = 0;      /* invalid */
+
+#ifdef DIST_PATH_NO_REUSE
+    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)
+           continue;
+#else
+    if (!job)
+       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)
+           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];
+#endif /* !DIST_PATH_NO_REUSE */
+       sp = getsectid(uid);
+       dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
+       if (CANT_HAPPEN(!dist))
+           continue;
+       if (sp->sct_own != dist->sct_own)
+           continue;
+#ifdef DIST_PATH_NO_REUSE
+#if DIST_PATH_NO_REUSE == 1
+       import_cost[uid] = path_find(sp->sct_dist_x, sp->sct_dist_y,
+                                    sp->sct_x, sp->sct_y, dist->sct_own,
+                                    MOB_MOVE);
+#else
+       path_find_from(sp->sct_dist_x, sp->sct_dist_y,
+                      dist->sct_own, MOB_MOVE);
+       import_cost[uid] = path_find_to(sp->sct_x, sp->sct_y);
+#endif
+#else
+       if (sp->sct_dist_x != dx || sp->sct_dist_y != dy) {
+           dx = sp->sct_dist_x;
+           dy = sp->sct_dist_y;
+           path_find_from(dx, dy, dist->sct_own, MOB_MOVE);
+       }
+       import_cost[uid] = path_find_to(sp->sct_x, sp->sct_y);
+#endif
+    }
+#endif /* USE_PATH_FIND || TEST_PATH_FIND */
+#if !defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)
+    char *path;
+    double d;
     char buf[512];
 
     for (n = 0; NULL != (sp = getsectid(n)); n++) {
+#ifdef TEST_PATH_FIND
+       double new_imc = import_cost[n];
+#endif
        import_cost[n] = -1;
        if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
            continue;
@@ -148,5 +230,25 @@ assemble_dist_paths(double *import_cost)
        path = BestDistPath(buf, dist, sp, &d);
        if (path)
            import_cost[n] = d;
+#ifdef TEST_PATH_FIND
+       if (fabs(import_cost[n] - new_imc) >= 1e-6) {
+           printf("%d,%d <- %d,%d %d: old %g, new %g, %g off\n",
+                  sp->sct_dist_x, sp->sct_dist_y,
+                  sp->sct_x, sp->sct_y, MOB_MOVE,
+                  import_cost[n], new_imc, import_cost[n] - new_imc);
+           printf("\told: %s\n", path);
+           d = path_find(sp->sct_dist_x, sp->sct_dist_y,
+                         sp->sct_x, sp->sct_y, dist->sct_own, MOB_MOVE);
+           assert(d - new_imc < 1e-6);
+           path_find_route(buf, sizeof(buf),
+                           sp->sct_dist_x, sp->sct_dist_y,
+                           sp->sct_x, sp->sct_y);
+           printf("\tnew: %s\n", buf);
+       }
+#endif /* TEST_PATH_FIND */
     }
+#endif /* !USE_PATH_FIND || TEST_PATH_FIND */
+#if defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)
+    path_find_print_stats();
+#endif
 }