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 9da4a8873feb58440b52674717c7bc572982bfb0..16c9872d9fe86b799e2e2d5d87e4f19f5edc3ba4 100644 (file)
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -35,6 +35,8 @@
 
 #include <config.h>
 
+#include <assert.h>
+#include <math.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include "distribute.h"
@@ -122,7 +124,7 @@ finish_sects(int etu)
 
 }
 
-#ifdef USE_PATH_FIND
+#if (defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)) && !defined(DIST_PATH_NO_REUSE)
 static int
 distcmp(const void *p, const void *q)
 {
@@ -147,11 +149,17 @@ assemble_dist_paths(double *import_cost)
     struct sctstr *sp;
     struct sctstr *dist;
     int n;
-#ifdef USE_PATH_FIND
+#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));
 
@@ -172,26 +180,42 @@ assemble_dist_paths(double *import_cost)
 
     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
     }
-    path_find_print_stats();
-#else  /* !USE_PATH_FIND */
+#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;
@@ -206,6 +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 */
+#endif /* !USE_PATH_FIND || TEST_PATH_FIND */
+#if defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)
+    path_find_print_stats();
+#endif
 }